aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/cmdline/Label.java
diff options
context:
space:
mode:
authorGravatar Kristina Chodorow <kchodorow@google.com>2016-07-27 16:34:27 +0000
committerGravatar Adam Michael <ajmichael@google.com>2016-07-28 18:36:29 -0400
commita1a31ff6d16811dc72df32861bd1c1a98e104f02 (patch)
treeea94d4c1e7fa41f38be174a73f618152e18f1d65 /src/main/java/com/google/devtools/build/lib/cmdline/Label.java
parentb6b1a3f0670c7e62cec408b06a13ae02bbe1b42f (diff)
Rename some PackageId and RepositoryName fields/methods in prep for deep execroot change
This is in prep for making the execution root path for external repositories ../repo_name (instead of external/repo_name). Right now, the getRunfilesPath() returns that path, so that is renamed getExecRoot() (since the runfiles are really just a reflection of the execRoot structure). getSourceRoot() replaces getPathFragment, which has always been a confusing name (it's not clear from the name what the difference is between it and getPackageFragment()). It returns the relative path to source files for external repositories (external/repo_name). Also renamed/moved to more sensible class a few static RepositoryName fields. -- MOS_MIGRATED_REVID=128594419
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/cmdline/Label.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/cmdline/Label.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/Label.java b/src/main/java/com/google/devtools/build/lib/cmdline/Label.java
index 65f0ce867d..b5a699023e 100644
--- a/src/main/java/com/google/devtools/build/lib/cmdline/Label.java
+++ b/src/main/java/com/google/devtools/build/lib/cmdline/Label.java
@@ -105,7 +105,7 @@ public final class Label implements Comparable<Label>, Serializable, SkylarkPrin
*/
public static Label parseAbsolute(String absName, boolean defaultToMain)
throws LabelSyntaxException {
- String repo = defaultToMain ? "@" : PackageIdentifier.DEFAULT_REPOSITORY;
+ String repo = defaultToMain ? "@" : RepositoryName.DEFAULT_REPOSITORY;
int packageStartPos = absName.indexOf("//");
if (packageStartPos > 0) {
repo = absName.substring(0, packageStartPos);
@@ -336,7 +336,7 @@ public final class Label implements Comparable<Label>, Serializable, SkylarkPrin
+ "<pre class=language-python>Label(\"@repo//pkg/foo:abc\").workspace_root =="
+ " \"external/repo\"</pre>")
public String getWorkspaceRoot() {
- return packageIdentifier.getRepository().getPathFragment().toString();
+ return packageIdentifier.getRepository().getSourceRoot().toString();
}
/**