From 0709b4314d7d2d875d0c18de53143a6246ef0c8e Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Fri, 24 May 2013 13:59:37 -0700 Subject: [PATCH] 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." This reverts commit 55afbf6bc5b522194a7474da2b1c90f5828ffd4a. --- .../eclipse/cdt/dsf/gdb/launching/LaunchUtils.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java index 355831aa78b..a856769377d 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java @@ -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 * are made available under the terms of the Eclipse Public License v1.0 * 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.internal.GdbPlugin; 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.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -441,13 +440,7 @@ public class LaunchUtils { ICdtVariable[] build_vars = CCorePlugin.getDefault().getCdtVariableManager().getVariables(cfg); for (ICdtVariable var : build_vars) { try { - // EclipseVarMacro variables are internal to Eclipse and have nothing to do with - // 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()); - } + envMap.put(var.getName(), var.getStringValue()); } catch (CdtVariableException e) { // 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 List strings= new ArrayList(envMap.size()); for (Entry entry : envMap.entrySet()) { - StringBuilder buffer= new StringBuilder(entry.getKey()); + StringBuffer buffer= new StringBuffer(entry.getKey()); buffer.append('=').append(entry.getValue()); strings.add(buffer.toString()); }