Remove Package.LegacyBuilder (unneeded as of commit 3a95f353704dc2f7061e2c0786c2459ac1db0fd1).
--
MOS_MIGRATED_REVID=123107954
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
index fc2a193..dd0df6a 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Package.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -666,41 +666,8 @@
}
}
- /**
- * Builder class for {@link Package} that does its own globbing.
- *
- * <p>Despite its name, this is the normal builder used when parsing BUILD files.
- */
- // TODO(bazel-team): This class is no longer needed and can be removed.
- public static class LegacyBuilder extends Builder {
- LegacyBuilder(PackageIdentifier packageId, String runfilesPrefix) {
- super(packageId, runfilesPrefix);
- }
-
- /**
- * Derive a LegacyBuilder from a normal Builder.
- */
- LegacyBuilder(Builder builder) {
- super(builder.pkg);
- if (builder.getFilename() != null) {
- setFilename(builder.getFilename());
- }
- }
-
- /**
- * Removes a target from the {@link Package} under construction. Intended to be used only by
- * {@link com.google.devtools.build.lib.skyframe.PackageFunction} to remove targets whose
- * labels cross subpackage boundaries.
- */
- public void removeTarget(Target target) {
- if (target.getPackage() == pkg) {
- this.targets.remove(target.getName());
- }
- }
- }
-
- public static LegacyBuilder newExternalPackageBuilder(Path workspacePath, String runfilesPrefix) {
- LegacyBuilder b = new LegacyBuilder(Label.EXTERNAL_PACKAGE_IDENTIFIER, runfilesPrefix);
+ public static Builder newExternalPackageBuilder(Path workspacePath, String runfilesPrefix) {
+ Builder b = new Builder(Label.EXTERNAL_PACKAGE_IDENTIFIER, runfilesPrefix);
b.setFilename(workspacePath);
b.setMakeEnv(new MakeEnvironment.Builder());
return b;
@@ -1269,6 +1236,17 @@
return beforeBuild();
}
+ /**
+ * Removes a target from the {@link Package} under construction. Intended to be used only by
+ * {@link com.google.devtools.build.lib.skyframe.PackageFunction} to remove targets whose
+ * labels cross subpackage boundaries.
+ */
+ public void removeTarget(Target target) {
+ if (target.getPackage() == pkg) {
+ this.targets.remove(target.getName());
+ }
+ }
+
/** Intended for use by {@link com.google.devtools.build.lib.skyframe.PackageFunction} only. */
public Package finishBuild() {
if (alreadyBuilt) {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index f869315..9b56e57 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -108,7 +108,7 @@
}
private void convertAndProcess(
- Package.LegacyBuilder pkgBuilder, Location location, Object value)
+ Package.Builder pkgBuilder, Location location, Object value)
throws EvalException {
T typedValue = type.convert(value, "'package' argument", pkgBuilder.getBuildFileLabel());
process(pkgBuilder, location, typedValue);
@@ -122,7 +122,7 @@
* @param value the value of the argument. Typically passed to {@link Type#convert}
*/
protected abstract void process(
- Package.LegacyBuilder pkgBuilder, Location location, T value)
+ Package.Builder pkgBuilder, Location location, T value)
throws EvalException;
}
@@ -160,7 +160,7 @@
}
@Override
- protected void process(Package.LegacyBuilder pkgBuilder, Location location,
+ protected void process(Package.Builder pkgBuilder, Location location,
List<Label> value) {
pkgBuilder.setDefaultVisibility(getVisibility(pkgBuilder.getBuildFileLabel(), value));
}
@@ -172,7 +172,7 @@
}
@Override
- protected void process(Package.LegacyBuilder pkgBuilder, Location location,
+ protected void process(Package.Builder pkgBuilder, Location location,
Boolean value) {
pkgBuilder.setDefaultTestonly(value);
}
@@ -184,7 +184,7 @@
}
@Override
- protected void process(Package.LegacyBuilder pkgBuilder, Location location,
+ protected void process(Package.Builder pkgBuilder, Location location,
String value) {
pkgBuilder.setDefaultDeprecation(value);
}
@@ -196,7 +196,7 @@
}
@Override
- protected void process(Package.LegacyBuilder pkgBuilder, Location location,
+ protected void process(Package.Builder pkgBuilder, Location location,
List<String> value) {
pkgBuilder.addFeatures(value);
}
@@ -208,7 +208,7 @@
}
@Override
- protected void process(Package.LegacyBuilder pkgBuilder, Location location,
+ protected void process(Package.Builder pkgBuilder, Location location,
License value) {
pkgBuilder.setDefaultLicense(value);
}
@@ -220,7 +220,7 @@
}
@Override
- protected void process(Package.LegacyBuilder pkgBuilder, Location location,
+ protected void process(Package.Builder pkgBuilder, Location location,
Set<DistributionType> value) {
pkgBuilder.setDefaultDistribs(value);
}
@@ -236,7 +236,7 @@
}
@Override
- protected void process(Package.LegacyBuilder pkgBuilder, Location location,
+ protected void process(Package.Builder pkgBuilder, Location location,
List<Label> value) {
pkgBuilder.setDefaultCompatibleWith(value, Package.DEFAULT_COMPATIBLE_WITH_ATTRIBUTE,
location);
@@ -253,7 +253,7 @@
}
@Override
- protected void process(Package.LegacyBuilder pkgBuilder, Location location,
+ protected void process(Package.Builder pkgBuilder, Location location,
List<Label> value) {
pkgBuilder.setDefaultRestrictedTo(value, Package.DEFAULT_RESTRICTED_TO_ATTRIBUTE, location);
}
@@ -687,7 +687,7 @@
static Runtime.NoneType callExportsFiles(Object srcs, Object visibilityO, Object licensesO,
FuncallExpression ast, Environment env) throws EvalException, ConversionException {
- Package.LegacyBuilder pkgBuilder = getContext(env, ast).pkgBuilder;
+ Package.Builder pkgBuilder = getContext(env, ast).pkgBuilder;
List<String> files = Type.STRING_LIST.convert(srcs, "'exports_files' operand");
RuleVisibility visibility = EvalUtils.isNullOrNone(visibilityO)
@@ -1080,7 +1080,7 @@
public Object call(Object[] arguments, FuncallExpression ast, Environment env)
throws EvalException {
- Package.LegacyBuilder pkgBuilder = getContext(env, ast).pkgBuilder;
+ Package.Builder pkgBuilder = getContext(env, ast).pkgBuilder;
// Validate parameter list
if (pkgBuilder.isPackageFunctionUsed()) {
@@ -1189,7 +1189,7 @@
* {@code globber.onInterrupt()} on an {@link InterruptedException}.
*/
// Used outside of bazel!
- public Package.LegacyBuilder createPackageFromPreprocessingResult(
+ public Package.Builder createPackageFromPreprocessingResult(
Package externalPkg,
PackageIdentifier packageId,
Path buildFile,
@@ -1227,7 +1227,7 @@
return buildFileAST;
}
- public Package.LegacyBuilder createPackageFromPreprocessingAst(
+ public Package.Builder createPackageFromPreprocessingAst(
Package externalPkg,
PackageIdentifier packageId,
Path buildFile,
@@ -1393,14 +1393,14 @@
* footprint when making changes here!
*/
public static class PackageContext {
- final Package.LegacyBuilder pkgBuilder;
+ final Package.Builder pkgBuilder;
final Globber globber;
final EventHandler eventHandler;
private final Function<RuleClass, AttributeContainer> attributeContainerFactory;
@VisibleForTesting
public PackageContext(
- Package.LegacyBuilder pkgBuilder,
+ Package.Builder pkgBuilder,
Globber globber,
EventHandler eventHandler,
Function<RuleClass, AttributeContainer> attributeContainerFactory) {
@@ -1510,7 +1510,7 @@
* @see PackageFactory#PackageFactory
*/
@VisibleForTesting // used by PackageFactoryApparatus
- public Package.LegacyBuilder evaluateBuildFile(
+ public Package.Builder evaluateBuildFile(
Package externalPkg,
PackageIdentifier packageId,
BuildFileAST buildFileAST,
@@ -1523,7 +1523,7 @@
Map<String, Extension> imports,
ImmutableList<Label> skylarkFileDependencies)
throws InterruptedException {
- Package.LegacyBuilder pkgBuilder = new Package.LegacyBuilder(
+ Package.Builder pkgBuilder = new Package.Builder(
packageId, ruleClassProvider.getRunfilesPrefix());
StoredEventHandler eventHandler = new StoredEventHandler();
@@ -1611,7 +1611,7 @@
.setPhase(Phase.LOADING)
.build();
- Package.LegacyBuilder pkgBuilder = new Package.LegacyBuilder(packageId,
+ Package.Builder pkgBuilder = new Package.Builder(packageId,
ruleClassProvider.getRunfilesPrefix());
pkgBuilder.setFilename(buildFilePath)
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
index 625e3fe..29275f7 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
@@ -27,7 +27,6 @@
import com.google.devtools.build.lib.events.NullEventHandler;
import com.google.devtools.build.lib.events.StoredEventHandler;
import com.google.devtools.build.lib.packages.Package.Builder;
-import com.google.devtools.build.lib.packages.Package.LegacyBuilder;
import com.google.devtools.build.lib.packages.Package.NameConflictException;
import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension;
import com.google.devtools.build.lib.skylarkinterface.SkylarkSignature;
@@ -74,7 +73,7 @@
"DEFAULT_SERVER_JAVABASE", // serializable so optional
PackageFactory.PKG_CONTEXT);
- private final LegacyBuilder builder;
+ private final Builder builder;
private final Path installDir;
private final Path workspaceDir;
@@ -103,7 +102,7 @@
* @param mutability the Mutability for the current evaluation context
*/
public WorkspaceFactory(
- LegacyBuilder builder,
+ Builder builder,
RuleClassProvider ruleClassProvider,
ImmutableList<EnvironmentExtension> environmentExtensions,
Mutability mutability) {
@@ -120,7 +119,7 @@
* @param workspaceDir the workspace directory
*/
public WorkspaceFactory(
- LegacyBuilder builder,
+ Builder builder,
RuleClassProvider ruleClassProvider,
ImmutableList<EnvironmentExtension> environmentExtensions,
Mutability mutability,
@@ -337,7 +336,7 @@
try {
nameLabel = Label.parseAbsolute("//external:" + name);
try {
- LegacyBuilder builder = PackageFactory.getContext(env, ast).pkgBuilder;
+ Builder builder = PackageFactory.getContext(env, ast).pkgBuilder;
RuleClass ruleClass = ruleFactory.getRuleClass("bind");
builder
.externalPackageData()
