Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Sennikovsky2007-06-22 16:42:25 +0000
committerMikhail Sennikovsky2007-06-22 16:42:25 +0000
commita8fc0d2cbd671494880cb65e6bc1cf8daab801e0 (patch)
tree9e1fe43fe4a7c0669ed8edf4dcbf61442308f058
parent0e737ee0ba4c2cbed2d994a3f9a04e7417a8b250 (diff)
downloadorg.eclipse.cdt-a8fc0d2cbd671494880cb65e6bc1cf8daab801e0.tar.gz
org.eclipse.cdt-a8fc0d2cbd671494880cb65e6bc1cf8daab801e0.tar.xz
org.eclipse.cdt-a8fc0d2cbd671494880cb65e6bc1cf8daab801e0.zip
Fix for [Bug 194003] [Internal Builder] Does not properly support multiple configuration builds
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
index deb28142e0d..d5b955a49f1 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
@@ -59,6 +59,7 @@ import org.eclipse.cdt.managedbuilder.internal.macros.OptionContextData;
import org.eclipse.cdt.managedbuilder.macros.BuildMacroException;
import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider;
import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator;
+import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator2;
import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyCalculator;
import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyCommands;
import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator;
@@ -74,10 +75,12 @@ import org.eclipse.core.resources.IResourceDeltaVisitor;
import org.eclipse.core.resources.IResourceProxy;
import org.eclipse.core.resources.IResourceProxyVisitor;
import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
@@ -979,7 +982,10 @@ public class BuildDescription implements IBuildDescription {
private IManagedBuilderMakefileGenerator getMakeGenInitialized(){
if(fMakeGen == null){
fMakeGen = ManagedBuildManager.getBuildfileGenerator(fCfg);
- fMakeGen.initialize(fProject, fInfo, null);
+ if(fMakeGen instanceof IManagedBuilderMakefileGenerator2)
+ ((IManagedBuilderMakefileGenerator2)fMakeGen).initialize(IncrementalProjectBuilder.FULL_BUILD, fCfg, fCfg.getEditableBuilder(), new NullProgressMonitor());
+ else
+ fMakeGen.initialize(fProject, fInfo, null);
}
return fMakeGen;
}

Back to the top