Remove the Skylark data configuration accessor and the only repository
use of that accessor. Data configuration access here complicates
the first phase of dynamic configuration support. And the current
use doesn't specifically need this configuration.
We can always add support back in if there's demand.
--
MOS_MIGRATED_REVID=99938987
diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java
index 6864e44..43b42ca 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleContext.java
@@ -35,7 +35,6 @@
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.packages.Attribute;
-import com.google.devtools.build.lib.packages.Attribute.ConfigurationTransition;
import com.google.devtools.build.lib.packages.ImplicitOutputsFunction;
import com.google.devtools.build.lib.packages.ImplicitOutputsFunction.SkylarkImplicitOutputsFunction;
import com.google.devtools.build.lib.packages.OutputFile;
@@ -333,13 +332,6 @@
return ruleContext.getHostConfiguration();
}
- @SkylarkCallable(name = "data_configuration", structField = true,
- doc = "Returns the data configuration. See the <a href=\"#modules.configuration\">"
- + "configuration</a> type for more details.")
- public BuildConfiguration getDataConfiguration() {
- return ruleContext.getConfiguration().getConfiguration(ConfigurationTransition.DATA);
- }
-
@SkylarkCallable(structField = true,
doc = "A <code>struct</code> containing all the output files."
+ " The struct is generated the following way:<br>"
diff --git a/tools/build_rules/test_rules.bzl b/tools/build_rules/test_rules.bzl
index a083731..d6dabc5 100644
--- a/tools/build_rules/test_rules.bzl
+++ b/tools/build_rules/test_rules.bzl
@@ -32,7 +32,7 @@
with actions that always succeed at execution time.
"""
exe = ctx.outputs.executable
- dat = ctx.new_file(ctx.data_configuration.genfiles_dir, exe, ".dat")
+ dat = ctx.new_file(ctx.configuration.genfiles_dir, exe, ".dat")
ctx.file_action(
output=dat,
content=msg)
@@ -67,7 +67,7 @@
"""
### fail(msg) ### <--- This would fail at analysis time.
exe = ctx.outputs.executable
- dat = ctx.new_file(ctx.data_configuration.genfiles_dir, exe, ".dat")
+ dat = ctx.new_file(ctx.configuration.genfiles_dir, exe, ".dat")
ctx.file_action(
output=dat,
content=msg)
@@ -210,7 +210,7 @@
fail(("rule %s doesn't provide attribute %s. "
+ "Its list of attributes is: %s")
% (rule_name, k, dir(rule_)))
- file_ = ctx.new_file(ctx.data_configuration.genfiles_dir, exe, "." + k)
+ file_ = ctx.new_file(ctx.configuration.genfiles_dir, exe, "." + k)
files += [file_]
regexp = provides[k]
commands += [
@@ -245,7 +245,7 @@
if content and matches != -1:
fail("matches only makes sense with regexp")
if content:
- dat = ctx.new_file(ctx.data_configuration.genfiles_dir, exe, ".dat")
+ dat = ctx.new_file(ctx.configuration.genfiles_dir, exe, ".dat")
ctx.file_action(
output=dat,
content=content)
