From 5f63b203d29a90b5d0391f9f02ef19deb8d3ac7e Mon Sep 17 00:00:00 2001 From: David Inglis Date: Wed, 15 Mar 2006 17:16:08 +0000 Subject: [PATCH] fixed bug#131975 --- .../src/org/eclipse/cdt/make/core/MakeBuilder.java | 11 ++++------- .../eclipse/cdt/make/internal/core/MakeTarget.java | 3 ++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java index 891f49d1a32..574d6c2ee7a 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java @@ -281,10 +281,9 @@ public class MakeBuilder extends ACBuilder { switch (kind) { case IncrementalProjectBuilder.AUTO_BUILD : return info.isAutoBuildEnable(); - case IncrementalProjectBuilder.INCREMENTAL_BUILD : - return info.isIncrementalBuildEnabled(); + case IncrementalProjectBuilder.INCREMENTAL_BUILD : // now treated as the same! case IncrementalProjectBuilder.FULL_BUILD : - return info.isFullBuildEnabled(); + return info.isFullBuildEnabled() | info.isIncrementalBuildEnabled() ; case IncrementalProjectBuilder.CLEAN_BUILD : return info.isCleanBuildEnabled(); } @@ -297,11 +296,9 @@ public class MakeBuilder extends ACBuilder { case IncrementalProjectBuilder.AUTO_BUILD : targets = info.getAutoBuildTarget(); break; - case IncrementalProjectBuilder.INCREMENTAL_BUILD : - targets = info.getIncrementalBuildTarget(); - break; + case IncrementalProjectBuilder.INCREMENTAL_BUILD : // now treated as the same! case IncrementalProjectBuilder.FULL_BUILD : - targets = info.getFullBuildTarget(); + targets = info.getIncrementalBuildTarget(); break; case IncrementalProjectBuilder.CLEAN_BUILD : targets = info.getCleanBuildTarget(); diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java index fa14bb2e38e..86cea6b6405 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java @@ -287,7 +287,8 @@ public class MakeTarget extends PlatformObject implements IMakeTarget { info.setBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, "")); //$NON-NLS-1$ info.setUseDefaultBuildCmd(isDefaultBuildCmd()); info.setStopOnError(isStopOnError()); - info.setFullBuildEnable(true); + info.setIncrementalBuildEnable(true); + info.setBuildAttribute(IMakeBuilderInfo.BUILD_TARGET_INCREMENTAL, getBuildAttribute(IMakeTarget.BUILD_TARGET, "")); //$NON-NLS-1$ info.setEnvironment(getExpandedEnvironment()); info.setAppendEnvironment(appendEnvironment()); if (container != null) {