mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

bug 343700: Exceptions during Build Selected Files operation are not displayed in the Build Console

Browse source 
Patch from Alex Freidin
This commit is contained in:
Andrew Gvozdev 2011-04-26 22:22:33 +00:00
parent acf993572f
commit 44a0ca086b
1 changed files with 77 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

160
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java
View file

@ -69,7 +69,6 @@ import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.core.runtime.URIUtil;
/** /**
* This is the incremental builder associated with a managed build project. It dynamically * This is the incremental builder associated with a managed build project. It dynamically
@ -287,7 +286,7 @@ public class GeneratedMakefileBuilder extends ACBuilder {
private static final String ERROR_HEADER = "GeneratedmakefileBuilder error ["; //$NON-NLS-1$ private static final String ERROR_HEADER = "GeneratedmakefileBuilder error ["; //$NON-NLS-1$
private static final String MAKE = "ManagedMakeBuilder.message.make"; //$NON-NLS-1$ private static final String MAKE = "ManagedMakeBuilder.message.make"; //$NON-NLS-1$
private static final String MARKERS = "ManagedMakeBuilder.message.creating.markers"; //$NON-NLS-1$ private static final String MARKERS = "ManagedMakeBuilder.message.creating.markers"; //$NON-NLS-1$
private static final String NEWLINE = System.getProperty("line.separator"); //$NON-NLS-1$ private static final String NEWLINE = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
private static final String NOTHING_BUILT = "ManagedMakeBuilder.message.no.build"; //$NON-NLS-1$ private static final String NOTHING_BUILT = "ManagedMakeBuilder.message.no.build"; //$NON-NLS-1$
private static final String REFRESH = "ManagedMakeBuilder.message.updating"; //$NON-NLS-1$ private static final String REFRESH = "ManagedMakeBuilder.message.updating"; //$NON-NLS-1$
private static final String REFRESH_ERROR = BUILD_ERROR + ".refresh"; //$NON-NLS-1$ private static final String REFRESH_ERROR = BUILD_ERROR + ".refresh"; //$NON-NLS-1$
@ -364,12 +363,10 @@ public class GeneratedMakefileBuilder extends ACBuilder {
} }
consoleHeader[1] = configName; consoleHeader[1] = configName;
consoleHeader[2] = getProject().getName(); consoleHeader[2] = getProject().getName();
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(NEWLINE);
buf.append(ManagedMakeMessages.getFormattedString(CONSOLE_HEADER, consoleHeader)); buf.append(ManagedMakeMessages.getFormattedString(CONSOLE_HEADER, consoleHeader)).append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(status.getMessage()).append(NEWLINE);
buf.append(status.getMessage());
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.write(buf.toString().getBytes());
consoleOutStream.flush(); consoleOutStream.flush();
consoleOutStream.close(); consoleOutStream.close();
@ -615,16 +612,14 @@ public class GeneratedMakefileBuilder extends ACBuilder {
consoleHeader[0] = ManagedMakeMessages.getResourceString(TYPE_CLEAN); consoleHeader[0] = ManagedMakeMessages.getResourceString(TYPE_CLEAN);
consoleHeader[1] = info.getConfigurationName(); consoleHeader[1] = info.getConfigurationName();
consoleHeader[2] = getProject().getName(); consoleHeader[2] = getProject().getName();
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(NEWLINE);
buf.append(ManagedMakeMessages.getFormattedString(CONSOLE_HEADER, consoleHeader)); buf.append(ManagedMakeMessages.getFormattedString(CONSOLE_HEADER, consoleHeader)).append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$
consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.write(buf.toString().getBytes());
consoleOutStream.flush(); consoleOutStream.flush();
buf = new StringBuffer(); buf = new StringBuffer();
// Report a successful clean // Report a successful clean
String successMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); String successMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName());
buf.append(successMsg); buf.append(successMsg).append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.write(buf.toString().getBytes());
consoleOutStream.flush(); consoleOutStream.flush();
consoleOutStream.close(); consoleOutStream.close();
@ -932,16 +927,15 @@ public class GeneratedMakefileBuilder extends ACBuilder {
consoleHeader[1] = info.getConfigurationName(); consoleHeader[1] = info.getConfigurationName();
consoleHeader[2] = currentProject.getName(); consoleHeader[2] = currentProject.getName();
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(NEWLINE);
buf.append(ManagedMakeMessages.getFormattedString(CONSOLE_HEADER, consoleHeader)); buf.append(ManagedMakeMessages.getFormattedString(CONSOLE_HEADER, consoleHeader)).append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$
IConfiguration cfg = info.getDefaultConfiguration(); IConfiguration cfg = info.getDefaultConfiguration();
if(!cfg.isSupported()){ if(!cfg.isSupported()){
buf.append(ManagedMakeMessages.getFormattedString(WARNING_UNSUPPORTED_CONFIGURATION,new String[] {cfg.getName(),cfg.getToolChain().getName()})); String msg = ManagedMakeMessages.getFormattedString(WARNING_UNSUPPORTED_CONFIGURATION,new String[] {cfg.getName(),cfg.getToolChain().getName()});
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(msg).append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(NEWLINE);
} }
consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.write(buf.toString().getBytes());
consoleOutStream.flush(); consoleOutStream.flush();
@ -1043,12 +1037,10 @@ public class GeneratedMakefileBuilder extends ACBuilder {
// If the status value returned from "make -q" is 0, then the build state is up-to-date // If the status value returned from "make -q" is 0, then the build state is up-to-date
isuptodate = true; isuptodate = true;
// Report that the build was up to date, and thus nothing needs to be built // Report that the build was up to date, and thus nothing needs to be built
String uptodateMsg = ManagedMakeMessages String uptodateMsg = ManagedMakeMessages.getFormattedString(NOTHING_BUILT, currentProject.getName());
.getFormattedString(NOTHING_BUILT, currentProject.getName());
buf = new StringBuffer(); buf = new StringBuffer();
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$ buf.append(NEWLINE);
buf.append(uptodateMsg); buf.append(uptodateMsg).append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
// Write message on the console // Write message on the console
consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.write(buf.toString().getBytes());
consoleOutStream.flush(); consoleOutStream.flush();
@ -1125,18 +1117,14 @@ public class GeneratedMakefileBuilder extends ACBuilder {
// Report either the success or failure of our mission // Report either the success or failure of our mission
buf = new StringBuffer(); buf = new StringBuffer();
if (errMsg != null && errMsg.length() > 0) { if (errMsg != null && errMsg.length() > 0) {
String errorDesc = ManagedMakeMessages String errorDesc = ManagedMakeMessages.getResourceString(BUILD_ERROR);
.getResourceString(BUILD_ERROR); buf.append(errorDesc).append(NEWLINE);
buf.append(errorDesc);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
buf.append("(").append(errMsg).append(")"); //$NON-NLS-1$ //$NON-NLS-2$ buf.append("(").append(errMsg).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
} else { } else {
// Report a successful build // Report a successful build
String successMsg = ManagedMakeMessages String successMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED,
.getFormattedString(BUILD_FINISHED, currentProject.getName());
currentProject.getName()); buf.append(successMsg).append(NEWLINE);
buf.append(successMsg);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
} }
// Write message on the console // Write message on the console
@ -1145,8 +1133,7 @@ public class GeneratedMakefileBuilder extends ACBuilder {
epmOutputStream.close(); epmOutputStream.close();
// Generate any error markers that the build has discovered // Generate any error markers that the build has discovered
monitor.subTask(ManagedMakeMessages monitor.subTask(ManagedMakeMessages.getResourceString(MARKERS));
.getResourceString(MARKERS));
addBuilderMarkers(epm); addBuilderMarkers(epm);
consoleOutStream.close(); consoleOutStream.close();
} }
@ -1245,18 +1232,17 @@ public class GeneratedMakefileBuilder extends ACBuilder {
consoleHeader[1] = cfg.getName(); consoleHeader[1] = cfg.getName();
consoleHeader[2] = currentProject.getName(); consoleHeader[2] = currentProject.getName();
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(NEWLINE);
buf.append(ManagedMakeMessages.getFormattedString(CONSOLE_HEADER, consoleHeader)); buf.append(ManagedMakeMessages.getFormattedString(CONSOLE_HEADER, consoleHeader)).append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$
buf.append(ManagedMakeMessages.getResourceString(INTERNAL_BUILDER_HEADER_NOTE)); buf.append(ManagedMakeMessages.getResourceString(INTERNAL_BUILDER_HEADER_NOTE));
buf.append("\n"); //$NON-NLS-1$ buf.append("\n"); //$NON-NLS-1$
if(!cfg.isSupported()){ if(!cfg.isSupported()){
buf.append(ManagedMakeMessages.getFormattedString(WARNING_UNSUPPORTED_CONFIGURATION,new String[] {cfg.getName(),cfg.getToolChain().getName()})); String msg = ManagedMakeMessages.getFormattedString(WARNING_UNSUPPORTED_CONFIGURATION,new String[] {cfg.getName(),cfg.getToolChain().getName()});
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(msg).append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(NEWLINE);
} }
consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.write(buf.toString().getBytes());
consoleOutStream.flush(); consoleOutStream.flush();
@ -1307,7 +1293,7 @@ public class GeneratedMakefileBuilder extends ACBuilder {
.getResourceString(BUILD_FAILED_ERR)); .getResourceString(BUILD_FAILED_ERR));
break; break;
} }
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$ buf.append(NEWLINE);
// Report time and number of threads used // Report time and number of threads used
// buf.append("Time consumed: "); // buf.append("Time consumed: ");
@ -1327,7 +1313,7 @@ public class GeneratedMakefileBuilder extends ACBuilder {
buf.append(ManagedMakeMessages.getFormattedString("CommonBuilder.7", Integer.toString(ParallelBuilder.lastThreadsUsed))); //$NON-NLS-1$ buf.append(ManagedMakeMessages.getFormattedString("CommonBuilder.7", Integer.toString(ParallelBuilder.lastThreadsUsed))); //$NON-NLS-1$
// buf.append(ParallelBuilder.lastThreadsUsed); // buf.append(ParallelBuilder.lastThreadsUsed);
} }
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(NEWLINE);
// Write message on the console // Write message on the console
consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.write(buf.toString().getBytes());
@ -1339,8 +1325,7 @@ public class GeneratedMakefileBuilder extends ACBuilder {
addBuilderMarkers(epm); addBuilderMarkers(epm);
} else { } else {
buf = new StringBuffer(); buf = new StringBuffer();
buf.append(ManagedMakeMessages.getFormattedString(NOTHING_BUILT, getProject().getName())); buf.append(ManagedMakeMessages.getFormattedString(NOTHING_BUILT, getProject().getName())).append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.write(buf.toString().getBytes());
consoleOutStream.flush(); consoleOutStream.flush();
} }
@ -1348,12 +1333,9 @@ public class GeneratedMakefileBuilder extends ACBuilder {
} catch (Exception e) { } catch (Exception e) {
if(consoleOutStream != null){ if(consoleOutStream != null){
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer();
String errorDesc = ManagedMakeMessages String errorDesc = ManagedMakeMessages.getResourceString(BUILD_ERROR);
.getResourceString(BUILD_ERROR); buf.append(errorDesc).append(NEWLINE);
buf.append(errorDesc); buf.append("(").append(e.getLocalizedMessage()).append(")").append(NEWLINE); //$NON-NLS-1$ //$NON-NLS-2$
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
buf.append("(").append(e.getLocalizedMessage()).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
try { try {
consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.write(buf.toString().getBytes());
@ -1402,6 +1384,8 @@ public class GeneratedMakefileBuilder extends ACBuilder {
boolean initNewConsole, boolean initNewConsole,
boolean printFinishedMessage, boolean printFinishedMessage,
IProgressMonitor monitor) { IProgressMonitor monitor) {
OutputStream epmOutputStream = null;
// Get the project and make sure there's a monitor to cancel the build // Get the project and make sure there's a monitor to cancel the build
IProject currentProject = cfg.getOwner().getProject(); IProject currentProject = cfg.getOwner().getProject();
if (monitor == null) { if (monitor == null) {
@ -1428,25 +1412,23 @@ public class GeneratedMakefileBuilder extends ACBuilder {
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer();
if (initNewConsole) { if (initNewConsole) {
if (buildIncrementaly) String msg;
buf.append(ManagedMakeMessages.getResourceString("GeneratedMakefileBuilder.buildSelectedIncremental")); //$NON-NLS-1$ if (buildIncrementaly) {
else msg = ManagedMakeMessages.getResourceString("GeneratedMakefileBuilder.buildSelectedIncremental"); //$NON-NLS-1$
buf.append(ManagedMakeMessages.getResourceString("GeneratedMakefileBuilder.buildSelectedRebuild")); //$NON-NLS-1$ } else {
msg = ManagedMakeMessages.getResourceString("GeneratedMakefileBuilder.buildSelectedRebuild"); //$NON-NLS-1$
}
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(msg).append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(NEWLINE);
buf.append(ManagedMakeMessages buf.append(ManagedMakeMessages.getResourceString(INTERNAL_BUILDER_HEADER_NOTE)).append(NEWLINE);
.getResourceString(INTERNAL_BUILDER_HEADER_NOTE));
buf.append("\n"); //$NON-NLS-1$
} }
if(!cfg.isSupported()){ if(!cfg.isSupported()){
buf.append(ManagedMakeMessages.getFormattedString(WARNING_UNSUPPORTED_CONFIGURATION,new String[] {cfg.getName(),cfg.getToolChain().getName()})); String msg = ManagedMakeMessages.getFormattedString(WARNING_UNSUPPORTED_CONFIGURATION,new String[] {cfg.getName(),cfg.getToolChain().getName()});
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(msg).append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ buf.append(NEWLINE);
} }
consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.write(buf.toString().getBytes());
consoleOutStream.flush(); consoleOutStream.flush();
@ -1463,7 +1445,7 @@ public class GeneratedMakefileBuilder extends ACBuilder {
epm.setOutputStream(consoleOutStream); epm.setOutputStream(consoleOutStream);
// This variable is necessary to ensure that the EPM stream stay open // This variable is necessary to ensure that the EPM stream stay open
// until we explicitly close it. See bug#123302. // until we explicitly close it. See bug#123302.
OutputStream epmOutputStream = epm.getOutputStream(); epmOutputStream = epm.getOutputStream();
boolean errorsFound = false; boolean errorsFound = false;
@ -1547,39 +1529,51 @@ public class GeneratedMakefileBuilder extends ACBuilder {
// Report either the success or failure of our mission // Report either the success or failure of our mission
buf = new StringBuffer(); buf = new StringBuffer();
buf.append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$
if (printFinishedMessage) { if (printFinishedMessage) {
if (errorsFound) { if (errorsFound) {
buf.append(ManagedMakeMessages buf.append(ManagedMakeMessages.getResourceString(BUILD_FAILED_ERR));
.getResourceString(BUILD_FAILED_ERR));
} else { } else {
buf buf.append(ManagedMakeMessages.getResourceString("GeneratedMakefileBuilder.buildResourcesFinished")); //$NON-NLS-1$
.append(ManagedMakeMessages
.getResourceString("GeneratedMakefileBuilder.buildResourcesFinished")); //$NON-NLS-1$
} }
} }
// Write message on the console // Write message on the console
consoleOutStream.write(buf.toString().getBytes()); consoleOutStream.write(buf.toString().getBytes());
consoleOutStream.flush(); consoleOutStream.flush();
epmOutputStream.close();
// Generate any error markers that the build has discovered // Generate any error markers that the build has discovered
addBuilderMarkers(epm); addBuilderMarkers(epm);
consoleOutStream.close();
} catch (Exception e) { } catch (Exception e) {
StringBuffer buf = new StringBuffer(); if(consoleOutStream != null){
String errorDesc = ManagedMakeMessages StringBuffer buf = new StringBuffer();
.getResourceString(BUILD_ERROR); String errorDesc = ManagedMakeMessages.getResourceString(BUILD_ERROR);
buf.append(errorDesc); buf.append(errorDesc).append(NEWLINE);
buf.append(System.getProperty("line.separator", "\n")); //$NON-NLS-1$//$NON-NLS-2$ buf.append("(").append(e.getLocalizedMessage()).append(")").append(NEWLINE); //$NON-NLS-1$ //$NON-NLS-2$
buf.append("(").append(e.getLocalizedMessage()).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
try {
consoleOutStream.write(buf.toString().getBytes());
consoleOutStream.flush();
} catch (IOException e1) {
}
}
forgetLastBuiltState(); forgetLastBuiltState();
} finally { } finally {
if(epmOutputStream != null){
try {
epmOutputStream.close();
} catch (IOException e) {
}
}
if(consoleOutStream != null){
try {
consoleOutStream.close();
} catch (IOException e) {
}
}
getGenerationProblems().clear(); getGenerationProblems().clear();
monitor.done();
} }
} }