mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Revert "Bug 408522. Don't include EclipseVarMacro variables when creating launch environment variables. EclipseVarMacro variables are internal to Eclipse and have nothing to do with environment variables."

Browse source 
This reverts commit 55afbf6bc5.
This commit is contained in:
Sergey Prigogin 2013-05-24 13:59:37 -07:00
parent 7d038752af
commit 0709b4314d
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2010, 2013 Ericsson and others. * Copyright (c) 2010, 2012 Ericsson and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -43,7 +43,6 @@ import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants;
import org.eclipse.cdt.dsf.gdb.IGdbDebugPreferenceConstants; import org.eclipse.cdt.dsf.gdb.IGdbDebugPreferenceConstants;
import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin; import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
import org.eclipse.cdt.dsf.gdb.service.SessionType; import org.eclipse.cdt.dsf.gdb.service.SessionType;
import org.eclipse.cdt.internal.core.cdtvariables.EclipseVariablesVariableSupplier.EclipseVarMacro;
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.IProject; import org.eclipse.core.resources.IProject;
@ -441,13 +440,7 @@ public class LaunchUtils {
ICdtVariable[] build_vars = CCorePlugin.getDefault().getCdtVariableManager().getVariables(cfg); ICdtVariable[] build_vars = CCorePlugin.getDefault().getCdtVariableManager().getVariables(cfg);
for (ICdtVariable var : build_vars) { for (ICdtVariable var : build_vars) {
try { try {
// EclipseVarMacro variables are internal to Eclipse and have nothing to do with envMap.put(var.getName(), var.getStringValue());
// environment variables. Some of them, e.g. project_classpath, may be lethal
// when they have very large values exceeding shell limit.
// See http://bugs.eclipse.org/bugs/show_bug.cgi?id=408522
if (!(var instanceof EclipseVarMacro)) {
envMap.put(var.getName(), var.getStringValue());
}
} catch (CdtVariableException e) { } catch (CdtVariableException e) {
// Some Eclipse dynamic variables can't be resolved dynamically... we don't care. // Some Eclipse dynamic variables can't be resolved dynamically... we don't care.
} }
@ -456,7 +449,7 @@ public class LaunchUtils {
// 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()) {
StringBuilder buffer= new StringBuilder(entry.getKey()); StringBuffer buffer= new StringBuffer(entry.getKey());
buffer.append('=').append(entry.getValue()); buffer.append('=').append(entry.getValue());
strings.add(buffer.toString()); strings.add(buffer.toString());
} }