mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

fixed junit failures and deadlock problems

Browse source
This commit is contained in:
David Inglis 2004-05-26 14:48:54 +00:00
parent 4a12e51cb9
commit 09a4ea370c
3 changed files with 62 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeProjectNature.java
View file

@ -36,8 +36,7 @@ public class MakeProjectNature implements IProjectNature {
project.setDescription(description, monitor); project.setDescription(description, monitor);
} }
public static ICommand getBuildSpec(IProject project, String builderID) throws CoreException { public static ICommand getBuildSpec(IProjectDescription description, String builderID) throws CoreException {
IProjectDescription description = project.getDescription();
ICommand[] commands = description.getBuildSpec(); ICommand[] commands = description.getBuildSpec();
for (int i = 0; i < commands.length; ++i) { for (int i = 0; i < commands.length; ++i) {
if (commands[i].getBuilderName().equals(builderID)) { if (commands[i].getBuilderName().equals(builderID)) {
@ -46,6 +45,37 @@ public class MakeProjectNature implements IProjectNature {
} }
return null; return null;
} }
/**
* Update the Java command in the build spec (replace existing one if present,
* add one first if none).
*/
public static IProjectDescription setBuildSpec(IProjectDescription description, ICommand newCommand)
throws CoreException {
ICommand[] oldCommands = description.getBuildSpec();
ICommand oldCommand = getBuildSpec(description, newCommand.getBuilderName());
ICommand[] newCommands;
if (oldCommand == null) {
// Add a Java build spec before other builders (1FWJK7I)
newCommands = new ICommand[oldCommands.length + 1];
System.arraycopy(oldCommands, 0, newCommands, 1, oldCommands.length);
newCommands[0] = newCommand;
} else {
for (int i = 0, max = oldCommands.length; i < max; i++) {
if (oldCommands[i] == oldCommand) {
oldCommands[i] = newCommand;
break;
}
}
newCommands = oldCommands;
}
// Commit the spec change into the project
description.setBuildSpec(newCommands);
return description;
}
/** /**
* Adds a builder to the build spec for the given project. * Adds a builder to the build spec for the given project.

34
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerProvider.java
View file

@ -28,7 +28,10 @@ import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.cdt.core.resources.ScannerProvider; import org.eclipse.cdt.core.resources.ScannerProvider;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.QualifiedName; import org.eclipse.core.runtime.QualifiedName;
import org.w3c.dom.Element; import org.w3c.dom.Element;
@ -175,22 +178,27 @@ public class MakeScannerProvider extends ScannerProvider {
* *
* @param project * @param project
*/ */
public static void updateScannerInfo(MakeScannerInfo scannerInfo) throws CoreException { public static void updateScannerInfo(final MakeScannerInfo scannerInfo) throws CoreException {
IProject project = scannerInfo.getProject(); ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
public void run(IProgressMonitor monitor) throws CoreException {
IProject project = scannerInfo.getProject();
ICDescriptor descriptor = CCorePlugin.getDefault().getCProjectDescription(project); ICDescriptor descriptor = CCorePlugin.getDefault().getCProjectDescription(project);
Element rootElement = descriptor.getProjectData(CDESCRIPTOR_ID); Element rootElement = descriptor.getProjectData(CDESCRIPTOR_ID);
// Clear out all current children // Clear out all current children
// Note: Probably would be a better idea to merge in the data // Note: Probably would be a better idea to merge in the data
Node child = rootElement.getFirstChild(); Node child = rootElement.getFirstChild();
while (child != null) { while (child != null) {
rootElement.removeChild(child); rootElement.removeChild(child);
child = rootElement.getFirstChild(); child = rootElement.getFirstChild();
} }
descriptor.saveProjectData(); descriptor.saveProjectData();
migrateToCPathEntries(scannerInfo); migrateToCPathEntries(scannerInfo);
}
}, null);
} }
} }

13
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/BuildInfoFactory.java
View file

@ -24,6 +24,7 @@ import org.eclipse.cdt.make.core.MakeCorePlugin;
import org.eclipse.cdt.make.core.MakeProjectNature; import org.eclipse.cdt.make.core.MakeProjectNature;
import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
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.IConfigurationElement; import org.eclipse.core.runtime.IConfigurationElement;
@ -316,7 +317,7 @@ public class BuildInfoFactory {
this.project = project; this.project = project;
this.builderID = builderID; this.builderID = builderID;
ICommand builder; ICommand builder;
builder = MakeProjectNature.getBuildSpec(project, builderID); builder = MakeProjectNature.getBuildSpec(project.getDescription(), builderID);
if (builder == null) { if (builder == null) {
throw new CoreException(new Status(IStatus.ERROR, MakeCorePlugin.getUniqueIdentifier(), -1, MakeMessages.getString("BuildInfoFactory.Missing_Builder") + builderID, null)); //$NON-NLS-1$ throw new CoreException(new Status(IStatus.ERROR, MakeCorePlugin.getUniqueIdentifier(), -1, MakeMessages.getString("BuildInfoFactory.Missing_Builder") + builderID, null)); //$NON-NLS-1$
} }
@ -328,10 +329,14 @@ public class BuildInfoFactory {
if (curValue != null && curValue.equals(value)) { if (curValue != null && curValue.equals(value)) {
return; return;
} }
ICommand builder = MakeProjectNature.getBuildSpec(project, builderID); IProjectDescription description = project.getDescription();
ICommand builder = MakeProjectNature.getBuildSpec(description, builderID);
args.put(name, value); args.put(name, value);
builder.setArguments(args); ICommand newBuilder = description.newCommand();
project.setDescription(project.getDescription(), null); newBuilder.setBuilderName(builder.getBuilderName());
newBuilder.setArguments(args);
description = MakeProjectNature.setBuildSpec(description, newBuilder);
project.setDescription(description, null);
} }
protected String getString(String name) { protected String getString(String name) {