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 /third_party/ijar | |
| 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 'third_party/ijar')
| -rw-r--r-- | third_party/ijar/test/BUILD | 12 | ||||
| -rwxr-xr-x | third_party/ijar/test/testenv.sh | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/third_party/ijar/test/BUILD b/third_party/ijar/test/BUILD index f8ebb2a612..da06173368 100644 --- a/third_party/ijar/test/BUILD +++ b/third_party/ijar/test/BUILD @@ -9,12 +9,12 @@ sh_test( size = "enormous", srcs = ["ijar_test.sh"], args = [ - "$(JAVABASE)/bin/javac", - "$(JAVA)", - "$(JAVABASE)/bin/jar", - "$(JAVABASE)/bin/javap", - "$(location //third_party/ijar)", - "$(location //tools/jdk:langtools)", + "../local_jdk/bin/javac", + "../local_jdk/bin/java", + "../local_jdk/bin/jar", + "../local_jdk/bin/javap", + "io_bazel/$(location //third_party/ijar)", + "io_bazel/$(location //tools/jdk:langtools)", # We assume unzip and zip to be on the path "unzip", "zip", diff --git a/third_party/ijar/test/testenv.sh b/third_party/ijar/test/testenv.sh index 66c4811428..235f2c5948 100755 --- a/third_party/ijar/test/testenv.sh +++ b/third_party/ijar/test/testenv.sh @@ -20,7 +20,7 @@ [ -z "$TEST_SRCDIR" ] && { echo "TEST_SRCDIR not set!" >&2; exit 1; } # Load the unit-testing framework -source "${TEST_SRCDIR}/src/test/shell/unittest.bash" || \ +source "${TEST_SRCDIR}/io_bazel/src/test/shell/unittest.bash" || \ { echo "Failed to source unittest.bash" >&2; exit 1; } ## OSX/BSD stat and MD5 |