aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build
diff options
context:
space:
mode:
authorGravatar tomlu <tomlu@google.com>2017-09-13 20:14:18 +0200
committerGravatar Philipp Wollermann <philwo@google.com>2017-09-14 18:46:14 +0200
commita615d288b008c36c659fdc17965207bb62d95d8d (patch)
tree3711bb50fa16d46ce8c572d380448b7ea58df09c /src/main/java/com/google/devtools/build
parent73bd3fd2383d90165a53366f11ed059afb3f97a0 (diff)
Rollback context.actions.args() functionality.
This will be rolled forward with a different API. PiperOrigin-RevId: 168566666
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java17
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleImplementationFunctions.java3
2 files changed, 1 insertions, 19 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java
index 2433cdb6c7..8b134bb86b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java
@@ -292,15 +292,11 @@ public class SkylarkActionFactory implements SkylarkValue {
type = Object.class,
allowedTypes = {
@ParamType(type = SkylarkList.class),
- @ParamType(type = Args.class),
},
defaultValue = "[]",
named = true,
positional = false,
- doc =
- "command line arguments of the action. "
- + "May be either a list or an actions.args() object. "
- + "See <a href=\"actions.html#args\">ctx.actions.args()</a>."
+ doc = "command line arguments of the action."
),
@Param(
name = "mnemonic",
@@ -442,14 +438,12 @@ public class SkylarkActionFactory implements SkylarkValue {
name = "arguments",
allowedTypes = {
@ParamType(type = SkylarkList.class),
- @ParamType(type = Args.class),
},
defaultValue = "[]",
named = true,
positional = false,
doc =
"command line arguments of the action. "
- + "May be either a list or an actions.args() object.<br><br>"
+ "Blaze passes the elements in this attribute as arguments to the command."
+ "The command can access these arguments as <code>$1</code>, <code>$2</code>, "
+ "etc. See <a href=\"actions.html#args\">ctx.actions.args()</a>."
@@ -972,15 +966,6 @@ public class SkylarkActionFactory implements SkylarkValue {
}
}
- @SkylarkCallable(
- name = "args",
- doc = "returns an Args object that can be used to build memory-efficient command lines."
- )
- public Args args() {
- return new Args(
- skylarkSemanticsOptions, ruleContext.getAnalysisEnvironment().getEventHandler());
- }
-
@Override
public boolean isImmutable() {
return context.isImmutable();
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleImplementationFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleImplementationFunctions.java
index f83eb5b315..31569e9729 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleImplementationFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleImplementationFunctions.java
@@ -25,7 +25,6 @@ import com.google.devtools.build.lib.analysis.LocationExpander;
import com.google.devtools.build.lib.analysis.Runfiles;
import com.google.devtools.build.lib.analysis.RunfilesProvider;
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
-import com.google.devtools.build.lib.analysis.skylark.SkylarkActionFactory.Args;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.events.Location;
import com.google.devtools.build.lib.skylarkinterface.Param;
@@ -120,14 +119,12 @@ public class SkylarkRuleImplementationFunctions {
name = "arguments",
allowedTypes = {
@ParamType(type = SkylarkList.class),
- @ParamType(type = Args.class),
},
defaultValue = "[]",
named = true,
positional = false,
doc =
"command line arguments of the action."
- + "May be either a list or an actions.args() object."
),
@Param(
name = "mnemonic",