From a393c428d792afe3fce1455469d5b00e336bda7d Mon Sep 17 00:00:00 2001 From: philwo Date: Tue, 29 Aug 2017 17:22:19 +0200 Subject: Split "shell", "graph" into their own packages. PiperOrigin-RevId: 166849610 --- src/main/java/com/google/devtools/build/lib/BUILD | 73 +++++++--------------- .../com/google/devtools/build/lib/actions/BUILD | 2 +- .../com/google/devtools/build/lib/exec/apple/BUILD | 2 +- .../com/google/devtools/build/lib/exec/local/BUILD | 2 +- .../java/com/google/devtools/build/lib/graph/BUILD | 20 ++++++ .../com/google/devtools/build/lib/query2/BUILD | 6 +- .../com/google/devtools/build/lib/rules/cpp/BUILD | 2 +- .../com/google/devtools/build/lib/rules/objc/BUILD | 2 +- .../com/google/devtools/build/lib/sandbox/BUILD | 2 +- .../java/com/google/devtools/build/lib/shell/BUILD | 30 +++++++++ .../com/google/devtools/build/lib/standalone/BUILD | 2 +- 11 files changed, 82 insertions(+), 61 deletions(-) create mode 100644 src/main/java/com/google/devtools/build/lib/graph/BUILD create mode 100644 src/main/java/com/google/devtools/build/lib/shell/BUILD (limited to 'src/main/java/com/google') diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index 742b98275d..deb506d2e4 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -4,44 +4,38 @@ package( default_visibility = ["//src:__subpackages__"], ) -java_library( - name = "shell", - srcs = glob(["shell/*.java"]), - deps = [ - "//third_party:guava", - ], -) - filegroup( name = "srcs", srcs = glob(["**"]) + [ "//src/main/java/com/google/devtools/build/docgen:srcs", "//src/main/java/com/google/devtools/build/lib/actions:srcs", + "//src/main/java/com/google/devtools/build/lib/analysis/platform:srcs", + "//src/main/java/com/google/devtools/build/lib/analysis/whitelisting:srcs", "//src/main/java/com/google/devtools/build/lib/bazel/repository/cache:srcs", "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader:srcs", + "//src/main/java/com/google/devtools/build/lib/buildeventservice/client:srcs", "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:srcs", "//src/main/java/com/google/devtools/build/lib/buildeventstream/transports:srcs", - "//src/main/java/com/google/devtools/build/lib/buildeventservice/client:srcs", "//src/main/java/com/google/devtools/build/lib/causes:srcs", "//src/main/java/com/google/devtools/build/lib/cmdline:srcs", "//src/main/java/com/google/devtools/build/lib/exec/apple:srcs", "//src/main/java/com/google/devtools/build/lib/exec/local:srcs", + "//src/main/java/com/google/devtools/build/lib/graph:srcs", "//src/main/java/com/google/devtools/build/lib/query2:srcs", "//src/main/java/com/google/devtools/build/lib/remote:srcs", - "//src/main/java/com/google/devtools/build/lib/rules/apple:srcs", "//src/main/java/com/google/devtools/build/lib/rules/apple/cpp:srcs", "//src/main/java/com/google/devtools/build/lib/rules/apple/swift:srcs", + "//src/main/java/com/google/devtools/build/lib/rules/apple:srcs", "//src/main/java/com/google/devtools/build/lib/rules/config:srcs", - "//src/main/java/com/google/devtools/build/lib/rules/cpp:srcs", "//src/main/java/com/google/devtools/build/lib/rules/cpp/proto:srcs", + "//src/main/java/com/google/devtools/build/lib/rules/cpp:srcs", "//src/main/java/com/google/devtools/build/lib/rules/genquery:srcs", "//src/main/java/com/google/devtools/build/lib/rules/genrule:srcs", "//src/main/java/com/google/devtools/build/lib/rules/objc:srcs", - "//src/main/java/com/google/devtools/build/lib/skyframe/serialization:srcs", - "//src/main/java/com/google/devtools/build/lib/analysis/platform:srcs", - "//src/main/java/com/google/devtools/build/lib/analysis/whitelisting:srcs", "//src/main/java/com/google/devtools/build/lib/rules/platform:srcs", "//src/main/java/com/google/devtools/build/lib/sandbox:srcs", + "//src/main/java/com/google/devtools/build/lib/shell:srcs", + "//src/main/java/com/google/devtools/build/lib/skyframe/serialization:srcs", "//src/main/java/com/google/devtools/build/lib/ssd:srcs", "//src/main/java/com/google/devtools/build/lib/standalone:srcs", "//src/main/java/com/google/devtools/build/lib/windows/jni:srcs", @@ -56,19 +50,6 @@ filegroup( ], ) -# This package provides a general-purpose directed graph utility class with -# implementations of numerous textbook graph algorithms and code to read and -# write AT&T GraphViz files. - -java_library( - name = "graph", - srcs = glob(["graph/*.java"]), - deps = [ - "//third_party:guava", - "//third_party:jsr305", - ], -) - # Java interfaces to various native UNIX system services. java_library( name = "unix", @@ -86,8 +67,8 @@ java_library( ":concurrent", ":os_util", ":preconditions", - ":shell", ":vfs", + "//src/main/java/com/google/devtools/build/lib/shell", "//third_party:guava", ], ) @@ -104,8 +85,8 @@ java_library( ":concurrent", ":os_util", ":preconditions", - ":shell", ":vfs", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/lib/windows/jni", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", @@ -153,7 +134,7 @@ java_library( ":concurrent", ":os_util", ":preconditions", - ":shell", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", "//third_party:jsr305", @@ -309,9 +290,9 @@ java_library( ":exitcode-external", ":os_util", ":preconditions", - ":shell", ":unix", ":vfs", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", "//third_party:jsr305", @@ -549,7 +530,7 @@ java_library( deps = [ ":concurrent", ":preconditions", - ":shell", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/protobuf:build_java_proto", "//third_party:guava", "//third_party:jsr305", @@ -623,11 +604,9 @@ java_library( ":concurrent", ":events", ":exitcode-external", - ":graph", ":io", ":os_util", ":packages-internal", - ":shell", ":skylark-provider-collection", ":skylarkinterface", ":syntax", @@ -641,6 +620,8 @@ java_library( "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", "//src/main/java/com/google/devtools/build/lib/causes", "//src/main/java/com/google/devtools/build/lib/cmdline", + "//src/main/java/com/google/devtools/build/lib/graph", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", @@ -759,7 +740,6 @@ java_library( ":events", ":io", ":packages-internal", - ":shell", ":util", ":vfs", "//src/main/java/com/google/devtools/build/lib/actions", @@ -767,6 +747,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader", "//src/main/java/com/google/devtools/build/lib/remote", "//src/main/java/com/google/devtools/build/lib/sandbox", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/lib/ssd", "//src/main/java/com/google/devtools/build/lib/standalone", "//src/main/java/com/google/devtools/build/lib/worker", @@ -830,11 +811,11 @@ java_library( "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:io", "//src/main/java/com/google/devtools/build/lib:packages-internal", - "//src/main/java/com/google/devtools/build/lib:shell", "//src/main/java/com/google/devtools/build/lib:skylarkinterface", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/bazel/repository/cache", "//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/main/java/com/google/devtools/common/options", @@ -958,12 +939,12 @@ java_library( ":java-implicit-attributes", ":packages-internal", ":proto-rules", - ":shell", ":skylarkinterface", ":util", ":vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:extra_actions_base_java_proto", "//third_party:auto_value", @@ -1042,13 +1023,13 @@ java_library( ":events", ":java-implicit-attributes", ":packages-internal", - ":shell", ":skylarkinterface", ":util", ":vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:extra_actions_base_java_proto", "//third_party:auto_value", @@ -1174,7 +1155,6 @@ java_library( ":process_util", ":profiler-output", ":shared-base-rules", - ":shell", ":unix", ":util", ":vfs", @@ -1188,6 +1168,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/query2", "//src/main/java/com/google/devtools/build/lib/query2:query-engine", "//src/main/java/com/google/devtools/build/lib/query2:query-output", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/main/java/com/google/devtools/common/options", @@ -1236,11 +1217,11 @@ java_library( exports = [ ":build-base", ":concurrent", - ":graph", ":packages-internal", ":util", ":vfs", "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/graph", "//src/main/java/com/google/devtools/build/lib/rules/objc", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", @@ -1270,10 +1251,10 @@ java_library( ":concurrent", ":events", ":foundation", - ":graph", ":packages", ":util", ":vfs", + "//src/main/java/com/google/devtools/build/lib/graph", "//src/main/java/com/google/devtools/build/lib/query2", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:build_java_proto", @@ -1377,16 +1358,6 @@ genrule( visibility = ["//site:__pkg__"], ) -# Bootstrapping SingleJar using Skylark rules -# -load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library") - -bootstrap_java_library( - name = "shell-skylark", - srcs = glob(["shell/*.java"]), - jars = ["//third_party:bootstrap_guava_and_error_prone-jars"], -) - ######################################################################## # # Miscellaneous targets diff --git a/src/main/java/com/google/devtools/build/lib/actions/BUILD b/src/main/java/com/google/devtools/build/lib/actions/BUILD index c38671b558..29568da4e5 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/BUILD +++ b/src/main/java/com/google/devtools/build/lib/actions/BUILD @@ -16,13 +16,13 @@ java_library( "//src/main/java/com/google/devtools/build/lib:events", "//src/main/java/com/google/devtools/build/lib:io", "//src/main/java/com/google/devtools/build/lib:packages-internal", - "//src/main/java/com/google/devtools/build/lib:shell", "//src/main/java/com/google/devtools/build/lib:skylarkinterface", "//src/main/java/com/google/devtools/build/lib:unix", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", "//src/main/java/com/google/devtools/build/lib/causes", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/main/java/com/google/devtools/common/options", diff --git a/src/main/java/com/google/devtools/build/lib/exec/apple/BUILD b/src/main/java/com/google/devtools/build/lib/exec/apple/BUILD index c7c19dc84e..7c2c799216 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/apple/BUILD +++ b/src/main/java/com/google/devtools/build/lib/exec/apple/BUILD @@ -8,11 +8,11 @@ java_library( deps = [ "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:packages-internal", - "//src/main/java/com/google/devtools/build/lib:shell", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/exec/local", "//src/main/java/com/google/devtools/build/lib/rules/apple", + "//src/main/java/com/google/devtools/build/lib/shell", "//third_party:guava", ], ) diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/BUILD b/src/main/java/com/google/devtools/build/lib/exec/local/BUILD index 74f4f7b76c..2a6c89c225 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/local/BUILD +++ b/src/main/java/com/google/devtools/build/lib/exec/local/BUILD @@ -14,10 +14,10 @@ java_library( "//src/main/java/com/google/devtools/build/lib:io", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:process_util", - "//src/main/java/com/google/devtools/build/lib:shell", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", "//third_party:jsr305", diff --git a/src/main/java/com/google/devtools/build/lib/graph/BUILD b/src/main/java/com/google/devtools/build/lib/graph/BUILD new file mode 100644 index 0000000000..7d70737321 --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/graph/BUILD @@ -0,0 +1,20 @@ +package( + default_visibility = ["//src:__subpackages__"], +) + +# This package provides a general-purpose directed graph utility class with +# implementations of numerous textbook graph algorithms and code to read and +# write AT&T GraphViz files. +java_library( + name = "graph", + srcs = glob(["*.java"]), + deps = [ + "//third_party:guava", + "//third_party:jsr305", + ], +) + +filegroup( + name = "srcs", + srcs = glob(["**"]), +) diff --git a/src/main/java/com/google/devtools/build/lib/query2/BUILD b/src/main/java/com/google/devtools/build/lib/query2/BUILD index 968d550a42..d8fb69277a 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/BUILD +++ b/src/main/java/com/google/devtools/build/lib/query2/BUILD @@ -10,11 +10,11 @@ java_library( "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:concurrent", "//src/main/java/com/google/devtools/build/lib:events", - "//src/main/java/com/google/devtools/build/lib:graph", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/graph", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//third_party:guava", @@ -30,9 +30,9 @@ java_library( ":query2", "//src/main/java/com/google/devtools/build/lib:collect", "//src/main/java/com/google/devtools/build/lib:events", - "//src/main/java/com/google/devtools/build/lib:graph", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib/graph", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:build_java_proto", "//third_party:guava", @@ -46,8 +46,8 @@ java_library( srcs = glob(["engine/*.java"]), deps = [ "//src/main/java/com/google/devtools/build/lib:concurrent", - "//src/main/java/com/google/devtools/build/lib:graph", "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib/graph", "//third_party:guava", "//third_party:jsr305", ], diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD index 0ef5625ecd..9a67dc4c33 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/BUILD @@ -19,13 +19,13 @@ java_library( "//src/main/java/com/google/devtools/build/lib:io", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:proto-rules", - "//src/main/java/com/google/devtools/build/lib:shell", "//src/main/java/com/google/devtools/build/lib:skylarkinterface", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/analysis/platform", "//src/main/java/com/google/devtools/build/lib/rules/apple", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/main/java/com/google/devtools/common/options", diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD b/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD index 45ed097562..be5d9aea78 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD @@ -18,7 +18,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib:java-rules", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:proto-rules", - "//src/main/java/com/google/devtools/build/lib:shell", "//src/main/java/com/google/devtools/build/lib:skylarkinterface", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", @@ -26,6 +25,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/analysis/platform", "//src/main/java/com/google/devtools/build/lib/rules/apple", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:bundlemerge_java_proto", "//src/main/protobuf:extra_actions_base_java_proto", 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 d93532c094..a251d56e61 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD +++ b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD @@ -14,12 +14,12 @@ java_library( "//src/main/java/com/google/devtools/build/lib:io", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:runtime", - "//src/main/java/com/google/devtools/build/lib:shell", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/exec/apple", "//src/main/java/com/google/devtools/build/lib/exec/local", + "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/lib/standalone", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", diff --git a/src/main/java/com/google/devtools/build/lib/shell/BUILD b/src/main/java/com/google/devtools/build/lib/shell/BUILD new file mode 100644 index 0000000000..d2d788c1be --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/shell/BUILD @@ -0,0 +1,30 @@ +package( + default_visibility = ["//src:__subpackages__"], +) + +# Library for dealing with executable commands, including their arguments and runtime environment +# (environment variables, working directory). It lets a caller execute a command, get its results, +# and optionally forward interrupts to the subprocess. The library also handles creating threads to +# ensure timely reading of subprocess outputs. +java_library( + name = "shell", + srcs = glob(["*.java"]), + deps = [ + "//third_party:guava", + ], +) + +# Bootstrapping SingleJar using Skylark rules +# +load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library") + +bootstrap_java_library( + name = "shell-skylark", + srcs = glob(["*.java"]), + jars = ["//third_party:bootstrap_guava_and_error_prone-jars"], +) + +filegroup( + name = "srcs", + srcs = glob(["**"]), +) 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 64e70e52c7..babac4770a 100644 --- a/src/main/java/com/google/devtools/build/lib/standalone/BUILD +++ b/src/main/java/com/google/devtools/build/lib/standalone/BUILD @@ -13,7 +13,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib:io", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:runtime", - "//src/main/java/com/google/devtools/build/lib:shell", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib:vfs", "//src/main/java/com/google/devtools/build/lib/actions", @@ -21,6 +20,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/exec/local", "//src/main/java/com/google/devtools/build/lib/rules/apple", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/shell", "//third_party:guava", ], ) -- cgit v1.2.3