Merge pull request #378 from maven-nar/feature/apply-environment-to-execute

Fix missing setting of the execution environment

Author: GregDomjan

src/main/java/com/github/maven_nar/cpptasks/CUtil.java

@@ -420,7 +420,8 @@ public static int runCommand(final CCTask task, final File workingDir, final Str
       exe.setNewenvironment(newEnvironment);
       return exe.execute();
             */
-	  return CommandExecution.runCommand(cmdline,workingDir,task);
+
+	  return CommandExecution.runCommand(cmdline,workingDir,task,env.getVariablesVector());
     } catch (final java.io.IOException exc) {
       throw new BuildException("Could not launch " + cmdline[0] + ": " + exc, task.getLocation());
     }

src/main/java/com/github/maven_nar/cpptasks/CommandExecution.java

@@ -2,8 +2,10 @@
 
 
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.Environment;
 
 import java.io.*;
+import java.util.Vector;
 
 
 class StreamGobbler extends Thread {
@@ -41,7 +43,7 @@ public class CommandExecution {
 
 
 
-    public static int runCommand(String[] cmdArgs, File workDir, CCTask task) throws  IOException{
+    public static int runCommand(String[] cmdArgs, File workDir, CCTask task, Vector<Environment.Variable> env) throws  IOException{
 
 
         try {
@@ -54,6 +56,11 @@ public static int runCommand(String[] cmdArgs, File workDir, CCTask task) throws
 
             pb.directory(workDir);
 
+            for (Environment.Variable var:env) {
+                pb.environment().put(var.getKey(), var.getValue());
+                task.log("Environment variable: " + var.getKey() + "=" + var.getValue(), Project.MSG_VERBOSE);
+            }
+
             //Start the new process
             Process process = pb.start();