From 5a7c847e98428f873c6c426ebfd99a91f9295593 Mon Sep 17 00:00:00 2001 From: Laszlo Csomor Date: Thu, 9 Aug 2018 01:28:40 -0700 Subject: Java: add @bazel_tools//tools/java/runfiles See https://github.com/bazelbuild/bazel/issues/5803 Change-Id: I49a2e744af667d34aedc3384629acd48641b0921 Closes #5804. Change-Id: I75f85f02384fd1d9f6ebac5fff7c96c7278f7cdd PiperOrigin-RevId: 208010815 --- src/test/py/bazel/testdata/runfiles_test/bar/BUILD.mock | 2 +- src/test/py/bazel/testdata/runfiles_test/foo/BUILD.mock | 2 +- .../java/com/google/devtools/build/runfiles/BUILD | 1 - .../java/com/google/devtools/build/runfiles/BUILD.tools | 10 +++++++++- .../com/google/devtools/build/runfiles/Runfiles.java | 2 +- tools/BUILD | 2 ++ tools/java/BUILD | 16 ++++++++++++++++ tools/java/runfiles/BUILD | 16 ++++++++++++++++ tools/java/runfiles/BUILD.tools | 6 ++++++ tools/runfiles/BUILD.tools | 5 +++-- 10 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 tools/java/BUILD create mode 100644 tools/java/runfiles/BUILD create mode 100644 tools/java/runfiles/BUILD.tools diff --git a/src/test/py/bazel/testdata/runfiles_test/bar/BUILD.mock b/src/test/py/bazel/testdata/runfiles_test/bar/BUILD.mock index 930884b45a..de3a5cf9d0 100644 --- a/src/test/py/bazel/testdata/runfiles_test/bar/BUILD.mock +++ b/src/test/py/bazel/testdata/runfiles_test/bar/BUILD.mock @@ -13,7 +13,7 @@ java_binary( srcs = ["Bar.java"], data = ["bar-java-data.txt"], main_class = "Bar", - deps = ["@bazel_tools//tools/runfiles:java-runfiles"], + deps = ["@bazel_tools//tools/java/runfiles"], ) sh_binary( diff --git a/src/test/py/bazel/testdata/runfiles_test/foo/BUILD.mock b/src/test/py/bazel/testdata/runfiles_test/foo/BUILD.mock index 42c7d84241..533a7d7243 100644 --- a/src/test/py/bazel/testdata/runfiles_test/foo/BUILD.mock +++ b/src/test/py/bazel/testdata/runfiles_test/foo/BUILD.mock @@ -23,7 +23,7 @@ java_binary( "//bar:bar-cc", ], main_class = "Foo", - deps = ["@bazel_tools//tools/runfiles:java-runfiles"], + deps = ["@bazel_tools//tools/java/runfiles"], ) sh_binary( diff --git a/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD b/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD index 00f44a07d6..c988e82658 100644 --- a/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD +++ b/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD @@ -29,7 +29,6 @@ filegroup( java_library( name = "runfiles", srcs = [":java-srcs"], - visibility = ["//src/tools/runfiles:__pkg__"], ) java_test( diff --git a/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD.tools b/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD.tools index 5337b2b0d5..2f90f252ad 100644 --- a/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD.tools +++ b/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD.tools @@ -1,5 +1,6 @@ package(default_visibility = ["//visibility:private"]) +# TODO(laszlocsomor): move the sources to //tools/java/runfiles filegroup( name = "java-srcs", srcs = [ @@ -8,8 +9,15 @@ filegroup( ], ) +# TODO(laszlocsomor): after https://github.com/bazelbuild/bazel/issues/5802 is fixed, add a +# `deprecation` attribute to @bazel_tools//tools/runfiles:java-runfiles, advising users to depend on +# @bazel_tools//tools/java/runfiles instead. After a reasonable time (1-2 Bazel releases containing +# the deprecation warning) remove @bazel_tools//tools/runfiles:java-runfiles. java_library( name = "runfiles", srcs = [":java-srcs"], - visibility = ["//tools/runfiles:__pkg__"], + visibility = [ + "//tools/runfiles:__pkg__", + "//tools/java/runfiles:__pkg__", + ], ) diff --git a/src/tools/runfiles/java/com/google/devtools/build/runfiles/Runfiles.java b/src/tools/runfiles/java/com/google/devtools/build/runfiles/Runfiles.java index 3c9eef3a6b..718b67948d 100644 --- a/src/tools/runfiles/java/com/google/devtools/build/runfiles/Runfiles.java +++ b/src/tools/runfiles/java/com/google/devtools/build/runfiles/Runfiles.java @@ -35,7 +35,7 @@ import java.util.Map; * java_binary( * name = "my_binary", * ... - * deps = ["@bazel_tools//tools/runfiles:java-runfiles"], + * deps = ["@bazel_tools//tools/java/runfiles"], * ) * * diff --git a/tools/BUILD b/tools/BUILD index c69f44e8f4..e1f4641629 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -19,6 +19,7 @@ filegroup( "//tools/build_defs/repo:srcs", "//tools/build_rules:srcs", "//tools/coverage:srcs", + "//tools/java:srcs", "//tools/jdk:srcs", "//tools/launcher:srcs", "//tools/def_parser:srcs", @@ -57,6 +58,7 @@ filegroup( "//tools/cpp:srcs", "//tools/cpp/runfiles:embedded_tools", "//tools/genrule:srcs", + "//tools/java:embedded_tools", "//tools/j2objc:srcs", "//tools/jdk:package-srcs", "//tools/jdk:srcs", diff --git a/tools/java/BUILD b/tools/java/BUILD new file mode 100644 index 0000000000..fba8a23d34 --- /dev/null +++ b/tools/java/BUILD @@ -0,0 +1,16 @@ +package(default_visibility = ["//visibility:private"]) + +filegroup( + name = "srcs", + srcs = [ + "BUILD", + "//tools/java/runfiles:srcs", + ], + visibility = ["//tools:__pkg__"], +) + +filegroup( + name = "embedded_tools", + srcs = ["//tools/java/runfiles:embedded_tools"], + visibility = ["//tools:__pkg__"], +) diff --git a/tools/java/runfiles/BUILD b/tools/java/runfiles/BUILD new file mode 100644 index 0000000000..a0d2c018af --- /dev/null +++ b/tools/java/runfiles/BUILD @@ -0,0 +1,16 @@ +package(default_visibility = ["//visibility:private"]) + +filegroup( + name = "srcs", + srcs = [ + "BUILD", + "BUILD.tools", + ], + visibility = ["//tools/java:__pkg__"], +) + +filegroup( + name = "embedded_tools", + srcs = ["BUILD.tools"], + visibility = ["//tools/java:__pkg__"], +) diff --git a/tools/java/runfiles/BUILD.tools b/tools/java/runfiles/BUILD.tools new file mode 100644 index 0000000000..011a549ba3 --- /dev/null +++ b/tools/java/runfiles/BUILD.tools @@ -0,0 +1,6 @@ +alias( + name = "runfiles", + # TODO(laszlocsomor): move the sources to this package. + actual = "//src/tools/runfiles/java/com/google/devtools/build/runfiles", + visibility = ["//visibility:public"], +) diff --git a/tools/runfiles/BUILD.tools b/tools/runfiles/BUILD.tools index d92852377b..6f107ea3e7 100644 --- a/tools/runfiles/BUILD.tools +++ b/tools/runfiles/BUILD.tools @@ -1,6 +1,7 @@ package(default_visibility = ["//visibility:public"]) -alias( +java_library( name = "java-runfiles", - actual = "//src/tools/runfiles/java/com/google/devtools/build/runfiles", + exports = ["//src/tools/runfiles/java/com/google/devtools/build/runfiles"], + deprecation = "Depend on @bazel_tools//tools/java/runfiles instead. This target goes away in Bazel release 0.18.0", ) -- cgit v1.2.3