diff --git a/core/src/main/java/hudson/matrix/MatrixRun.java b/core/src/main/java/hudson/matrix/MatrixRun.java index 280e6e58f8..255dc5648a 100644 --- a/core/src/main/java/hudson/matrix/MatrixRun.java +++ b/core/src/main/java/hudson/matrix/MatrixRun.java @@ -4,6 +4,9 @@ import hudson.model.Build; import java.io.File; import java.io.IOException; +import java.util.Map; +import java.util.HashMap; +import java.util.Map.Entry; /** * Execution of {@link MatrixConfiguration}. @@ -19,6 +22,19 @@ public class MatrixRun extends Build { super(project, buildDir); } + @Override + public Map getBuildVariables() { + AxisList axes = getParent().getParent().getAxes(); + + // pick up user axes + Map r = new HashMap(); + for (Entry e : getParent().getCombination().entrySet()) { + if(!axes.find(e.getKey()).isSystem()) + r.put(e.getKey(),e.getValue()); + } + return r; + } + @Override public MatrixConfiguration getParent() {// don't know why, but javac wants this return super.getParent(); diff --git a/core/src/main/java/hudson/model/Build.java b/core/src/main/java/hudson/model/Build.java index 0bc24df17e..3c570743b4 100644 --- a/core/src/main/java/hudson/model/Build.java +++ b/core/src/main/java/hudson/model/Build.java @@ -6,6 +6,7 @@ import hudson.tasks.BuildWrapper.Environment; import hudson.tasks.Builder; import hudson.tasks.Publisher; import hudson.triggers.SCMTrigger; +import hudson.matrix.MatrixConfiguration; import org.kohsuke.stapler.StaplerRequest; import java.io.File; @@ -13,6 +14,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Collections; /** * A build of a {@link Project}. @@ -85,6 +87,21 @@ public abstract class Build

,B extends Build> return env; } + /** + * Provides additional variables and their values to {@link Builder}s. + * + *

+ * This mechanism is used by {@link MatrixConfiguration} to pass + * the configuration values to the current build. It is up to + * {@link Builder}s to decide whether it wants to recognize the values + * or how to use them. + * + * ugly ugly hack. + */ + public Map getBuildVariables() { + return Collections.emptyMap(); + } + public Api getApi(final StaplerRequest req) { return new Api(this); } diff --git a/core/src/main/java/hudson/tasks/Ant.java b/core/src/main/java/hudson/tasks/Ant.java index 01811678b8..f7c4a198da 100644 --- a/core/src/main/java/hudson/tasks/Ant.java +++ b/core/src/main/java/hudson/tasks/Ant.java @@ -92,6 +92,7 @@ public class Ant extends Builder { } args.add(exec.getPath()); } + args.addKeyValuePairs("-D",build.getBuildVariables()); args.addTokenized(normalizedTarget); Map env = build.getEnvVars(); diff --git a/core/src/main/java/hudson/tasks/CommandInterpreter.java b/core/src/main/java/hudson/tasks/CommandInterpreter.java index 42539d8225..82238e36c6 100644 --- a/core/src/main/java/hudson/tasks/CommandInterpreter.java +++ b/core/src/main/java/hudson/tasks/CommandInterpreter.java @@ -8,6 +8,7 @@ import hudson.FilePath; import hudson.Util; import java.io.IOException; +import java.util.Map; /** * Common part between {@link Shell} and {@link BatchFile}. @@ -45,7 +46,9 @@ public abstract class CommandInterpreter extends Builder { int r; try { - r = launcher.launch(cmd,build.getEnvVars(),listener.getLogger(),ws).join(); + Map envVars = build.getEnvVars(); + envVars.putAll(build.getBuildVariables()); + r = launcher.launch(cmd,envVars,listener.getLogger(),ws).join(); } catch (IOException e) { Util.displayIOException(e,listener); e.printStackTrace( listener.fatalError("command execution failed") ); diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index 651c31acf0..4a117560e1 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -126,7 +126,7 @@ public class Maven extends Builder { MavenInstallation ai = getMaven(); if(ai==null) { String execName = proj.getWorkspace().act(new DecideDefaultMavenCommand(normalizedTarget)); - args.add(execName).addTokenized(normalizedTarget); + args.add(execName); } else { File exec = ai.getExecutable(); if(exec==null) { @@ -137,8 +137,10 @@ public class Maven extends Builder { listener.fatalError(exec+" doesn't exist"); return false; } - args.add(exec.getPath()).addTokenized(normalizedTarget); + args.add(exec.getPath()); } + args.addKeyValuePairs("-D",build.getBuildVariables()); + args.addTokenized(normalizedTarget); Map env = build.getEnvVars(); if(ai!=null) {