diff options
| author |  Laurent Le Brun <laurentlb@google.com> | 2016-06-17 13:36:24 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2016-06-20 09:34:06 +0000 |
| commit | f3cf98faa44f3b647956868422a11074aff0e9ee (patch) | |
| tree | 93a361a853b3ebccd0af7074c993c29618ddf0e4 /src/main/java/com/google/devtools/build/lib/cmdline | |
| parent | 48f2470b3cc60c11e46a95872a409341c4224096 (diff) | |
Rollback of commit bdfd58a8ca2ed5735d6aaa5b238fb0f689515724.
--
MOS_MIGRATED_REVID=125160288
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/cmdline')
3 files changed, 6 insertions, 9 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 75b7b2955f..73c7e5ecdb 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 @@ -65,7 +65,7 @@ public final class Label implements Comparable<Label>, Serializable, SkylarkPrin public static final PackageIdentifier EXTERNAL_PACKAGE_IDENTIFIER = PackageIdentifier.createInMainRepo(EXTERNAL_PACKAGE_NAME); - public static final String EXTERNAL_PATH_PREFIX = ".."; + public static final String EXTERNAL_PATH_PREFIX = "external"; private static final Interner<Label> LABEL_INTERNER = Interners.newWeakInterner(); @@ -310,7 +310,7 @@ public final class Label implements Comparable<Label>, Serializable, SkylarkPrin doc = "Returns the execution root for the workspace of this label, relative to the execroot. " + "For instance:<br>" + "<pre class=language-python>Label(\"@repo//pkg/foo:abc\").workspace_root ==" - + " \"../repo\"</pre>") + + " \"external/repo\"</pre>") public String getWorkspaceRoot() { return packageIdentifier.getRepository().getPathFragment().toString(); } 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 4f0652a981..74cd6fa8d7 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 @@ -48,17 +48,14 @@ public final class PackageIdentifier implements Comparable<PackageIdentifier>, S return INTERNER.intern(new PackageIdentifier(repository, pkgName)); } - static final String DEFAULT_REPOSITORY = ""; - public static final RepositoryName MAIN_REPOSITORY_NAME; + public static final String DEFAULT_REPOSITORY = ""; public static final RepositoryName DEFAULT_REPOSITORY_NAME; - public static final PackageIdentifier EMPTY_PACKAGE_IDENTIFIER; + public static final RepositoryName MAIN_REPOSITORY_NAME; static { try { DEFAULT_REPOSITORY_NAME = RepositoryName.create(DEFAULT_REPOSITORY); MAIN_REPOSITORY_NAME = RepositoryName.create("@"); - EMPTY_PACKAGE_IDENTIFIER = - PackageIdentifier.create(MAIN_REPOSITORY_NAME, PathFragment.EMPTY_FRAGMENT); } catch (LabelSyntaxException e) { throw new IllegalStateException(e); } diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/RepositoryName.java b/src/main/java/com/google/devtools/build/lib/cmdline/RepositoryName.java index eab5320371..6b89a6ee7a 100644 --- a/src/main/java/com/google/devtools/build/lib/cmdline/RepositoryName.java +++ b/src/main/java/com/google/devtools/build/lib/cmdline/RepositoryName.java @@ -205,10 +205,10 @@ public final class RepositoryName implements Serializable { * Returns the runfiles path for this repository (relative to the x.runfiles/main-repo/ * directory). If we don't know the name of this repo (i.e., it is in the main repository), * return an empty path fragment. - * TODO(kchodorow): remove this. */ public PathFragment getRunfilesPath() { - return getPathFragment(); + return isDefault() || isMain() + ? PathFragment.EMPTY_FRAGMENT : new PathFragment("..").getRelative(strippedName()); } /** |