From 857cda2c45a5cc68c3fa398311c48c571a64915d Mon Sep 17 00:00:00 2001 From: Kristina Chodorow 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 --- .../com/google/devtools/build/lib/cmdline/PackageIdentifier.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java') diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java b/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java index 021845cbc6..2fa4494192 100644 --- a/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java +++ b/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java @@ -129,6 +129,14 @@ public final class PackageIdentifier implements Comparable, S return repository.getPathFragment().getRelative(pkgName); } + /** + * Returns the runfiles path for this repository (relative to the x.runfiles/main-repo/ + * directory). + */ + public PathFragment getRunfilesPath() { + return getRepository().getRunfilesPath().getRelative(getPackageFragment()); + } + public PackageIdentifier makeAbsolute() { if (!repository.isDefault()) { return this; -- cgit v1.2.3