From 857cda2c45a5cc68c3fa398311c48c571a64915d Mon Sep 17 00:00:00 2001
From: Kristina Chodorow <kchodorow@google.com>
Date: Tue, 19 Apr 2016 13:55:24 +0000
Subject: 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
---
 examples/java-skylark/src/main/java/com/example/myproject/Greeter.java | 3 ++-
 examples/shell/bin.sh                                                  | 3 +--
 examples/shell/lib.sh                                                  | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'examples')

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"
 }
-
-- 
cgit v1.2.3