Merging [MelnormeLang]

# Conflicts:
#	documentation/ChangeLog.md

Fixes #139 properly

documentation/ChangeLog.md

@@ -1,6 +1,7 @@
 ## release ChangeLog
 
 ### (NextVersion)
+ * Fixed: Eclipse variables not being substituted in environment-variables settings of launch configurations.
 
 ### 1.0.1
  * Improved the default names for automatically created launch configurations.

plugin_ide.core/src-lang/melnorme/lang/ide/core/launch/CompositeBuildTargetSettings.java

@@ -36,6 +36,10 @@ public CompositeBuildTargetSettings(BuildTargetSource btSupplier) {
 
 	/* -----------------  ----------------- */
 
+	public BuildTargetSource getBuildTargetSupplier() {
+		return btSupplier;
+	}
+
 	public BuildTarget getValidBuildTarget() throws CommonException {
 		BuildTarget originalBuildTarget = btSupplier.getBuildTarget();
 

plugin_ide.core/src-lang/melnorme/lang/ide/launching/EclipseProcessLauncher.java

@@ -15,54 +15,55 @@
 
 import static melnorme.utilbox.core.Assert.AssertNamespace.assertNotNull;
 
-import java.io.File;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-import melnorme.lang.ide.core.LangCore;
-import melnorme.lang.ide.core.launch.LaunchMessages;
-import melnorme.utilbox.misc.ArrayUtil;
-import melnorme.utilbox.misc.Location;
-import melnorme.utilbox.misc.StringUtil;
-
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.variables.VariablesPlugin;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.model.IProcess;
 
+import melnorme.lang.ide.core.LangCore;
+import melnorme.lang.ide.core.launch.LaunchMessages;
+import melnorme.lang.ide.core.operations.build.VariablesResolver;
+import melnorme.lang.tooling.commands.CommandInvocation;
+import melnorme.lang.tooling.common.ops.CommonOperation;
+import melnorme.utilbox.collections.Indexable;
+import melnorme.utilbox.core.CommonException;
+import melnorme.utilbox.misc.Location;
+import melnorme.utilbox.misc.StringUtil;
+
 /**
  * Helper class to launch an Eclipse IProcess.
  */
 public class EclipseProcessLauncher {
 
-	protected final Location programFileLocation;
-	protected final IPath workingDir;
-	protected final String[] processArguments;
-	protected final Map<String, String> environment;
-	protected final boolean appendEnvironment;
-	protected String processType;
+	public final IProject project;
+	public final CommonOperation buildOperation;
+	public final Location programFileLocation;
+	public final IPath workingDir;
+	public final CommandInvocation unresolvedProgramInvocation;
+	public String processType;
 
 	public EclipseProcessLauncher(
+			IProject project, 
+			CommonOperation buildOperation, 
 			Location programFileLocation, 
 			IPath workingDir, 
-			String[] processArgs,
-			Map<String, 
-			String> environment, 
-			boolean appendEnvironment, 
+			CommandInvocation unresolvedProgramInvocation,
 			String processType
 	) {
+		this.project = assertNotNull(project);
+		this.buildOperation = buildOperation; // can be null
 		this.programFileLocation = assertNotNull(programFileLocation);
 		this.workingDir = workingDir;
-		this.processArguments = processArgs;
-		this.environment = environment;
-		this.appendEnvironment = appendEnvironment;
+		this.unresolvedProgramInvocation = assertNotNull(unresolvedProgramInvocation);
 
 		this.processType = processType;
 	}
@@ -75,29 +76,33 @@ protected CoreException fail(String messagePattern, Object... arguments) throws
 		throw abort(MessageFormat.format(messagePattern, arguments), null);
 	}
 
-	protected IProcess launchProcess(final ILaunch launch) throws CoreException {
+	protected IProcess launchProcess(final ILaunch launch) throws CoreException, CommonException {
 		if(workingDir != null && !workingDir.toFile().exists()) {
 			fail(LaunchMessages.errWorkingDirectoryDoesntExist, workingDir);
 		}
 		if(!programFileLocation.toFile().exists()) {
 			fail(LaunchMessages.errExecutableFileDoesntExist, programFileLocation);
 		}
 
-		String[] cmdLine = getCommandLine();
-		Process sp = newSystemProcess(cmdLine);
+		CommandInvocation programInvocation = unresolvedProgramInvocation.getResolvedCommandInvocation(
+			new VariablesResolver(VariablesPlugin.getDefault().getStringVariableManager()));
+
+		Indexable<String> cmdLine = programInvocation.parseCommandLineArguments();
+		Process sp = newSystemProcess(programInvocation);
 
 		return newEclipseProcessWithLabelUpdater(launch, cmdLine, sp);
 	}
 
-	/** Create the {@link java.lang.Process}. */
-	protected Process newSystemProcess(String[] cmdLine) throws CoreException {
+	protected Process newSystemProcess(CommandInvocation resolvedProgramInvocation) throws CoreException {
+
+		ProcessBuilder processBuilder = resolvedProgramInvocation.getProcessBuilder();
+		if(workingDir != null) {
+			processBuilder.directory(workingDir.toFile());
+		}
 
-		File workingDirectory = workingDir.toFile();
 		Process sp= null;
 		try {
 
-			ProcessBuilder processBuilder = new ProcessBuilder(cmdLine).directory(workingDirectory);
-			setupEnvironment(processBuilder);
 
 			sp = processBuilder.start();
 		} catch (IOException e) {
@@ -106,39 +111,7 @@ protected Process newSystemProcess(String[] cmdLine) throws CoreException {
 		return sp;
 	}
 
-	protected void setupEnvironment(ProcessBuilder processBuilder) throws CoreException {
-		try {
-			// This is a non-standard map that can throw some exceptions, see doc
-			Map<String, String> env = processBuilder.environment();
-			if(!appendEnvironment) {
-				env.clear();
-			}
-
-			if(environment != null) {
-				for (String key : environment.keySet()) {
-					String value = environment.get(key);
-					env.put(key, value);
-				}
-			}
-		} catch (UnsupportedOperationException e) {
-			abort(LaunchMessages.errFailedToSetupProcessEnvironment, e);
-		} catch (IllegalArgumentException e) {
-			abort(LaunchMessages.errFailedToSetupProcessEnvironment, e);
-		}
-	}
-
-	protected final String[] getCommandLine() {
-		List<String> items = new ArrayList<String>();
-		prepareCommandLine(items);
-		return ArrayUtil.createFrom(items, String.class);
-	}
-
-	protected void prepareCommandLine(List<String> commandLine) {
-		commandLine.add(programFileLocation.toString());
-		commandLine.addAll(Arrays.asList(processArguments));
-	}
-
-	public IProcess newEclipseProcessWithLabelUpdater(ILaunch launch, String[] cmdLine, Process sp)
+	public IProcess newEclipseProcessWithLabelUpdater(ILaunch launch, Indexable<String> cmdLine, Process sp)
 			throws CoreException {
 
 		final String cmdLineLabel = renderCommandLineLabel(cmdLine);
@@ -173,7 +146,7 @@ protected String renderProcessLabel() {
 		return MessageFormat.format("{0} ({1})", processFilePath, timestampLabel);
 	}
 
-	protected static String renderCommandLineLabel(String[] commandLine) {
+	protected static String renderCommandLineLabel(Indexable<String> commandLine) {
 		return StringUtil.collToString(commandLine, "\n");
 	}