diff options
| -rwxr-xr-x | src/create_embedded_tools.sh | 3 | ||||
| -rwxr-xr-x | src/test/shell/bazel/test-setup.sh | 3 | ||||
| -rw-r--r-- | tools/jdk/BUILD | 8 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh index 6f296f6e76..8b4c07eacc 100755 --- a/src/create_embedded_tools.sh +++ b/src/create_embedded_tools.sh @@ -32,7 +32,8 @@ for i in $*; do *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;; *GenClass_deploy.jar) OUTPUT_PATH=tools/jdk/GenClass_deploy.jar ;; *Runner_deploy.jar) OUTPUT_PATH=tools/jdk/TestRunner_deploy.jar ;; - *ijar) OUTPUT_PATH=tools/jdk/ijar ;; + *ijar.exe) OUTPUT_PATH=tools/jdk/ijar/ijar.exe ;; + *ijar) OUTPUT_PATH=tools/jdk/ijar/ijar ;; *src/objc_tools/*) OUTPUT_PATH=tools/objc/precomp_${i##*/} ;; *xcode*StdRedirect.dylib) OUTPUT_PATH=tools/objc/StdRedirect.dylib ;; *xcode*realpath) OUTPUT_PATH=tools/objc/realpath ;; diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh index b4ae28f051..bcccc84209 100755 --- a/src/test/shell/bazel/test-setup.sh +++ b/src/test/shell/bazel/test-setup.sh @@ -362,6 +362,7 @@ function create_new_workspace() { cd ${new_workspace_dir} mkdir tools mkdir -p third_party/java/jdk/langtools + mkdir -p tools/jdk/ijar copy_tools_directory @@ -372,7 +373,7 @@ function create_new_workspace() { ln -s "${singlejar_path}" tools/jdk/SingleJar_deploy.jar ln -s "${genclass_path}" tools/jdk/GenClass_deploy.jar ln -s "${junitrunner_path}" tools/jdk/TestRunner_deploy.jar - ln -s "${ijar_path}" tools/jdk/ijar + ln -s "${ijar_path}" tools/jdk/ijar/ijar touch WORKSPACE } diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index 75edee657c..50feeb0c2e 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -35,6 +35,14 @@ filegroup( srcs = ["//external:javac"], ) +# On Windows, executables end in ".exe", but the label we reach it through +# must be platform-independent. Thus, we create a little filegroup that +# contains the appropriate platform-dependent file. +filegroup( + name = "ijar", + srcs = glob(["ijar/*"]), +) + BOOTCLASS_JARS = [ "rt.jar", "resources.jar", |