diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-04-22 11:42:34 +0000 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-04-22 11:53:26 +0000 |
| commit | 9e4c78fb5752fa554db82815f7336255831a95ab (patch) | |
| tree | fdf498cf18c1e875fc4be3d00afb5f99583ee1a9 /examples | |
| parent | 8ed31f05e664e925ad628ab47feeaaab30c26283 (diff) | |
Automated [] rollback of commit 857cda2c45a5cc68c3fa398311c48c571a64915d and commit 790d2f6009d47fe92cf0cd92a1473bbf0141f32e.
*** Reason for rollback ***
Broke non-Bazel projects on ci.bazel.io
Fixes #1168
*** Original change description ***
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....
***
--
MOS_MIGRATED_REVID=120535721
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/java-skylark/src/main/java/com/example/myproject/Greeter.java | 3 | ||||
| -rwxr-xr-x | examples/shell/bin.sh | 3 | ||||
| -rwxr-xr-x | examples/shell/lib.sh | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java b/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java index 143a71dfd4..b4d8516dc9 100644 --- a/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java +++ b/examples/java-skylark/src/main/java/com/example/myproject/Greeter.java @@ -29,8 +29,7 @@ public class Greeter { public void hello(String obj) throws Exception { String greeting = "Hello"; try { - String greetFile = getRunfiles() - + "/io_bazel/examples/java-skylark/src/main/resources/greeting.txt"; + String greetFile = getRunfiles() + "/examples/java-skylark/src/main/resources/greeting.txt"; greeting = convertStreamToString(new FileInputStream(greetFile)); } catch (FileNotFoundException e) { // use default. diff --git a/examples/shell/bin.sh b/examples/shell/bin.sh index 5b51ccf06c..02345b0157 100755 --- a/examples/shell/bin.sh +++ b/examples/shell/bin.sh @@ -18,8 +18,9 @@ set -eu # This allows the script to be both a binary and a library script. If our binary has defined # RUNFILES then we use it, otherwise we look for our own runfiles. -RUNFILES=${RUNFILES:-$0.runfiles/io_bazel} +RUNFILES=${RUNFILES:-$0.runfiles} source "${RUNFILES}/examples/shell/lib.sh" showfile + diff --git a/examples/shell/lib.sh b/examples/shell/lib.sh index 495ef3d422..979a2c6b67 100755 --- a/examples/shell/lib.sh +++ b/examples/shell/lib.sh @@ -18,8 +18,9 @@ set -eu # This allows the script to be both a binary and a library script. If our binary has defined # RUNFILES then we use it, otherwise we look for our own runfiles. -RUNFILES=${RUNFILES:-$0.runfiles/io_bazel} +RUNFILES=${RUNFILES:-$0.runfiles} function showfile { cat "${RUNFILES}/examples/shell/data/file.txt" } + |