mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 17:25:38 +02:00
Code Issues Wiki Activity

Bug 289834: Converting an C autotools based project into a C++ lost

Browse source 
changes such as build configurations 

Change-Id: Ibec7802fb3fb9e6ea8d9a7060fed5fe511cf3f72
Reviewed-on: https://git.eclipse.org/r/12471
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
IP-Clean: Jeff Johnston <jjohnstn@redhat.com>
Tested-by: Jeff Johnston <jjohnstn@redhat.com>
This commit is contained in:
Jeff Johnston 2013-05-02 17:31:25 -04:00
parent f40788aa92
commit 7ff04d5d8d
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/wizards/ConvertToAutotoolsProjectWizardPage.java
View file

@ -111,8 +111,15 @@ public class ConvertToAutotoolsProjectWizardPage extends ConvertProjectWizardPag
public void convertProject(IProject project, IProgressMonitor monitor, String projectID) throws CoreException {
monitor.beginTask(AutotoolsUIPlugin.getResourceString("WizardMakeProjectConversion.monitor.convertingToMakeProject"), 7); //$NON-NLS-1$
IConfiguration defaultCfg = null;
Boolean convertingNewAutotoolsProject = false;
try {
super.convertProject(project, new SubProgressMonitor(monitor, 1), projectID);
// Bug 289834 - Converting C Autotools project to C++ loses configurations
if (project.hasNature(AutotoolsNewProjectNature.AUTOTOOLS_NATURE_ID)) {
convertingNewAutotoolsProject = true; // set this for finally clause
return; // We have converted C to C++ or vice-versa for an existing Autotools project and are done
}
// Otherwise, we must scrap existing configurations as they will have tool settings we cannot use
monitor.subTask(AutotoolsUIPlugin.getResourceString(MSG_ADD_NATURE));
ManagedCProjectNature.addManagedNature(project, new SubProgressMonitor(monitor, 1));
AutotoolsNewProjectNature.addAutotoolsNature(project, new SubProgressMonitor(monitor, 1));
@ -196,19 +203,21 @@ public class ConvertToAutotoolsProjectWizardPage extends ConvertProjectWizardPag
ManagedBuildManager.saveBuildInfo(project, true);
}
} finally {
// Create a default Autotools configuration and save it.
// We must do this after the ManagedBuildManager does a save because
// we might not yet have a Configuration Description set up for the
// default configuration and we need the id to create our own form
// of configuration.
ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(defaultCfg);
String id = cfgd.getId();
AutotoolsConfigurationManager.getInstance().getConfiguration(project, id, true);
AutotoolsConfigurationManager.getInstance().saveConfigs(project);
IStatus initResult = ManagedBuildManager.initBuildInfoContainer(project);
if (initResult.getCode() != IStatus.OK) {
// At this point, I can live with a failure
AutotoolsUIPlugin.log(initResult);
if (!convertingNewAutotoolsProject) { // Bug 289834 - don't create new config if switching between C and C++
// Create a default Autotools configuration and save it.
// We must do this after the ManagedBuildManager does a save because
// we might not yet have a Configuration Description set up for the
// default configuration and we need the id to create our own form
// of configuration.
ICConfigurationDescription cfgd = ManagedBuildManager.getDescriptionForConfiguration(defaultCfg);
String id = cfgd.getId();
AutotoolsConfigurationManager.getInstance().getConfiguration(project, id, true);
AutotoolsConfigurationManager.getInstance().saveConfigs(project);
IStatus initResult = ManagedBuildManager.initBuildInfoContainer(project);
if (initResult.getCode() != IStatus.OK) {
// At this point, I can live with a failure
AutotoolsUIPlugin.log(initResult);
}
}
monitor.done();
}