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

fixed builder and added move status messages

Browse source
This commit is contained in:
David Inglis 2003-09-04 17:41:21 +00:00
parent 8b7bd775ee
commit 70e982f801
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java
View file

@ -93,7 +93,6 @@ public class MakeBuilder extends ACBuilder {
private boolean invokeMake(int kind, IMakeBuilderInfo info, IProgressMonitor monitor) { private boolean invokeMake(int kind, IMakeBuilderInfo info, IProgressMonitor monitor) {
boolean isClean = false; boolean isClean = false;
IProject currProject = getProject(); IProject currProject = getProject();
SubProgressMonitor subMonitor = null;
if (monitor == null) { if (monitor == null) {
monitor = new NullProgressMonitor(); monitor = new NullProgressMonitor();
@ -115,9 +114,9 @@ public class MakeBuilder extends ACBuilder {
String[] targets = getTargets(kind, info); String[] targets = getTargets(kind, info);
if (targets.length != 0 && targets[targets.length - 1].equals("clean")) //$NON-NLS-1$ if (targets.length != 0 && targets[targets.length - 1].equals("clean")) //$NON-NLS-1$
isClean = true; isClean = true;
// Before launching give visual cues via the monitor // Before launching give visual cues via the monitor
subMonitor = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN); monitor.subTask(MakeCorePlugin.getResourceString("MakeBuilder.Invoking_Command") + buildCommand.toString()); //$NON-NLS-1$
subMonitor.subTask(MakeCorePlugin.getResourceString("MakeBuilder.Invoking_Command") + buildCommand.toString()); //$NON-NLS-1$
String errMsg = null; String errMsg = null;
CommandLauncher launcher = new CommandLauncher(); CommandLauncher launcher = new CommandLauncher();
@ -167,13 +166,13 @@ public class MakeBuilder extends ACBuilder {
p.getOutputStream().close(); p.getOutputStream().close();
} catch (IOException e) { } catch (IOException e) {
} }
if (launcher.waitAndRead(stdout, stderr, subMonitor) != CommandLauncher.OK) if (launcher.waitAndRead(stdout, stderr, new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN)) != CommandLauncher.OK)
errMsg = launcher.getErrorMessage(); errMsg = launcher.getErrorMessage();
subMonitor = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN); monitor.subTask(MakeCorePlugin.getResourceString("MakeBuilder.Updating_project")); //$NON-NLS-1$
subMonitor.subTask(MakeCorePlugin.getResourceString("MakeBuilder.Updating_project")); //$NON-NLS-1$
try { try {
currProject.refreshLocal(IResource.DEPTH_INFINITE, null);
// Do not allow the cancel of the refresh, since the builder is external // Do not allow the cancel of the refresh, since the builder is external
// to Eclipse, files may have been created/modified and we will be out-of-sync. // to Eclipse, files may have been created/modified and we will be out-of-sync.
// The caveat is for hugue projects, it may take sometimes at every build. // The caveat is for hugue projects, it may take sometimes at every build.
@ -202,14 +201,14 @@ public class MakeBuilder extends ACBuilder {
stdout.close(); stdout.close();
stderr.close(); stderr.close();
monitor.subTask(MakeCorePlugin.getResourceString("MakeBuilder.Creating_Markers")); //$NON-NLS-1$
epm.reportProblems(); epm.reportProblems();
subMonitor.done();
} }
} catch (Exception e) { } catch (Exception e) {
CCorePlugin.log(e); CCorePlugin.log(e);
} finally {
monitor.done();
} }
monitor.done();
return (isClean); return (isClean);
} }

3
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/PluginResources.properties
View file

@ -1,8 +1,9 @@
MakeBuilder.buildError=Error launching builder ({0}) MakeBuilder.buildError=Error launching builder ({0})
MakeBuilder.Invoking_Make_Builder=Invoking Make Builder: MakeBuilder.Invoking_Make_Builder=Invoking Make Builder...
MakeBuilder.Invoking_Command=Invoking Command: MakeBuilder.Invoking_Command=Invoking Command:
MakeBuilder.Updating_project=Updating project... MakeBuilder.Updating_project=Updating project...
MakeBuidler.Creating_Markers=Generating markers...
BuildInfoFactory.Missing_Builder=Missing Builder: BuildInfoFactory.Missing_Builder=Missing Builder: