From 02ba36ff908aec3db4712a8724129e21b156c502 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 13 Oct 2015 12:08:25 +0000 Subject: Split off 2 BUILD files. -- MOS_MIGRATED_REVID=105301167 --- src/main/java/BUILD | 67 ++-------------------- .../com/google/devtools/build/lib/actions/BUILD | 32 +++++++++++ .../google/devtools/build/lib/rules/genquery/BUILD | 34 +++++++++++ .../com/google/devtools/build/lib/sandbox/BUILD | 3 +- .../com/google/devtools/build/lib/standalone/BUILD | 3 +- .../com/google/devtools/build/lib/worker/BUILD | 3 +- src/test/java/BUILD | 24 ++++---- src/test/shell/bazel/BUILD | 5 ++ 8 files changed, 92 insertions(+), 79 deletions(-) create mode 100644 src/main/java/com/google/devtools/build/lib/actions/BUILD create mode 100644 src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD (limited to 'src') diff --git a/src/main/java/BUILD b/src/main/java/BUILD index a0d3c21b14..1e30b784ca 100644 --- a/src/main/java/BUILD +++ b/src/main/java/BUILD @@ -8,32 +8,6 @@ java_library( deps = ["//third_party:guava"], ) -java_library( - name = "actions", - srcs = glob([ - "com/google/devtools/build/lib/actions/**/*.java", - ]), - deps = [ - ":base-util", - ":clock", - ":collect", - ":common", - ":concurrent", - ":events", - ":io", - ":options", - ":packages", - ":shell", - ":skyframe-base", - ":util", - ":vfs", - "//src/main/protobuf:extra_actions_base_proto", - "//third_party:guava", - "//third_party:jsr305", - "//third_party:protobuf", - ], -) - java_library( name = "cmdline", srcs = glob([ @@ -210,10 +184,10 @@ java_library( "com/google/devtools/build/lib/profiler/statistics/*.java", ]), deps = [ - ":actions", ":collect", ":util", ":vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//third_party:guava", ], ) @@ -323,13 +297,11 @@ java_library( ], exclude = [ "com/google/devtools/build/lib/rules/java/JavaToolchainDataParser.java", - "com/google/devtools/build/lib/rules/genquery/**", ], ) + [ "com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java", ], deps = [ - ":actions", ":base-util", ":collect", ":common", @@ -344,6 +316,7 @@ java_library( ":skyframe-base", ":util", ":vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/protobuf:android_studio_ide_info_proto", "//src/main/protobuf:bundlemerge_proto", "//src/main/protobuf:crosstool_config_proto", @@ -359,34 +332,6 @@ java_library( ], ) -java_library( - name = "genquery", - srcs = glob([ - "com/google/devtools/build/lib/rules/genquery/*.java", - ]), - deps = [ - ":actions", - ":analysis-exec-rules-skyframe", - ":collect", - ":common", - ":concurrent", - ":events", - ":graph", - ":options", - ":packages", - ":query2", - ":shell", - ":skyframe-base", - ":util", - ":vfs", - "//src/main/protobuf:crosstool_config_proto", - "//src/main/protobuf:extra_actions_base_proto", - "//third_party:guava", - "//third_party:jsr305", - "//third_party:protobuf", - ], -) - java_library( name = "graph", srcs = glob([ @@ -428,7 +373,6 @@ java_library( "com/google/devtools/build/lib/runtime/**/*.java", ]), deps = [ - ":actions", ":analysis-exec-rules-skyframe", ":clock", ":collect", @@ -447,6 +391,7 @@ java_library( ":skyframe-base", ":util", ":vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/protobuf:build_proto", "//src/main/protobuf:invocation_policy_proto", "//src/main/protobuf:test_status_proto", @@ -481,7 +426,6 @@ java_library( "com/google/devtools/build/lib/server/**/*.java", ]), deps = [ - ":actions", ":analysis-exec-rules-skyframe", ":clock", ":cmdline", @@ -501,6 +445,7 @@ java_library( ":unix", ":util", ":vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/protobuf:build_proto", "//src/main/protobuf:invocation_policy_proto", "//src/main/protobuf:test_status_proto", @@ -564,7 +509,6 @@ java_library( "//third_party:plexus_utils", ], deps = [ - ":actions", ":analysis-exec-rules-skyframe", ":buildtool-runtime", ":clock", @@ -572,7 +516,6 @@ java_library( ":common", ":concurrent", ":events", - ":genquery", ":graph", ":io", ":maven-connector", @@ -587,7 +530,9 @@ java_library( ":util", ":vfs", "//src/java_tools/singlejar:zip", + "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/bazel/dash", + "//src/main/java/com/google/devtools/build/lib/rules/genquery", "//src/main/java/com/google/devtools/build/lib/sandbox", "//src/main/java/com/google/devtools/build/lib/standalone", "//src/main/java/com/google/devtools/build/lib/worker", diff --git a/src/main/java/com/google/devtools/build/lib/actions/BUILD b/src/main/java/com/google/devtools/build/lib/actions/BUILD new file mode 100644 index 0000000000..2d244a7695 --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/actions/BUILD @@ -0,0 +1,32 @@ +package(default_visibility = ["//src:__subpackages__"]) + +java_library( + name = "actions", + srcs = glob([ + "**/*.java", + ]), + deps = [ + "//src/main/java:base-util", + "//src/main/java:clock", + "//src/main/java:collect", + "//src/main/java:common", + "//src/main/java:concurrent", + "//src/main/java:events", + "//src/main/java:io", + "//src/main/java:options", + "//src/main/java:packages", + "//src/main/java:shell", + "//src/main/java:skyframe-base", + "//src/main/java:util", + "//src/main/java:vfs", + "//src/main/protobuf:extra_actions_base_proto", + "//third_party:guava", + "//third_party:jsr305", + "//third_party:protobuf", + ], +) + +filegroup( + name = "srcs", + srcs = glob(["**"]), +) diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD b/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD new file mode 100644 index 0000000000..baeabc821c --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD @@ -0,0 +1,34 @@ +package(default_visibility = ["//src:__subpackages__"]) + +java_library( + name = "genquery", + srcs = glob([ + "*.java", + ]), + deps = [ + "//src/main/java:analysis-exec-rules-skyframe", + "//src/main/java:collect", + "//src/main/java:common", + "//src/main/java:concurrent", + "//src/main/java:events", + "//src/main/java:graph", + "//src/main/java:options", + "//src/main/java:packages", + "//src/main/java:query2", + "//src/main/java:shell", + "//src/main/java:skyframe-base", + "//src/main/java:util", + "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/protobuf:crosstool_config_proto", + "//src/main/protobuf:extra_actions_base_proto", + "//third_party:guava", + "//third_party:jsr305", + "//third_party:protobuf", + ], +) + +filegroup( + name = "srcs", + srcs = glob(["**"]), +) diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD index d472c910f1..709b4fb7c0 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD +++ b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD @@ -8,7 +8,6 @@ java_library( name = "sandbox", srcs = glob(["*.java"]), deps = [ - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:buildtool-runtime", "//src/main/java:common", @@ -21,6 +20,7 @@ java_library( "//src/main/java:unix", "//src/main/java:util", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/standalone", "//third_party:guava", ], @@ -29,5 +29,4 @@ java_library( filegroup( name = "srcs", srcs = glob(["**"]), - visibility = ["//src/main/java:__pkg__"], ) diff --git a/src/main/java/com/google/devtools/build/lib/standalone/BUILD b/src/main/java/com/google/devtools/build/lib/standalone/BUILD index a9e819467c..bc03435901 100644 --- a/src/main/java/com/google/devtools/build/lib/standalone/BUILD +++ b/src/main/java/com/google/devtools/build/lib/standalone/BUILD @@ -8,7 +8,6 @@ java_library( name = "standalone", srcs = glob(["*.java"]), deps = [ - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:buildtool-runtime", "//src/main/java:common", @@ -18,6 +17,7 @@ java_library( "//src/main/java:shell", "//src/main/java:util", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//third_party:guava", ], ) @@ -25,5 +25,4 @@ java_library( filegroup( name = "srcs", srcs = glob(["**"]), - visibility = ["//src/main/java:__pkg__"], ) diff --git a/src/main/java/com/google/devtools/build/lib/worker/BUILD b/src/main/java/com/google/devtools/build/lib/worker/BUILD index 368c5da738..ff14ae2c3d 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/BUILD +++ b/src/main/java/com/google/devtools/build/lib/worker/BUILD @@ -8,7 +8,6 @@ java_library( name = "worker", srcs = glob(["*.java"]), deps = [ - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:buildtool-runtime", "//src/main/java:common", @@ -19,6 +18,7 @@ java_library( "//src/main/java:packages", "//src/main/java:util", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/standalone", "//src/main/protobuf:worker_protocol_proto", "//third_party:apache_commons_pool2", @@ -30,5 +30,4 @@ java_library( filegroup( name = "srcs", srcs = glob(["**"]), - visibility = ["//src/main/java:__pkg__"], ) diff --git a/src/test/java/BUILD b/src/test/java/BUILD index 9d731380db..d7ab63f93d 100644 --- a/src/test/java/BUILD +++ b/src/test/java/BUILD @@ -15,7 +15,6 @@ java_library( srcs = glob(["com/google/devtools/build/lib/testutil/*.java"]), visibility = ["//visibility:public"], deps = [ - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:bazel-core", "//src/main/java:clock", @@ -27,6 +26,7 @@ java_library( "//src/main/java:packages", "//src/main/java:util", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//third_party:guava", "//third_party:guava-testlib", "//third_party:junit4", @@ -203,7 +203,6 @@ java_library( ":foundations_testutil", ":test_runner", ":testutil", - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:bazel-core", "//src/main/java:clock", @@ -215,6 +214,7 @@ java_library( "//src/main/java:skyframe-base", "//src/main/java:util", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -235,7 +235,6 @@ java_test( ":foundations_testutil", ":test_runner", ":testutil", - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:bazel-core", "//src/main/java:clock", @@ -246,6 +245,7 @@ java_test( "//src/main/java:packages", "//src/main/java:util", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -272,7 +272,6 @@ java_library( ":foundations_testutil", ":packages_testutil", ":testutil", - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:bazel-core", "//src/main/java:buildtool-runtime", @@ -287,6 +286,7 @@ java_library( "//src/main/java:skyframe-base", "//src/main/java:util", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/protobuf:extra_actions_base_proto", "//third_party:guava", "//third_party:guava-testlib", @@ -310,11 +310,11 @@ java_test( ":foundations_testutil", ":test_runner", ":testutil", - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:bazel-core", "//src/main/java:io", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/protobuf:extra_actions_base_proto", "//third_party:guava", "//third_party:guava-testlib", @@ -416,13 +416,13 @@ java_test( ":foundations_testutil", ":test_runner", ":testutil", - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:bazel-core", "//src/main/java:collect", "//src/main/java:events", "//src/main/java:packages", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -498,13 +498,13 @@ java_test( ":foundations_testutil", ":test_runner", ":testutil", - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:bazel-core", "//src/main/java:collect", "//src/main/java:events", "//src/main/java:packages", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/protobuf:android_studio_ide_info_proto", "//third_party:guava", "//third_party:guava-testlib", @@ -569,7 +569,6 @@ java_test( ":syntax_testutil", ":test_runner", ":testutil", - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:bazel-core", "//src/main/java:collect", @@ -578,6 +577,7 @@ java_test( "//src/main/java:packages", "//src/main/java:util", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -595,7 +595,6 @@ java_library( ":foundations_testutil", ":test_runner", ":testutil", - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:bazel-core", "//src/main/java:collect", @@ -604,6 +603,7 @@ java_library( "//src/main/java:packages", "//src/main/java:util", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -622,7 +622,6 @@ java_library( ":foundations_testutil", ":syntax_testutil", ":testutil", - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:bazel-core", "//src/main/java:collect", @@ -630,6 +629,7 @@ java_library( "//src/main/java:events", "//src/main/java:packages", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -651,7 +651,6 @@ java_test( ":skylark_testutil", ":test_runner", ":testutil", - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:bazel-core", "//src/main/java:collect", @@ -660,6 +659,7 @@ java_test( "//src/main/java:packages", "//src/main/java:util", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -782,7 +782,6 @@ java_test( ":analysis_testutil", ":foundations_testutil", ":testutil", - "//src/main/java:actions", "//src/main/java:analysis-exec-rules-skyframe", "//src/main/java:clock", "//src/main/java:events", @@ -791,6 +790,7 @@ java_test( "//src/main/java:shell", "//src/main/java:util", "//src/main/java:vfs", + "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/sandbox", "//third_party:guava", "//third_party:junit4", diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index d502705d17..604ec56e1f 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -112,6 +112,11 @@ genrule( "//src/java_tools/singlejar:srcs", "//src/main/protobuf:srcs", "//src/main/java:srcs", + "//src/main/java/com/google/devtools/build/lib/actions:srcs", + "//src/main/java/com/google/devtools/build/lib/sandbox:srcs", + "//src/main/java/com/google/devtools/build/lib/rules/genquery:srcs", + "//src/main/java/com/google/devtools/build/lib/worker:srcs", + "//src/main/java/com/google/devtools/build/lib/standalone:srcs", "//src/tools/xcode-common:srcs", "//third_party:srcs", ], -- cgit v1.2.3