Attachment #197334 for bug #338595

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

View | Details | Raw Unified | Return to bug 338595
Collapse All | Expand All

Lines 1-5 Link Here

(-)src/org/eclipse/ptp/rdt/ui/wizards/RemoteCommonProjectWizard.java (-2 / +19 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2002, 2010 Rational Software Corporation and others.	2	* Copyright (c) 2002, 2011 Rational Software Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 27-36 Link Here
27	import org.eclipse.cdt.core.model.ICProject;	27	import org.eclipse.cdt.core.model.ICProject;
28	import org.eclipse.cdt.core.model.ILanguage;	28	import org.eclipse.cdt.core.model.ILanguage;
29	import org.eclipse.cdt.core.model.LanguageManager;	29	import org.eclipse.cdt.core.model.LanguageManager;
		30	import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
30	import org.eclipse.cdt.core.settings.model.ICProjectDescription;	31	import org.eclipse.cdt.core.settings.model.ICProjectDescription;
31	import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;	32	import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;
		33	import org.eclipse.cdt.internal.core.envvar.EnvironmentVariableManager;
32	import org.eclipse.cdt.internal.core.model.CModelManager;	34	import org.eclipse.cdt.internal.core.model.CModelManager;
33	import org.eclipse.cdt.internal.ui.wizards.ICDTCommonProjectWizard;	35	import org.eclipse.cdt.internal.ui.wizards.ICDTCommonProjectWizard;
		36	import org.eclipse.cdt.managedbuilder.core.IConfiguration;
		37	import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
		38	import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
34	import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;	39	import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
35	import org.eclipse.cdt.ui.CUIPlugin;	40	import org.eclipse.cdt.ui.CUIPlugin;
36	import org.eclipse.cdt.ui.newui.UIMessages;	41	import org.eclipse.cdt.ui.newui.UIMessages;
Lines 57-63 Link Here
57	import org.eclipse.core.runtime.content.IContentTypeManager;	62	import org.eclipse.core.runtime.content.IContentTypeManager;
58	import org.eclipse.jface.dialogs.MessageDialog;	63	import org.eclipse.jface.dialogs.MessageDialog;
59	import org.eclipse.jface.operation.IRunnableWithProgress;	64	import org.eclipse.jface.operation.IRunnableWithProgress;
60	import org.eclipse.jface.wizard.IWizard;
61	import org.eclipse.jface.wizard.IWizardPage;	65	import org.eclipse.jface.wizard.IWizardPage;
62	import org.eclipse.ptp.internal.rdt.core.index.RemoteFastIndexer;	66	import org.eclipse.ptp.internal.rdt.core.index.RemoteFastIndexer;
63	import org.eclipse.ptp.internal.rdt.ui.RSEUtils;	67	import org.eclipse.ptp.internal.rdt.ui.RSEUtils;
Lines 316-321 Link Here
316		320
317	ICProject cProject = CModelManager.getDefault().getCModel().getCProject(newProject);	321	ICProject cProject = CModelManager.getDefault().getCModel().getCProject(newProject);
318	CCorePlugin.getIndexManager().setIndexerId(cProject, RemoteFastIndexer.ID);	322	CCorePlugin.getIndexManager().setIndexerId(cProject, RemoteFastIndexer.ID);
		323	//turn off append contributed(local) environment variables for the build configuration of the remote project
		324	IManagedBuildInfo mbsInfo = ManagedBuildManager.getBuildInfo(newProject);
		325	IConfiguration[] mbcfgs = mbsInfo.getManagedProject().getConfigurations();
		326	if(mbcfgs !=null){
		327	for (IConfiguration mbconfiguration : mbcfgs) {
		328	ICConfigurationDescription c_mb_confgDes = ManagedBuildManager.getDescriptionForConfiguration(mbconfiguration);
		329	if(c_mb_confgDes!=null){
		330	EnvironmentVariableManager.fUserSupplier.setAppendContributedEnvironment(false, c_mb_confgDes);
		331	//EnvironmentVariableManager.fUserSupplier.setAppendEnvironment(false, c_mb_confgDes);
		332	}
		333	}
		334	}
		335
319	}	336	}
320	fMonitor.worked(10);	337	fMonitor.worked(10);
321	} catch (CoreException e) {	338	} catch (CoreException e) {






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;

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;

			
			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();
		}

Return to bug 338595

Lines 14-20 Link Here

(-)src/org/eclipse/ptp/rdt/ui/wizards/RemoteMakefileWizardHandler.java (-17 / +1 lines)
14		14
15		15
16	import org.eclipse.cdt.core.model.CoreModel;	16	import org.eclipse.cdt.core.model.CoreModel;
17	import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
18	import org.eclipse.cdt.core.settings.model.ICProjectDescription;	17	import org.eclipse.cdt.core.settings.model.ICProjectDescription;
19	import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;	18	import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;
20	import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;	19	import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
Lines 32-38 Link Here
32	import org.eclipse.cdt.managedbuilder.ui.wizards.STDWizardHandler;	31	import org.eclipse.cdt.managedbuilder.ui.wizards.STDWizardHandler;
33	import org.eclipse.cdt.ui.newui.UIMessages;	32	import org.eclipse.cdt.ui.newui.UIMessages;
34	import org.eclipse.cdt.utils.EFSExtensionManager;	33	import org.eclipse.cdt.utils.EFSExtensionManager;
35	import org.eclipse.cdt.utils.envvar.StorableEnvironment;
36	import org.eclipse.core.resources.IProject;	34	import org.eclipse.core.resources.IProject;
37	import org.eclipse.core.runtime.CoreException;	35	import org.eclipse.core.runtime.CoreException;
38	import org.eclipse.core.runtime.IPath;	36	import org.eclipse.core.runtime.IPath;
Lines 123-143 Link Here
123		121
124	doTemplatesPostProcess(project);	122	doTemplatesPostProcess(project);
125	doCustom(project);	123	doCustom(project);
126		124
127	// temporarily back out fix to Bug 338595 as it's screwing up the fix for Bug 344380
128	// //turn off append local environment variables for remote projects
129	// ICConfigurationDescription c_cfgs[] = des.getConfigurations();
130	// for (ICConfigurationDescription c_cfg : c_cfgs) {
131	// EnvironmentVariableManager.fUserSupplier.setAppendContributedEnvironment(false, c_cfg);
132	// EnvironmentVariableManager.fUserSupplier.setAppendEnvironment(false, c_cfg);
133	// }
134
135	StorableEnvironment vars = EnvironmentVariableManager.fUserSupplier.getWorkspaceEnvironmentCopy();
136	vars.setAppendContributedEnvironment(false);
137	vars.setAppendEnvironment(false);
138	EnvironmentVariableManager.fUserSupplier.setWorkspaceEnvironment(vars);
139
140
141	} finally {	125	} finally {
142	monitor.done();	126	monitor.done();
143	}	127	}