diff options
| author |  Yun Peng <pcloudy@google.com> | 2016-07-04 12:41:50 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-07-04 14:02:36 +0000 |
| commit | c4aeb0424f5882c7f3b6497a1e4c21c285d6fd0a (patch) | |
| tree | 3a675c8e7f5137cf3e2cc536dff239b02ef43fb2 | |
| parent | a4d48540865c6886b52dd153673d854c94adb85e (diff) | |
Fixed java_stub_template.txt so that we can run java binary with Windows style path
--
Change-Id: I219bce744a73333ff3a79bedc78ee78c415629e8
Reviewed-on: https://bazel-review.googlesource.com/#/c/3961
MOS_MIGRATED_REVID=126569740
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt index 6cd1c652b1..517c1d9654 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt @@ -116,10 +116,17 @@ done # Case 5 is handled like case 1. # Case 6 is handled like case 3. -case "$0" in - /*) self="$0" ;; - *) self="$PWD/$0" ;; -esac +# If we are running on Windows, convert the windows style path +# to unix style for detecting runfiles path. +if is_windows; then + self=$(cygpath --unix "$0") +else + self="$0" +fi + +if [[ "$self" != /* ]]; then + self="$PWD/$self" +fi if [[ "$SINGLEJAR" != 1 || "%needs_runfiles%" == 1 ]]; then if [[ -z "$JAVA_RUNFILES" ]]; then |