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

invokeMake not to clear state on error.

Browse source
This commit is contained in:
Alain Magloire 2002-11-22 17:03:34 +00:00
parent 5b6c1eb100
commit 13702bffcb
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CBuilder.java
View file

@ -91,7 +91,6 @@ public class CBuilder extends ACBuilder {
private boolean invokeMake(boolean fullBuild, IProgressMonitor monitor) { private boolean invokeMake(boolean fullBuild, IProgressMonitor monitor) {
boolean isClean = false; boolean isClean = false;
boolean fatalBuild = false;
boolean isCanceled = false; boolean isCanceled = false;
IProject currProject = getProject(); IProject currProject = getProject();
SubProgressMonitor subMonitor = null; SubProgressMonitor subMonitor = null;
@ -161,7 +160,7 @@ public class CBuilder extends ACBuilder {
subMonitor = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN); subMonitor = new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN);
subMonitor.subTask("Parsing"); subMonitor.subTask("Parsing");
fatalBuild = epm.reportProblems(); epm.reportProblems();
if (errMsg != null) { if (errMsg != null) {
String errorDesc = CCorePlugin.getFormattedString(BUILD_ERROR, makepath.toString()); String errorDesc = CCorePlugin.getFormattedString(BUILD_ERROR, makepath.toString());
@ -170,7 +169,6 @@ public class CBuilder extends ACBuilder {
buf.append("(").append(errMsg).append(")"); buf.append("(").append(errMsg).append(")");
cos.write(buf.toString().getBytes()); cos.write(buf.toString().getBytes());
cos.flush(); cos.flush();
fatalBuild = true;
} }
subMonitor.done(); subMonitor.done();
monitor.setCanceled(isCanceled); monitor.setCanceled(isCanceled);
@ -181,7 +179,7 @@ public class CBuilder extends ACBuilder {
CCorePlugin.log(e); CCorePlugin.log(e);
} }
monitor.done(); monitor.done();
return (isClean || fatalBuild); return (isClean);
} }
/** /**