Attachment 197334 Details for Bug 338595 – new patch

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

[patch] new patch

rdt-ui_newPatch.txt (text/plain), 5.60 KB, created by John Liu

on 2011-06-03 16:14:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Liu

Created: 2011-06-03 16:14:58 EDT

Size: 5.60 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ptp.rdt.ui
>Index: src/org/eclipse/ptp/rdt/ui/wizards/RemoteCommonProjectWizard.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui/src/org/eclipse/ptp/rdt/ui/wizards/RemoteCommonProjectWizard.java,v
>retrieving revision 1.8
>diff -u -r1.8 RemoteCommonProjectWizard.java
>--- src/org/eclipse/ptp/rdt/ui/wizards/RemoteCommonProjectWizard.java	29 Apr 2011 18:55:00 -0000	1.8
>+++ src/org/eclipse/ptp/rdt/ui/wizards/RemoteCommonProjectWizard.java	3 Jun 2011 20:13:28 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002, 2010 Rational Software Corporation and others.
>+ * Copyright (c) 2002, 2011 Rational Software Corporation 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
>@@ -27,10 +27,15 @@
> import org.eclipse.cdt.core.model.ICProject;
> import org.eclipse.cdt.core.model.ILanguage;
> import org.eclipse.cdt.core.model.LanguageManager;
>+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.internal.core.envvar.EnvironmentVariableManager;
> import org.eclipse.cdt.internal.core.model.CModelManager;
> import org.eclipse.cdt.internal.ui.wizards.ICDTCommonProjectWizard;
>+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
>+import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
>+import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
> import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
> import org.eclipse.cdt.ui.CUIPlugin;
> import org.eclipse.cdt.ui.newui.UIMessages;
>@@ -57,7 +62,6 @@
> import org.eclipse.core.runtime.content.IContentTypeManager;
> import org.eclipse.jface.dialogs.MessageDialog;
> import org.eclipse.jface.operation.IRunnableWithProgress;
>-import org.eclipse.jface.wizard.IWizard;
> import org.eclipse.jface.wizard.IWizardPage;
> import org.eclipse.ptp.internal.rdt.core.index.RemoteFastIndexer;
> import org.eclipse.ptp.internal.rdt.ui.RSEUtils;
>@@ -316,6 +320,19 @@
> 										
> 										ICProject cProject = CModelManager.getDefault().getCModel().getCProject(newProject);
> 										CCorePlugin.getIndexManager().setIndexerId(cProject, RemoteFastIndexer.ID);
>+										//turn off append contributed(local) environment variables for the build configuration of the remote project
>+										IManagedBuildInfo mbsInfo = ManagedBuildManager.getBuildInfo(newProject);	
>+										IConfiguration[] mbcfgs = mbsInfo.getManagedProject().getConfigurations();
>+										if(mbcfgs !=null){
>+											for (IConfiguration mbconfiguration : mbcfgs) {
>+												ICConfigurationDescription c_mb_confgDes = ManagedBuildManager.getDescriptionForConfiguration(mbconfiguration);
>+												if(c_mb_confgDes!=null){
>+													EnvironmentVariableManager.fUserSupplier.setAppendContributedEnvironment(false, c_mb_confgDes);
>+													//EnvironmentVariableManager.fUserSupplier.setAppendEnvironment(false, c_mb_confgDes);
>+												}
>+											}
>+										}
>+										
> 									}
> 									fMonitor.worked(10);
> 								} catch (CoreException e) {
>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.11
>diff -u -r1.11 RemoteMakefileWizardHandler.java
>--- src/org/eclipse/ptp/rdt/ui/wizards/RemoteMakefileWizardHandler.java	2 Jun 2011 15:02:55 -0000	1.11
>+++ src/org/eclipse/ptp/rdt/ui/wizards/RemoteMakefileWizardHandler.java	3 Jun 2011 20:13:28 -0000
>@@ -14,7 +14,6 @@
> 
> 
> 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;
>@@ -32,7 +31,6 @@
> import org.eclipse.cdt.managedbuilder.ui.wizards.STDWizardHandler;
> import org.eclipse.cdt.ui.newui.UIMessages;
> import org.eclipse.cdt.utils.EFSExtensionManager;
>-import org.eclipse.cdt.utils.envvar.StorableEnvironment;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IPath;
>@@ -123,21 +121,7 @@
> 			
> 			doTemplatesPostProcess(project);
> 			doCustom(project);
>-			
>-			// temporarily back out fix to Bug 338595 as it's screwing up the fix for Bug 344380
>-//			//turn off append local environment variables for remote projects
>-//			ICConfigurationDescription c_cfgs[] = des.getConfigurations();
>-//			for (ICConfigurationDescription c_cfg : c_cfgs) {
>-//				EnvironmentVariableManager.fUserSupplier.setAppendContributedEnvironment(false, c_cfg);
>-//				EnvironmentVariableManager.fUserSupplier.setAppendEnvironment(false, c_cfg);
>-//			}
>-			
>-			StorableEnvironment vars = EnvironmentVariableManager.fUserSupplier.getWorkspaceEnvironmentCopy();
>-			vars.setAppendContributedEnvironment(false);
>-			vars.setAppendEnvironment(false);
>-			EnvironmentVariableManager.fUserSupplier.setWorkspaceEnvironment(vars);
>-			
>-			
>+
> 		} finally {
> 			monitor.done();
> 		}

Flags:

recoskie: iplog-
recoskie: review+

Actions: View | Diff

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