diff options
| author |  Xin Gao <xingao@google.com> | 2017-05-30 18:31:55 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-05-31 09:18:58 +0200 |
| commit | d894345ed88f8adce600b66a310b5210d0bcb59c (patch) | |
| tree | c65d9ce6e86c1de62a6eb1528f5165b8b93da9e3 /src | |
| parent | f89689b6bd1c23f5406180eca2e9e9a06ceade73 (diff) | |
Use cc implementation of singlejar except on Windows.
Change-Id: Ie4a2db2a6fa1ea86f4bdd42cd806f6804a0c56d4
PiperOrigin-RevId: 157473007
Diffstat (limited to 'src')
| -rw-r--r-- | src/BUILD | 14 | ||||
| -rwxr-xr-x | src/create_embedded_tools.sh | 3 | ||||
| -rw-r--r-- | src/test/shell/bazel/BUILD | 8 |
3 files changed, 21 insertions, 4 deletions
@@ -142,7 +142,6 @@ filegroup( "//src/main/protobuf:srcs", "//src/java_tools/buildjar:JavaBuilderDeploy", "//src/java_tools/buildjar:VanillaJavaBuilder_deploy.jar", - "//src/java_tools/singlejar:SingleJar_deploy.jar", "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar", "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar", "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:ExperimentalRunner_deploy.jar", @@ -163,6 +162,19 @@ filegroup( "//third_party/ijar:zipper", ], }) + select({ + ":windows": [ + "//src/java_tools/singlejar:SingleJar_deploy.jar", + ], + ":windows_msys": [ + "//src/java_tools/singlejar:SingleJar_deploy.jar", + ], + ":windows_msvc": [ + "//src/java_tools/singlejar:SingleJar_deploy.jar", + ], + "//conditions:default": [ + "//src/tools/singlejar:singlejar", + ], + }) + select({ "//tools/jdk:jdk7": [], "//conditions:default": [ "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:turbine_deploy.jar", diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh index a687495645..b5aaa6bdba 100755 --- a/src/create_embedded_tools.sh +++ b/src/create_embedded_tools.sh @@ -39,10 +39,11 @@ for i in $*; do *turbine_deploy.jar) OUTPUT_PATH=tools/jdk/turbine_deploy.jar ;; *javac-9-dev-r4023-2.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac-9-dev-r4023-2.jar ;; *javac7.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac7.jar ;; - *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;; + *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/singlejar/SingleJar_deploy.jar ;; *GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;; *ExperimentalRunner_deploy.jar) OUTPUT_PATH=tools/jdk/ExperimentalTestRunner_deploy.jar ;; *Runner_deploy.jar) OUTPUT_PATH=tools/jdk/TestRunner_deploy.jar ;; + *singlejar) OUTPUT_PATH=tools/jdk/singlejar/singlejar ;; *ijar.exe) OUTPUT_PATH=tools/jdk/ijar/ijar.exe ;; *ijar) OUTPUT_PATH=tools/jdk/ijar/ijar ;; *zipper.exe) OUTPUT_PATH=tools/zip/zipper/zipper.exe ;; diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index b0ac3fdff2..55e5e852a4 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -30,7 +30,6 @@ filegroup( "//src:bazel", "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar", "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar", - "//src/java_tools/singlejar:SingleJar_deploy.jar", "//src/main/tools:linux-sandbox", "//src/main/tools:process-wrapper", "//src/test/shell:bashunit", @@ -45,7 +44,12 @@ filegroup( # TODO(cushon): migrate to extclasspath and delete "@local_jdk//:extdir", "@local_jdk//:jdk", - ], + ] + select({ + "//src:windows": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], + "//src:windows_msys": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], + "//src:windows_msvc": ["//src/java_tools/singlejar:SingleJar_deploy.jar"], + "//conditions:default": ["//src/tools/singlejar:singlejar"], + }), visibility = [ "//src/test/shell:__subpackages__", ], |