From a8fc0d2cbd671494880cb65e6bc1cf8daab801e0 Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Fri, 22 Jun 2007 16:42:25 +0000 Subject: [PATCH] Fix for [Bug 194003] [Internal Builder] Does not properly support multiple configuration builds --- .../internal/buildmodel/BuildDescription.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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; }