commit b35e25d1704c847d42472d999b4990380ad0d83b
author Lukacs Berki <lberki@google.com> Wed Feb 10 16:44:54 2016 +0000
committer Dmitry Lomov <dslomov@google.com> Thu Feb 11 11:48:40 2016 +0000
tree 8d283a4b33be52f6b917d6e40dde99cb426f8041
parent 9b372d1d774f37b13853d9fd09ebdd7bfc5059a7

Make Bazel be able to reach ijar on Windows where it's called "ijar.exe" .

A small step towards the resolution of #276.

--
MOS_MIGRATED_REVID=114330517

src/create_embedded_tools.sh

diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index 6f296f6..8b4c07e 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -32,7 +32,8 @@
     *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 ;;

src/test/shell/bazel/test-setup.sh

diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh
index b4ae28f..bcccc84 100755
--- a/src/test/shell/bazel/test-setup.sh
+++ b/src/test/shell/bazel/test-setup.sh
@@ -362,6 +362,7 @@
   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 @@
   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
 }

tools/jdk/BUILD

diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index 75edee6..50feeb0 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -35,6 +35,14 @@
     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",