mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

fix error

Browse source
This commit is contained in:
David Inglis 2003-08-18 15:59:42 +00:00
parent a7a2872b91
commit 61b8cf9771
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/actions/UpdateMakeProjectAction.java
View file

@ -13,6 +13,9 @@ import java.util.ArrayList;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.make.core.BuildInfoFactory;
import org.eclipse.cdt.make.core.IMakeBuilderInfo;
import org.eclipse.cdt.make.core.MakeBuilder;
import org.eclipse.cdt.make.core.MakeCorePlugin; import org.eclipse.cdt.make.core.MakeCorePlugin;
import org.eclipse.cdt.make.core.MakeProjectNature; import org.eclipse.cdt.make.core.MakeProjectNature;
import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
@ -23,6 +26,7 @@ import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.QualifiedName; import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IAction;
@ -98,7 +102,7 @@ public class UpdateMakeProjectAction implements IWorkbenchWindowActionDelegate {
} catch (InterruptedException e) { } catch (InterruptedException e) {
return; return;
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
MakeUIPlugin.logException(e, "Error", "Error updateing Make Projects"); MakeUIPlugin.logException(e, "Error", "Error updating Make Projects");
} }
} }
@ -113,11 +117,13 @@ public class UpdateMakeProjectAction implements IWorkbenchWindowActionDelegate {
new SubProgressMonitor(monitor, 1)); new SubProgressMonitor(monitor, 1));
// add new nature // add new nature
MakeProjectNature.addNature(project[i], new SubProgressMonitor(monitor, 1)); MakeProjectNature.addNature(project[i], new SubProgressMonitor(monitor, 1));
QualifiedName qlocation = new QualifiedName(CCorePlugin.PLUGIN_ID, "buildLocation"), QualifiedName qlocation = new QualifiedName(CCorePlugin.PLUGIN_ID, "buildLocation");
String location = project[i].getPersistentProperty(qlocation); String location = project[i].getPersistentProperty(qlocation);
IMakeBuilderInfo newInfo = BuildInfoFactory.create(project[i], MakeBuilder.BUILDER_ID);
newInfo.setBuildCommand(new Path(location));
//remove old properties //remove old properties
QualifiedName[] qName = QualifiedName[] qName =
{ {
new QualifiedName(CCorePlugin.PLUGIN_ID, "buildFullArguments"), new QualifiedName(CCorePlugin.PLUGIN_ID, "buildFullArguments"),
new QualifiedName(CCorePlugin.PLUGIN_ID, "buildIncrementalArguments"), new QualifiedName(CCorePlugin.PLUGIN_ID, "buildIncrementalArguments"),