mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-13 19:25:38 +02:00
Code Issues Wiki Activity

Use expandEnvironment().

Browse source
This commit is contained in:
Alain Magloire 2003-01-06 22:02:49 +00:00
parent c3ed134983
commit 9778eef929
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
View file

@ -24,7 +24,6 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
import org.eclipse.cdt.launch.AbstractCLaunchDelegate; import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants; import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin; import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
import org.eclipse.cdt.utils.spawner.EnvironmentReader;
import org.eclipse.cdt.utils.spawner.ProcessFactory; import org.eclipse.cdt.utils.spawner.ProcessFactory;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.resources.ResourcesPlugin;
@ -88,7 +87,7 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
if (wd != null) { if (wd != null) {
opt.setWorkingDirectory(wd.getAbsolutePath()); opt.setWorkingDirectory(wd.getAbsolutePath());
} }
opt.setEnvironment(getEnvironmentProperty(config)); opt.setEnvironment(expandEnvironment(config));
ICDITarget dtarget = dsession.getTargets()[0]; ICDITarget dtarget = dsession.getTargets()[0];
Process process = dtarget.getProcess(); Process process = dtarget.getProcess();
IProcess iprocess = DebugPlugin.newProcess(launch, process, renderProcessLabel(commandArray[0])); IProcess iprocess = DebugPlugin.newProcess(launch, process, renderProcessLabel(commandArray[0]));
@ -193,8 +192,8 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
*/ */
protected Process exec(String[] cmdLine, Properties environ, File workingDirectory) throws CoreException { protected Process exec(String[] cmdLine, Properties environ, File workingDirectory) throws CoreException {
Process p = null; Process p = null;
Properties props = EnvironmentReader.getEnvVars(); Properties props = getDefaultEnvironment();
props.putAll(environ); props.putAll(expandEnvironment(environ));
String[] envp = null; String[] envp = null;
ArrayList envList = new ArrayList(); ArrayList envList = new ArrayList();
Enumeration names = props.propertyNames(); Enumeration names = props.propertyNames();