From 8d88fb418eb9be689016320fec81ff46151b8da2 Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Sat, 3 May 2008 09:32:27 +0000 Subject: [PATCH] Bug # 223832 : Clean with internal builder ignores success of clean command --- .../internal/core/CommonBuilder.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java index 0a34606889f..30541f04699 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java @@ -1643,9 +1643,18 @@ public class CommonBuilder extends ACBuilder { consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.flush(); buf = new StringBuffer(); - - sBuilder.build(consoleOutStream, consoleOutStream, monitor); - + int result = sBuilder.build(consoleOutStream, consoleOutStream, monitor); + //Throw a core exception indicating that the clean command failed + if(result == StepBuilder.STATUS_ERROR_LAUNCH) + { + try + { + consoleOutStream.close(); + } + catch(IOException e){} + Status status = new Status(Status.INFO, ManagedBuilderCorePlugin.getUniqueIdentifier(), "Failed to exec delete command");//$NON-NLS-1 + throw new CoreException(status); + } // Report a successful clean String successMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, curProject.getName()); buf.append(successMsg);