mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00
Code Issues Wiki Activity

bug 322169: New Makefile Project with Existing Code wizard silently fails

Browse source
This commit is contained in:
Andrew Gvozdev 2010-09-23 20:42:32 +00:00
parent 59d692e064
commit e2a392976f
1 changed files with 44 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java
View file

@ -26,11 +26,13 @@ import org.eclipse.cdt.managedbuilder.internal.core.ManagedBuildInfo;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject; import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject;
import org.eclipse.cdt.managedbuilder.internal.core.ToolChain; import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
import org.eclipse.cdt.managedbuilder.internal.ui.Messages; import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIPlugin;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor;
@ -63,7 +65,7 @@ public class NewMakeProjFromExisting extends Wizard implements IImportWizard, IN
@Override @Override
public boolean performFinish() { public boolean performFinish() {
final String projectName = page.getProjectName(); final String projectName = page.getProjectName();
final String location = page.getLocation(); final String locationStr = page.getLocation();
final boolean isCPP = page.isCPP(); final boolean isCPP = page.isCPP();
final IToolChain toolChain = page.getToolChain(); final IToolChain toolChain = page.getToolChain();
@ -74,42 +76,50 @@ public class NewMakeProjFromExisting extends Wizard implements IImportWizard, IN
monitor.beginTask(Messages.NewMakeProjFromExisting_1, 10); monitor.beginTask(Messages.NewMakeProjFromExisting_1, 10);
// Create Project // Create Project
IWorkspace workspace = ResourcesPlugin.getWorkspace(); try {
IProject project = workspace.getRoot().getProject(projectName); IWorkspace workspace = ResourcesPlugin.getWorkspace();
IProject project = workspace.getRoot().getProject(projectName);
// TODO handle the case where a .project file was already there
IProjectDescription description = workspace.newProjectDescription(project.getName()); // TODO handle the case where a .project file was already there
description.setLocation(new Path(location));
IProjectDescription description = workspace.newProjectDescription(projectName);
CCorePlugin.getDefault().createCDTProject(description, project, monitor); IPath defaultLocation = workspace.getRoot().getLocation().append(projectName);
Path location = new Path(locationStr);
// Optionally C++ natures if (!location.isEmpty() && !location.equals(defaultLocation)) {
if (isCPP) description.setLocation(location);
CCProjectNature.addCCNature(project, new SubProgressMonitor(monitor, 1)); }
// Set up build information CCorePlugin.getDefault().createCDTProject(description, project, monitor);
ICProjectDescriptionManager pdMgr = CoreModel.getDefault().getProjectDescriptionManager();
ICProjectDescription projDesc = pdMgr.createProjectDescription(project, false); // Optionally C++ natures
ManagedBuildInfo info = ManagedBuildManager.createBuildInfo(project); if (isCPP)
ManagedProject mProj = new ManagedProject(projDesc); CCProjectNature.addCCNature(project, new SubProgressMonitor(monitor, 1));
info.setManagedProject(mProj);
monitor.worked(1); // Set up build information
ICProjectDescriptionManager pdMgr = CoreModel.getDefault().getProjectDescriptionManager();
CfgHolder cfgHolder = new CfgHolder(toolChain, null); ICProjectDescription projDesc = pdMgr.createProjectDescription(project, false);
String s = toolChain == null ? "0" : ((ToolChain)toolChain).getId(); //$NON-NLS-1$ ManagedBuildInfo info = ManagedBuildManager.createBuildInfo(project);
Configuration config = new Configuration(mProj, (ToolChain)toolChain, ManagedBuildManager.calculateChildId(s, null), cfgHolder.getName()); ManagedProject mProj = new ManagedProject(projDesc);
IBuilder builder = config.getEditableBuilder(); info.setManagedProject(mProj);
builder.setManagedBuildOn(false); monitor.worked(1);
CConfigurationData data = config.getConfigurationData();
projDesc.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, data); CfgHolder cfgHolder = new CfgHolder(toolChain, null);
monitor.worked(1); String s = toolChain == null ? "0" : ((ToolChain)toolChain).getId(); //$NON-NLS-1$
Configuration config = new Configuration(mProj, (ToolChain)toolChain, ManagedBuildManager.calculateChildId(s, null), cfgHolder.getName());
pdMgr.setProjectDescription(project, projDesc); IBuilder builder = config.getEditableBuilder();
builder.setManagedBuildOn(false);
CConfigurationData data = config.getConfigurationData();
projDesc.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, data);
monitor.worked(1);
pdMgr.setProjectDescription(project, projDesc);
} catch (Throwable e) {
ManagedBuilderUIPlugin.log(e);
}
monitor.done(); monitor.done();
} }
}; };
try { try {
getContainer().run(true, true, op); getContainer().run(true, true, op);
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {