Attachment 196790 Details for Bug 338595 – cvs patch applied to cdt.core and rdt.ui

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

cvs patch applied to cdt.core and rdt.ui

338595_patch.txt (text/plain), 2.57 KB, created by John Liu

on 2011-05-27 13:23:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Liu

Created: 2011-05-27 13:23:43 EDT

Size: 2.57 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.core
>Index: src/org/eclipse/cdt/internal/core/envvar/UserDefinedEnvironmentSupplier.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/envvar/UserDefinedEnvironmentSupplier.java,v
>retrieving revision 1.6
>diff -u -r1.6 UserDefinedEnvironmentSupplier.java
>--- src/org/eclipse/cdt/internal/core/envvar/UserDefinedEnvironmentSupplier.java	23 Aug 2010 14:43:05 -0000	1.6
>+++ src/org/eclipse/cdt/internal/core/envvar/UserDefinedEnvironmentSupplier.java	27 May 2011 15:29:13 -0000
>@@ -145,7 +145,7 @@
> 		}
> 		
> 	}
>-	protected StorableEnvironment getEnvironment(Object context){
>+	public StorableEnvironment getEnvironment(Object context){
> 		return getEnvironment(context,true);
> 	}
> 	
>#P org.eclipse.ptp.rdt.ui
>Index: src/org/eclipse/ptp/rdt/ui/wizards/RemoteMakefileWizardHandler.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/wizards/RemoteMakefileWizardHandler.java,v
>retrieving revision 1.8
>diff -u -r1.8 RemoteMakefileWizardHandler.java
>--- src/org/eclipse/ptp/rdt/ui/wizards/RemoteMakefileWizardHandler.java	26 May 2011 17:15:05 -0000	1.8
>+++ src/org/eclipse/ptp/rdt/ui/wizards/RemoteMakefileWizardHandler.java	27 May 2011 15:29:31 -0000
>@@ -12,7 +12,9 @@
> 
> import java.net.URI;
> 
>+
> import org.eclipse.cdt.core.model.CoreModel;
>+import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
> import org.eclipse.cdt.core.settings.model.ICProjectDescription;
> import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;
> import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
>@@ -123,10 +125,16 @@
> 			doCustom(project);
> 			
> 			//turn off append local environment variables for remote projects
>-			StorableEnvironment vars = EnvironmentVariableManager.fUserSupplier.getWorkspaceEnvironmentCopy();
>-			vars.setAppendContributedEnvironment(false);
>-			vars.setAppendEnvironment(false);
>-			EnvironmentVariableManager.fUserSupplier.setWorkspaceEnvironment(vars);
>+			ICConfigurationDescription cfgs[] = des.getConfigurations();
>+			for (ICConfigurationDescription cfg : cfgs) {
>+				StorableEnvironment vars = EnvironmentVariableManager.fUserSupplier.getEnvironment(cfg);
>+				if(vars!=null){
>+					vars.setAppendContributedEnvironment(false);
>+					vars.setAppendEnvironment(false);
>+				}
>+			}
>+			
>+			
> 		} finally {
> 			monitor.done();
> 		}

Actions: View

Attachments on bug 338595: 196790 | 196806 | 196809 | 197133 | 197181 | 197331 | 197334