mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-21 21:52:10 +02:00
Code Issues Wiki Activity

Bug 508948: Use environment from Launch configuration when running

Browse source 
Change-Id: I9f37eded44ece4ae25094cf70fa7f90a706e3e69
This commit is contained in:
Jonah Graham 2017-01-12 20:49:05 +00:00
parent aab8c277ac
commit efa1662b6c
1 changed files with 40 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java
View file

@ -120,6 +120,13 @@ public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate2 {
/** /**
* Gets the CDT environment from the CDT project's configuration referenced * Gets the CDT environment from the CDT project's configuration referenced
* by the launch * by the launch
*
* This code matches what
* org.eclipse.cdt.dsf.gdb.launching.GdbLaunch.getLaunchEnvironment() and
* org.eclipse.cdt.dsf.gdb.service.DebugNewProcessSequence.stepSetEnvironmentVariables(RequestMonitor)
* do. In the GDB case the former is used as the environment for launching
* GDB and the latter for launching the inferior. In the case of run we need
* to combine the two environments as that is what the GDB inferior sees.
*/ */
protected String[] getLaunchEnvironment(ILaunchConfiguration config) throws CoreException { protected String[] getLaunchEnvironment(ILaunchConfiguration config) throws CoreException {
// Get the project // Get the project
@ -139,20 +146,15 @@ public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate2 {
HashMap<String, String> envMap = new HashMap<String, String>(); HashMap<String, String> envMap = new HashMap<String, String>();
// Add in from the config // If the launch configuration is the only environment the inferior should see, just use that
String[] debugEnv = DebugPlugin.getDefault().getLaunchManager().getEnvironment(config); boolean append = config.getAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, true);
if (debugEnv != null) { boolean environmentCollectedFromProject = false;
for (String env : debugEnv) {
String[] parts = env.split("=", 2); //$NON-NLS-1$ if (append && project != null && project.isAccessible()) {
if (parts.length == 2) {
envMap.put(parts[0], parts[1]);
}
}
}
if (project != null && project.isAccessible()) {
ICProjectDescription projDesc = CoreModel.getDefault().getProjectDescription(project, false); ICProjectDescription projDesc = CoreModel.getDefault().getProjectDescription(project, false);
if (projDesc != null) { if (projDesc != null) {
environmentCollectedFromProject = true;
String buildConfigID = config String buildConfigID = config
.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, ""); //$NON-NLS-1$ .getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, ""); //$NON-NLS-1$
ICConfigurationDescription cfg = null; ICConfigurationDescription cfg = null;
@ -169,38 +171,7 @@ public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate2 {
IEnvironmentVariable[] vars = CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(cfg, IEnvironmentVariable[] vars = CCorePlugin.getDefault().getBuildEnvironmentManager().getVariables(cfg,
true); true);
for (IEnvironmentVariable var : vars) { for (IEnvironmentVariable var : vars) {
String value; envMap.put(var.getName(), var.getValue());
switch (var.getOperation()) {
case IEnvironmentVariable.ENVVAR_REPLACE:
value = var.getValue();
break;
case IEnvironmentVariable.ENVVAR_APPEND:
value = envMap.get(var.getName());
if (value != null) {
value += var.getDelimiter() + var.getValue();
} else {
value = var.getValue();
}
break;
case IEnvironmentVariable.ENVVAR_PREPEND:
value = envMap.get(var.getName());
if (value != null) {
value = var.getValue() + var.getDelimiter() + value;
} else {
value = var.getValue();
}
break;
case IEnvironmentVariable.ENVVAR_REMOVE:
envMap.remove(var.getName());
value = null;
break;
default:
value = null;
}
if (value != null) {
envMap.put(var.getName(), value);
}
} }
// Add variables from build info // Add variables from build info
@ -224,7 +195,31 @@ public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate2 {
} }
} }
} }
if (!environmentCollectedFromProject) {
// we haven't collected any environment variables from the project settings,
// therefore simply use the launch settings
return DebugPlugin.getDefault().getLaunchManager().getEnvironment(config);
}
// Now that we have the environment from the project, update it with
// the environment settings the user has explicitly set in the launch
// configuration. There is no API in the launch manager to do this,
// so we create a temp copy with append = false to get around that.
ILaunchConfigurationWorkingCopy wc = config.copy(""); //$NON-NLS-1$
// Don't save this change, it is just temporary, and in just a
// copy of our launchConfig.
wc.setAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, false);
String[] properties = DebugPlugin.getDefault().getLaunchManager().getEnvironment(wc);
if (properties != null) {
for (String env : properties) {
String[] parts = env.split("=", 2); //$NON-NLS-1$
if (parts.length == 2) {
envMap.put(parts[0], parts[1]);
}
}
}
// Turn it into an envp format // Turn it into an envp format
List<String> strings = new ArrayList<String>(envMap.size()); List<String> strings = new ArrayList<String>(envMap.size());
for (Entry<String, String> entry : envMap.entrySet()) { for (Entry<String, String> entry : envMap.entrySet()) {