diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2016-04-27 17:03:28 +0000 |
|---|---|---|
| committer | Kristina Chodorow <kchodorow@google.com> | 2016-04-27 17:13:29 +0000 |
| commit | 93fbc3e455d1a81abf6ba911550fc7954b1b7f68 (patch) | |
| tree | 2fe4df720f8f68f1cd1b430b96fb43f2e23a6b8e /examples | |
| parent | 8a79d0a86febe2dbe7ddebb0d3a1f7b39d2de1a2 (diff) | |
Set Bazel's workspace name
RELNOTES: Bazel's workspace name is now io_bazel. If you are using Bazel's
source as an external repository, then you may want to update the name you're
referring to it as or you'll begin seeing warnings about name mismatches in your
code.
--
MOS_MIGRATED_REVID=120926179
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, 4 insertions, 5 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 b4d8516dc9..143a71dfd4 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,7 +29,8 @@ public class Greeter { public void hello(String obj) throws Exception { String greeting = "Hello"; try { - String greetFile = getRunfiles() + "/examples/java-skylark/src/main/resources/greeting.txt"; + String greetFile = getRunfiles() + + "/io_bazel/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 02345b0157..5b51ccf06c 100755 --- a/examples/shell/bin.sh +++ b/examples/shell/bin.sh @@ -18,9 +18,8 @@ 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} +RUNFILES=${RUNFILES:-$0.runfiles/io_bazel} source "${RUNFILES}/examples/shell/lib.sh" showfile - diff --git a/examples/shell/lib.sh b/examples/shell/lib.sh index 979a2c6b67..495ef3d422 100755 --- a/examples/shell/lib.sh +++ b/examples/shell/lib.sh @@ -18,9 +18,8 @@ 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} +RUNFILES=${RUNFILES:-$0.runfiles/io_bazel} function showfile { cat "${RUNFILES}/examples/shell/data/file.txt" } - |