diff options
| author |  ulfjack <ulfjack@google.com> | 2017-08-07 13:30:26 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-08-07 14:49:53 +0200 |
| commit | a02f595d8e14c85e09bb8669e670f70065715c80 (patch) | |
| tree | 0c9fcf2dc881f74b50a9c220e2653c017f045fe8 /src/java_tools/buildjar | |
| parent | 90e2e98a20022a3b45d5d68132b982a3e02da58c (diff) | |
Rearrange the java-langtools / javac-bootclasspath scripts
PiperOrigin-RevId: 164446300
Diffstat (limited to 'src/java_tools/buildjar')
3 files changed, 16 insertions, 9 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD index d1f4e5c5f3..e476103534 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD @@ -12,7 +12,7 @@ genrule( name = "javac-bootclasspath-locations", srcs = ["@bazel_tools//tools/jdk:bootclasspath"], outs = ["JavacBootclasspathLocations.java"], - cmd = "$(location javac-bootclasspath-locations.sh) $@ $(GENDIR) '' $(SRCS)", + cmd = "$(location javac-bootclasspath-locations.sh) $@ $(GENDIR) $(SRCS)", tools = ["javac-bootclasspath-locations.sh"], ) @@ -35,7 +35,7 @@ genrule( name = "java-langtools-location", srcs = ["//third_party/java/jdk/langtools:javac_jar"], outs = ["JavaLangtoolsLocation.java"], - cmd = "$(location java-langtools-location.sh) $@ $(GENDIR) io_bazel/ $(SRCS)", + cmd = "$(location java-langtools-location.sh) $@ $(GENDIR) $(SRCS)", tools = ["java-langtools-location.sh"], ) diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/java-langtools-location.sh b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/java-langtools-location.sh index 5c376be95a..cc6fa68f18 100755 --- a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/java-langtools-location.sh +++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/java-langtools-location.sh @@ -19,11 +19,15 @@ OUT=$1 STRIP_PREFIX=$2 -PREFIX=$3 -shift 3 +shift 2 -FILE="${PREFIX}$(echo "$*" | sed "s|^${STRIP_PREFIX}/||")" +# We add the current workspace name as a prefix here, and we use the current +# directory name for that. This might be a bit brittle. +FILE="$(echo "$*" | \ + sed "s|^${STRIP_PREFIX}/||" | \ + sed "s|^third_party|${PWD##*/}/third_party|" \ +)" cat > "$OUT" <<EOF package com.google.devtools.build.java.bazel; public class JavaLangtoolsLocation { diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/javac-bootclasspath-locations.sh b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/javac-bootclasspath-locations.sh index 4772dfd42e..d4bad63c75 100755 --- a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/javac-bootclasspath-locations.sh +++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/javac-bootclasspath-locations.sh @@ -19,15 +19,18 @@ OUT=$1 GENDIR=$2 -STRIP_PREFIX=$3 -shift 3 +shift 2 +# The Bazel and Google-internal locations of the bootclasspath entries are +# unfortunately subtly different. The "local_jdk" rewrite is for Bazel, and +# the "third_party" rewrite is for Google. +# TODO(ulfjack): Find a way to unify this. BOOTCLASSPATH=$(echo "$*" | \ tr " " "\n" | \ sed "s|^${GENDIR}/||" | \ - sed "s|external/||" | \ - sed "s|^|${STRIP_PREFIX}|" | \ + sed "s|^.*local_jdk|local_jdk|" | \ + sed "s|^third_party|${PWD##*/}/third_party|" | \ tr "\n" ":" | \ sed "s/:$//" ) |