diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2016-04-19 13:55:24 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-04-20 11:12:35 +0000 |
| commit | 857cda2c45a5cc68c3fa398311c48c571a64915d (patch) | |
| tree | 8a2ad9cd0c92752b1b6105c27d9995dcaf3d24a4 /src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD | |
| parent | 0b26f446f8312d1c43d162fe706467ef458c4db8 (diff) | |
Move the runfiles for external repositories to under the x.runfiles/ directory
This also sets the Bazel workspace name to io_bazel_source.
Fixes #848.
Relevant to #1116, #1124,
RELNOTES[INC]: All repositories are now directly under the x.runfiles directory in the runfiles tree (previously, external repositories were at x.runfiles/main-repo/external/other-repo. This simplifies handling remote repository runfiles considerably, but will break existing references to external repository runfiles.
---
Furthermore, if a Bazel project does not provide a workspace name in the WORKSPACE file, Bazel will now default to using __main__ as the workspace name (instead of "", as previously). The repository's runfiles will appear under x.runfiles/__main__/.
--
MOS_MIGRATED_REVID=120224534
Diffstat (limited to 'src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD')
| -rw-r--r-- | src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD | 3 |
1 files changed, 2 insertions, 1 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 22929e225a..790cfbc068 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 @@ -14,6 +14,7 @@ genrule( outs = ["JavacBootclasspathLocations.java"], cmd = """ declare -a paths=($(SRCS)) && paths=($${paths[@]#$(GENDIR)/}) && +paths=($$(echo $${paths[@]} | sed s_external/__g)) && IFS=: && cat > $@ <<EOF package com.google.devtools.build.java.bazel; @@ -44,7 +45,7 @@ genrule( srcs = ["//third_party/java/jdk/langtools:javac_jar"], outs = ["JavaLangtoolsLocation.java"], cmd = """ -path=$(SRCS) && path=$${path#$(GENDIR)/} && +path=$(SRCS) && path=$${path#$(GENDIR)/} && path="io_bazel/$${path}" && cat > $@ <<EOF package com.google.devtools.build.java.bazel; public class JavaLangtoolsLocation { |