|
 |
08f9280 |
--- ./results/plugins/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java.fix 2007-01-26 19:22:27.000000000 -0500
|
|
|
08f9280 |
+++ ./results/plugins/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java 2007-01-26 19:43:53.000000000 -0500
|
|
|
08f9280 |
@@ -700,34 +700,40 @@ public class GeneratedMakefileBuilder ex
|
|
|
08f9280 |
}
|
|
|
08f9280 |
}
|
|
|
08f9280 |
}
|
|
|
08f9280 |
-
|
|
|
08f9280 |
- // Now call make
|
|
|
08f9280 |
- checkCancel(monitor);
|
|
|
08f9280 |
- statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.starting", getProject().getName()); //$NON-NLS-1$
|
|
|
08f9280 |
- monitor.subTask(statusMsg);
|
|
|
08f9280 |
- IPath topBuildDir = generator.getBuildWorkingDir();
|
|
|
08f9280 |
- if (topBuildDir != null) {
|
|
|
08f9280 |
- invokeMake(FULL_BUILD, topBuildDir, info, generator, monitor);
|
|
|
08f9280 |
+
|
|
|
08f9280 |
+ if (result.getCode() != IStatus.ERROR) {
|
|
|
08f9280 |
+ // Now call make
|
|
|
08f9280 |
+ checkCancel(monitor);
|
|
|
08f9280 |
+ statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.starting", getProject().getName()); //$NON-NLS-1$
|
|
|
08f9280 |
+ monitor.subTask(statusMsg);
|
|
|
08f9280 |
+ IPath topBuildDir = generator.getBuildWorkingDir();
|
|
|
08f9280 |
+ if (topBuildDir != null) {
|
|
|
08f9280 |
+ invokeMake(FULL_BUILD, topBuildDir, info, generator, monitor);
|
|
|
08f9280 |
+ } else {
|
|
|
08f9280 |
+ statusMsg = ManagedMakeMessages.getFormattedString(NOTHING_BUILT, getProject().getName()); //$NON-NLS-1$
|
|
|
08f9280 |
+ monitor.subTask(statusMsg);
|
|
|
08f9280 |
+ return;
|
|
|
08f9280 |
+ }
|
|
|
08f9280 |
+
|
|
|
08f9280 |
+ // Now regenerate the dependencies
|
|
|
08f9280 |
+ checkCancel(monitor);
|
|
|
08f9280 |
+ statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.regen.deps", getProject().getName()); //$NON-NLS-1$
|
|
|
08f9280 |
+ monitor.subTask(statusMsg);
|
|
|
08f9280 |
+ try {
|
|
|
08f9280 |
+ generator.regenerateDependencies(false);
|
|
|
08f9280 |
+ } catch (CoreException e) {
|
|
|
08f9280 |
+ // Throw the exception back to the builder
|
|
|
08f9280 |
+ throw e;
|
|
|
08f9280 |
+ }
|
|
|
08f9280 |
+
|
|
|
08f9280 |
+ // Build finished message
|
|
|
08f9280 |
+ statusMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); //$NON-NLS-1$
|
|
|
08f9280 |
+ monitor.subTask(statusMsg);
|
|
|
08f9280 |
} else {
|
|
|
08f9280 |
- statusMsg = ManagedMakeMessages.getFormattedString(NOTHING_BUILT, getProject().getName()); //$NON-NLS-1$
|
|
|
08f9280 |
+ // Build finished message
|
|
|
08f9280 |
+ statusMsg = ManagedMakeMessages.getFormattedString(BUILD_STOPPED_ERR, getProject().getName()); //$NON-NLS-1$
|
|
|
08f9280 |
monitor.subTask(statusMsg);
|
|
|
08f9280 |
- return;
|
|
|
08f9280 |
- }
|
|
|
08f9280 |
-
|
|
|
08f9280 |
- // Now regenerate the dependencies
|
|
|
08f9280 |
- checkCancel(monitor);
|
|
|
08f9280 |
- statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.regen.deps", getProject().getName()); //$NON-NLS-1$
|
|
|
08f9280 |
- monitor.subTask(statusMsg);
|
|
|
08f9280 |
- try {
|
|
|
08f9280 |
- generator.regenerateDependencies(false);
|
|
|
08f9280 |
- } catch (CoreException e) {
|
|
|
08f9280 |
- // Throw the exception back to the builder
|
|
|
08f9280 |
- throw e;
|
|
|
08f9280 |
}
|
|
|
08f9280 |
-
|
|
|
08f9280 |
- // Build finished message
|
|
|
08f9280 |
- statusMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); //$NON-NLS-1$
|
|
|
08f9280 |
- monitor.subTask(statusMsg);
|
|
|
08f9280 |
}
|
|
|
08f9280 |
|
|
|
08f9280 |
/* (non-Javadoc)
|