Defect 62772. Suppressed the make clean from happening on rebuild events. Works correctly for the standard build, but the managed build still programatically cleans the project. In the long run all builds should call "make all" and the explicit clean event should call "make clean". The managed makefiles will need to be enhanced so that they can never get "out-of-sync" with the source.

2 files changed, 2 insertions, 9 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java
index e1a13491467..2eaf2707108 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java
@@ -219,7 +219,6 @@ public class GeneratedMakefileBuilder extends ACBuilder {
 	private static final String TRACE_FOOTER = "]: ";	//$NON-NLS-1$
 	private static final String TRACE_HEADER = "GeneratedmakefileBuilder trace [";	//$NON-NLS-1$
 	private static final String TYPE_CLEAN = "ManagedMakeBuilder.type.clean";	//$NON-NLS-1$
-	private static final String TYPE_FULL = "ManagedMakeBuilder.type.full";	//$NON-NLS-1$
 	private static final String TYPE_INC = "ManagedMakeBuider.type.incremental";	//$NON-NLS-1$
 	private static final String WARNING_UNSUPPORTED_CONFIGURATION = "ManagedMakeBuilder.warning.unsupported.configuration";	//$NON-NLS-1$
 	public static boolean VERBOSE = false;
@@ -276,9 +275,7 @@ public class GeneratedMakefileBuilder extends ACBuilder {
 			ConsoleOutputStream consoleOutStream = console.getOutputStream();
 			// Report a successful clean
 			String[] consoleHeader = new String[3];
-			if (buildType == FULL_BUILD) {
-			    consoleHeader[0] = ManagedMakeMessages.getResourceString(TYPE_FULL);
-			} else if (buildType == INCREMENTAL_BUILD) {
+			if (buildType == FULL_BUILD || buildType == INCREMENTAL_BUILD) {
 				consoleHeader[0] = ManagedMakeMessages.getResourceString(TYPE_INC);
 			} else {
 				consoleHeader[0] = new String();
@@ -595,7 +592,6 @@ public class GeneratedMakefileBuilder extends ACBuilder {
 				args.add("clean");	//$NON-NLS-1$
 				break;
 			case FULL_BUILD:
-				args.add("clean");	//$NON-NLS-1$
 			case INCREMENTAL_BUILD:
 				args.add("all");	//$NON-NLS-1$
 				break;
@@ -749,8 +745,6 @@ public class GeneratedMakefileBuilder extends ACBuilder {
 				String[] consoleHeader = new String[3];
 				switch (buildType) {
 					case FULL_BUILD:
-						consoleHeader[0] = ManagedMakeMessages.getResourceString(TYPE_FULL);
-						break;
 					case INCREMENTAL_BUILD:
 						consoleHeader[0] = ManagedMakeMessages.getResourceString(TYPE_INC);
 						break;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties
index bb16433372e..e82f0fee629 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties
@@ -27,8 +27,7 @@ ManagedMakeBuilder.message.finished = Build complete for project {0}
 ManagedMakeBuilder.message.clean.deleting.output=Removing build artifacts from {0}
 ManagedMakeBuilder.message.clean.build.clean=Trying a make clean in {0}
 ManagedMakeBuilder.type.clean = Clean-only build
-ManagedMakeBuilder.type.full = Full rebuild
-ManagedMakeBuider.type.incremental = Incremental build
+ManagedMakeBuider.type.incremental = Build
 ManagedMakeBuilder.warning.unsupported.configuration=****  WARNING: The "{0}" Configuration may not build  ****\n****  because it uses the "{1}"  ****\n****  tool-chain that is unsupported on this system.  ****\n\n****  Attempting to build...  **** 
 
 # Option exception messages