Skip to content

Commit

Permalink
Make Bazel be able to reach ijar on Windows where it's called "ijar.e…
Browse files Browse the repository at this point in the history
…xe" .

A small step towards the resolution of #276.

--
MOS_MIGRATED_REVID=114330517
  • Loading branch information
lberki authored and dslomov committed Feb 11, 2016
1 parent 9b372d1 commit b35e25d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/create_embedded_tools.sh
Expand Up @@ -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 ;;
Expand Down
3 changes: 2 additions & 1 deletion src/test/shell/bazel/test-setup.sh
Expand Up @@ -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

Expand All @@ -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
}
Expand Down
8 changes: 8 additions & 0 deletions tools/jdk/BUILD
Expand Up @@ -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",
Expand Down

0 comments on commit b35e25d

Please sign in to comment.