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

Headless import: when checking whether project is directly under workspace root, use URIUtil.append rather than URI.resolve (which strips the last segment if it doesn't end in '/')

Browse source 
Headless build: wait for outstanding jobs to finish *before* restoring auto-build preference during finally (otherwise we'll wait for a full build we didn't request to take place...)
This commit is contained in:
James Blackburn 2010-03-08 13:14:35 +00:00
parent 492d8e61e0
commit 98c77050c7
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java
View file

@ -251,17 +251,20 @@ public class HeadlessBuilder implements IApplication {
System.err.println(HeadlessBuildMessages.HeadlessBuilder_project + desc.getName() + HeadlessBuildMessages.HeadlessBuilder_already_exists_in_workspace); System.err.println(HeadlessBuildMessages.HeadlessBuilder_project + desc.getName() + HeadlessBuildMessages.HeadlessBuilder_already_exists_in_workspace);
return ERROR; return ERROR;
} }
// Create and open the project
// Note that if the project exists directly under the workspace root, we can't #setLocationURI(...)
if (!URIUtil.equals(org.eclipse.core.runtime.URIUtil.append(
ResourcesPlugin.getWorkspace().getRoot().getLocationURI(),
org.eclipse.core.runtime.URIUtil.lastSegment(project_uri)), project_uri))
desc.setLocationURI(project_uri);
else
project_uri = null;
// Check the URI is valid for a project in this workspace // Check the URI is valid for a project in this workspace
if (!root.getWorkspace().validateProjectLocationURI(project, project_uri).equals(Status.OK_STATUS)) { if (!root.getWorkspace().validateProjectLocationURI(project, project_uri).equals(Status.OK_STATUS)) {
System.err.println(HeadlessBuildMessages.HeadlessBuilder_URI + project_uri + HeadlessBuildMessages.HeadlessBuilder_is_not_valid_in_workspace); System.err.println(HeadlessBuildMessages.HeadlessBuilder_URI + project_uri + HeadlessBuildMessages.HeadlessBuilder_is_not_valid_in_workspace);
return ERROR; return ERROR;
} }
// Create and open the project
// Note that if the project exists directly under the workspace root, we can't #setLocationURI(...)
if (!URIUtil.equals(ResourcesPlugin.getWorkspace().getRoot().getLocationURI().resolve(
org.eclipse.core.runtime.URIUtil.lastSegment(project_uri)), project_uri))
desc.setLocationURI(project_uri);
project.create(desc, monitor); project.create(desc, monitor);
project.open(monitor); project.open(monitor);
} finally { } finally {
@ -360,14 +363,14 @@ public class HeadlessBuilder implements IApplication {
ACBuilder.setAllConfigBuild(buildAllConfigs); ACBuilder.setAllConfigBuild(buildAllConfigs);
} }
} finally { } finally {
// Wait for any outstanding jobs to finish
while (!Job.getJobManager().isIdle())
Thread.sleep(10);
// Reset workspace auto-build preference // Reset workspace auto-build preference
IWorkspaceDescription desc = root.getWorkspace().getDescription(); IWorkspaceDescription desc = root.getWorkspace().getDescription();
desc.setAutoBuilding(isAutoBuilding); desc.setAutoBuilding(isAutoBuilding);
root.getWorkspace().setDescription(desc); root.getWorkspace().setDescription(desc);
// Wait for any outstanding jobs to finish
while (!Job.getJobManager().isIdle())
Thread.sleep(10);
} }
return OK; return OK;