Fix for 85056: Discovered Inclusions broken on for Managed Make projects

and 85229: Problem with scannerInfoCollector attribute in the toolChain schema of MBS.
Replaced ToolChain's attribute scannerInfoCollector with ScannerConfigDiscoveredProfileId in managed builder extension point definition schema. Discovery of compiler's internal scanner info for a manged project now uses specified SCD profile.
On Windows, specified profile calls cygpath to translate discovered paths.

build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml

@@ -1213,7 +1213,7 @@
                <toolChain
 		          id="cdt.managedbuild.toolchain.testgnu.exe.debug"
 		          name="Dbg ToolChain"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
+		          scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
 		          osList="solaris,linux,hpux,aix,qnx"
 		          archList="all">
 		          <targetPlatform
@@ -1280,7 +1280,7 @@
                <toolChain
 		          id="cdt.managedbuild.toolchain.testgnu.exe.release"
 		          name="Rel ToolChain"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
+		          scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
 		          osList="solaris,linux,hpux,aix,qnx"
 		          archList="all">
 		          <targetPlatform
@@ -1354,7 +1354,7 @@
                <toolChain
 		          id="cdt.managedbuild.toolchain.testgnu.so.debug"
 		          name="so Debug ToolChain"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"		          
+		          scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"		          
 		          osList="solaris,linux,hpux,aix,qnx"                
 		          archList="all">
 		          <targetPlatform
@@ -1435,7 +1435,7 @@
                <toolChain
 		          id="cdt.managedbuild.toolchain.testgnu.so.release"
 		          name="so Release ToolChain"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"		          
+		          scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"		          
 		          osList="solaris,linux,hpux,aix,qnx"                
 		          archList="all">
 		          <targetPlatform
@@ -1523,7 +1523,7 @@
                <toolChain
 		          id="cdt.managedbuild.toolchain.testgnu.lib.debug"
 		          name="Dbg TC"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"		          
+		          scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"		          
 		          osList="solaris,linux,hpux,aix,qnx"                
 		          archList="all">
 				  <targetPlatform
@@ -1588,7 +1588,7 @@
                <toolChain
 		          id="cdt.managedbuild.toolchain.testgnu.lib.release"
 		          name="Rel TC"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"		          
+		          scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"		          
 		          osList="solaris,linux,hpux,aix,qnx"                
 		          archList="all">
 		          <targetPlatform

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedBuildCoreTests.java

@@ -262,7 +262,7 @@ public class ManagedBuildCoreTests extends TestCase {
 		String expectedArguments = "-k";
 		String[] expectedBuilderName = {"so Debug Builder",
 				                        "so Release Builder"};
-		String expectedScannerInfo = "org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector";
+		String expectedScannerConfigDiscoveryProfileId = "org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile";
 	    String[] expectedToolChainName = {"so Debug ToolChain",
 	                                      "so Release ToolChain"};
 		String[] expectedToolId1 = {"cdt.managedbuild.tool.testgnu.c.linker.so.debug",
@@ -332,10 +332,7 @@ public class ManagedBuildCoreTests extends TestCase {
 		     assertEquals(expectedParserId, configs[iconfig].getErrorParserIds());
 		     assertTrue(Arrays.equals(toolChain.getOSList(), (String[]) expectedOSListarr.toArray(new String[expectedSizeOSList])));
 		     assertTrue(Arrays.equals(toolChain.getArchList(), expectedArchList));
-		     IConfigurationElement element = toolChain.getScannerInfoCollectorElement();	     	   
+             assertEquals(expectedScannerConfigDiscoveryProfileId, toolChain.getScannerConfigDiscoveryProfileId());
-			 if (element != null) {
-				 assertEquals(element.getAttribute(IToolChain.SCANNER_INFO_ID), expectedScannerInfo);						
-			 }
 		
 			 // Fetch and check platform
 			 //		     		     
@@ -467,7 +464,7 @@ public class ManagedBuildCoreTests extends TestCase {
 		String expectedArguments = "-k";
 		String[] expectedBuilderName = {"Dbg B",
 				                        "Rel B"};
-		String expectedScannerInfo = "org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector";
+        String expectedScannerConfigDiscoveryProfileId = "org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile";
 	    String[] expectedToolId1 = {"cdt.managedbuild.tool.testgnu.cpp.compiler.lib.debug",
 	                                "cdt.managedbuild.tool.testgnu.cpp.compiler.lib.release"};		     
 	    String expectedSuperToolId1 = "cdt.managedbuild.tool.testgnu.cpp.compiler";		    
@@ -532,10 +529,7 @@ public class ManagedBuildCoreTests extends TestCase {
 		     assertEquals(expectedParserId, configs[iconfig].getErrorParserIds());
 		     assertTrue(Arrays.equals(toolChain.getOSList(), (String[]) expectedOSListarr.toArray(new String[expectedSizeOSList])));
 		     assertTrue(Arrays.equals(toolChain.getArchList(), expectedArchList));
-		     IConfigurationElement element = toolChain.getScannerInfoCollectorElement();	     	   
+             assertEquals(expectedScannerConfigDiscoveryProfileId, toolChain.getScannerConfigDiscoveryProfileId());
-			 if (element != null) {
-				 assertEquals(element.getAttribute(IToolChain.SCANNER_INFO_ID), expectedScannerInfo);						
-			 }
 		
 			 // Fetch and check platform
 			 //		     		     

build/org.eclipse.cdt.managedbuilder.core/plugin.xml

@@ -97,6 +97,19 @@
          <scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
       </scannerInfoProvider>
    </extension>
+   <extension
+         id="GCCWinManagedMakePerProjectProfile"
+         name="GNU C/C++ managed make per project SCD profile (Windows)"
+         point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
+      <scannerInfoCollector class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"/>
+      <scannerInfoProvider providerId="specsFile">
+         <run
+               arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"
+               command="gcc"
+               class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
+      </scannerInfoProvider>
+   </extension>
    <extension
          point="org.eclipse.team.core.fileTypes">
       <fileTypes

build/org.eclipse.cdt.managedbuilder.core/schema/buildDefinitions.exsd

@@ -259,14 +259,11 @@
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="scannerInfoCollector" type="string">
+         <attribute name="scannerConfigDiscoveryProfileId" type="string">
             <annotation>
                <documentation>
-                  Specifies a class that implements the &lt;code&gt;IManagedScannerInfoCollector&lt;/code&gt; for gathering the built-in compiler settings for a toolchain.
+                  Specifies an id of scanner configuration discovery profile for gathering the built-in compiler settings for a toolchain.
                </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.cdt.managedbuilder.scannerconfig.IManagedScannerInfoCollector"/>
-               </appInfo>
             </annotation>
          </attribute>
       </complexType>

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/IToolChain.java

@@ -10,7 +10,6 @@
  **********************************************************************/
 package org.eclipse.cdt.managedbuilder.core;
 
-import org.eclipse.core.runtime.IConfigurationElement;
 
 /**
  * This class represents a tool-integrator-defined, ordered set of tools 
@@ -34,7 +33,7 @@ public interface IToolChain extends IBuildObject {
 	public static final String ARCH_LIST = "archList";					//$NON-NLS-1$
 	public static final String ERROR_PARSERS = "errorParsers";			//$NON-NLS-1$
 	// The attribute name for the scanner info collector
-	public static final String SCANNER_INFO_ID = "scannerInfoCollector"; //$NON-NLS-1$
+	public static final String SCANNER_CONFIG_PROFILE_ID = "scannerConfigDiscoveryProfileId"; //$NON-NLS-1$
 
 	/**
 	 * Returns the configuration that is the parent of this tool-chain.
@@ -212,18 +211,18 @@ public interface IToolChain extends IBuildObject {
 	public void setErrorParserIds(String ids);
 
 	/**
-	 * Returns the plugin.xml element of the scannerInfoCollector extension or <code>null</code> if none. 
+	 * Returns the scanner config discovery profile id or <code>null</code> if none. 
 	 *  
-	 * @return IConfigurationElement
+	 * @return String
 	 */
-	public IConfigurationElement getScannerInfoCollectorElement();
+	public String getScannerConfigDiscoveryProfileId();
 
 	/**
-	 * Sets the ScannerInfoCollector plugin.xml element
+	 * Sets the scanner config discovery profile id.
 	 * 
-	 * @param element
+	 * @param profileId
 	 */
-	public void setScannerInfoCollectorElement(IConfigurationElement element);
+	public void setScannerConfigDiscoveryProfileId(String profileId);
 
 	/**
 	 * Returns <code>true</code> if this tool-chain has changes that need to 

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java

@@ -60,7 +60,6 @@ import org.eclipse.cdt.managedbuilder.internal.core.ToolChain;
 import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator;
 import org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator;
 import org.eclipse.cdt.managedbuilder.projectconverter.UpdateManagedProjectManager;
-import org.eclipse.cdt.managedbuilder.scannerconfig.IManagedScannerInfoCollector;
 import org.eclipse.core.internal.resources.ResourceException;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -561,27 +560,16 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
 	}
 
     /** 
-	 * Targets may have a scanner collector defined that knows how to discover 
+     * Targets may have a scanner config discovery profile defined that knows  
-	 * built-in compiler defines and includes search paths. Find the scanner 
+     * how to discover built-in compiler defines and includes search paths. 
-	 * collector implementation for the target specified.
+     * Find the profile for the target specified.
      * 
      * @param string the unique id of the target to search for
-	 * @return an implementation of <code>IManagedScannerInfoCollector</code>
+     * @return scanner configuration discovery profile id
      */
-	public static IManagedScannerInfoCollector getScannerInfoCollector(IConfiguration config) {
+    public static String getScannerInfoProfileId(IConfiguration config) {
-		try {
         IToolChain toolChain = config.getToolChain();
-			IConfigurationElement element = toolChain.getScannerInfoCollectorElement();
+        return toolChain.getScannerConfigDiscoveryProfileId();
-			if (element != null) {
-				if (element.getAttribute(IToolChain.SCANNER_INFO_ID) != null) {
-					return (IManagedScannerInfoCollector) element.createExecutableExtension(IToolChain.SCANNER_INFO_ID);
-				}
-			}
-		} 
-		catch (CoreException e) {
-			// Probably not defined
-		}
-		return null;
     }
     
 	/**

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java

@@ -19,18 +19,19 @@ import java.util.StringTokenizer;
 import java.util.Vector;
 
 import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.managedbuilder.core.IConfigurationV2;
+import org.eclipse.cdt.managedbuilder.core.IBuilder;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IConfigurationV2;
 import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
 import org.eclipse.cdt.managedbuilder.core.IManagedConfigElement;
-import org.eclipse.cdt.managedbuilder.core.ITarget;
-import org.eclipse.cdt.managedbuilder.core.ITool;
-import org.eclipse.cdt.managedbuilder.core.IToolReference;
-import org.eclipse.cdt.managedbuilder.core.IToolChain;
-import org.eclipse.cdt.managedbuilder.core.ITargetPlatform;
-import org.eclipse.cdt.managedbuilder.core.IBuilder;
 import org.eclipse.cdt.managedbuilder.core.IOption;
+import org.eclipse.cdt.managedbuilder.core.ITarget;
+import org.eclipse.cdt.managedbuilder.core.ITargetPlatform;
+import org.eclipse.cdt.managedbuilder.core.ITool;
+import org.eclipse.cdt.managedbuilder.core.IToolChain;
+import org.eclipse.cdt.managedbuilder.core.IToolReference;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
+import org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedBuildCPathEntryContainer;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.Platform;
 import org.w3c.dom.Document;
@@ -1009,10 +1010,10 @@ public class Target extends BuildObject implements ITarget {
 			toolChain.setIsAbstract(isAbstract);
 			toolChain.setOSList(getTargetOSList());
 			toolChain.setArchList(getTargetArchList());
-			IManagedConfigElement element = ManagedBuildManager.getConfigElement(this);
+            // In target element had a scannerInfoCollector element here which
-			if (element instanceof DefaultManagedConfigElement) {
+            // is now replaced with scanner config discovery profile id.
-				toolChain.setScannerInfoCollectorElement(((DefaultManagedConfigElement)element).getConfigurationElement());
+            // Using the default per project profile for managed make
-			}
+            toolChain.setScannerConfigDiscoveryProfileId(ManagedBuildCPathEntryContainer.MM_PP_DISCOVERY_PROFILE_ID);
 			// Create the Builder
 			subId = id + ".builder"; 	//$NON-NLS-1$
 			subName = name + ".builder"; 	//$NON-NLS-1$
@@ -1021,6 +1022,7 @@ public class Target extends BuildObject implements ITarget {
 			builder.setIsAbstract(isAbstract);
 			builder.setCommand(getMakeCommand());
 			builder.setArguments(getMakeArguments());
+            IManagedConfigElement element = ManagedBuildManager.getConfigElement(this);
 			if (element instanceof DefaultManagedConfigElement) {
 				builder.setBuildFileGeneratorElement(((DefaultManagedConfigElement)element).getConfigurationElement());
 			}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java

@@ -18,15 +18,14 @@ import java.util.Map;
 import java.util.StringTokenizer;
 
 import org.eclipse.cdt.managedbuilder.core.IBuildObject;
-import org.eclipse.cdt.managedbuilder.core.IProjectType;
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
-import org.eclipse.cdt.managedbuilder.core.IToolChain;
-import org.eclipse.cdt.managedbuilder.core.ITool;
-import org.eclipse.cdt.managedbuilder.core.ITargetPlatform;
 import org.eclipse.cdt.managedbuilder.core.IBuilder;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IManagedConfigElement;
+import org.eclipse.cdt.managedbuilder.core.IProjectType;
+import org.eclipse.cdt.managedbuilder.core.ITargetPlatform;
+import org.eclipse.cdt.managedbuilder.core.ITool;
+import org.eclipse.cdt.managedbuilder.core.IToolChain;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.core.runtime.IConfigurationElement;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -51,7 +50,7 @@ public class ToolChain extends BuildObject implements IToolChain {
 	private List osList;
 	private List archList;
 	private Boolean isAbstract;
-	private IConfigurationElement scannerInfoCollectorElement;
+    private String scannerConfigDiscoveryProfileId;
 	//  Miscellaneous
 	private boolean isExtensionToolChain = false;
 	private boolean isDirty = false;
@@ -206,7 +205,9 @@ public class ToolChain extends BuildObject implements IToolChain {
 		if (toolChain.isAbstract != null) {
 			isAbstract = new Boolean(toolChain.isAbstract.booleanValue());
 		}
-		scannerInfoCollectorElement = toolChain.scannerInfoCollectorElement; 
+        if (toolChain.scannerConfigDiscoveryProfileId != null) {
+            scannerConfigDiscoveryProfileId = new String(toolChain.scannerConfigDiscoveryProfileId);
+        }
 
 		//  Clone the children
 		if (toolChain.builder != null) {
@@ -291,11 +292,8 @@ public class ToolChain extends BuildObject implements IToolChain {
 		// Get the semicolon separated list of IDs of the error parsers
 		errorParserIds = element.getAttribute(ERROR_PARSERS);
 		
-		// Store the configuration element IFF there is a scanner info collector defined 
+		// Get the scanner config discovery profile id
-		String scannerInfoCollector = element.getAttribute(SCANNER_INFO_ID); 
+        scannerConfigDiscoveryProfileId = element.getAttribute(SCANNER_CONFIG_PROFILE_ID);
-		if (scannerInfoCollector != null && element instanceof DefaultManagedConfigElement) {
-			scannerInfoCollectorElement = ((DefaultManagedConfigElement)element).getConfigurationElement();			
-		}
         
 		// Get the comma-separated list of valid OS
 		String os = element.getAttribute(OS_LIST);
@@ -361,6 +359,11 @@ public class ToolChain extends BuildObject implements IToolChain {
 			errorParserIds = element.getAttribute(ERROR_PARSERS);
 		}
 		
+        // Get the scanner config discovery profile id
+        if (element.hasAttribute(SCANNER_CONFIG_PROFILE_ID)) {
+            scannerConfigDiscoveryProfileId = element.getAttribute(SCANNER_CONFIG_PROFILE_ID);
+        }
+        
 		// Get the comma-separated list of valid OS
 		if (element.hasAttribute(OS_LIST)) {
 			String os = element.getAttribute(OS_LIST);
@@ -414,6 +417,10 @@ public class ToolChain extends BuildObject implements IToolChain {
 			element.setAttribute(ERROR_PARSERS, errorParserIds);
 		}
         
+        if (scannerConfigDiscoveryProfileId != null) {
+            element.setAttribute(SCANNER_CONFIG_PROFILE_ID, scannerConfigDiscoveryProfileId);
+        }
+
 		if (osList != null) {
 			Iterator osIter = osList.listIterator();
 			String listValue = EMPTY_STRING;
@@ -841,24 +848,28 @@ public class ToolChain extends BuildObject implements IToolChain {
 	}
 
     /* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.core.IToolChain#getScannerInfoCollectorElement()
+     * @see org.eclipse.cdt.managedbuilder.core.IToolChain#getScannerConfigDiscoveryProfileId()
      */
-	public IConfigurationElement getScannerInfoCollectorElement() {
+    public String getScannerConfigDiscoveryProfileId() {
-		if (scannerInfoCollectorElement == null) {
+        if (scannerConfigDiscoveryProfileId == null) {
             if (superClass != null) {
-				return superClass.getScannerInfoCollectorElement();
+                return superClass.getScannerConfigDiscoveryProfileId();
             }
         }
-		return scannerInfoCollectorElement;
+        return scannerConfigDiscoveryProfileId;
     }
 
     /* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.core.IToolChain#setScannerInfoCollectorElement(IConfigurationElement)
+     * @see org.eclipse.cdt.managedbuilder.core.IToolChain#setScannerConfigDiscoveryProfileId(java.lang.String)
      */
-	public void setScannerInfoCollectorElement(IConfigurationElement element) {
+    public void setScannerConfigDiscoveryProfileId(String profileId) {
-		scannerInfoCollectorElement = element;
+		if (scannerConfigDiscoveryProfileId == null && profileId == null) return;
+        if (scannerConfigDiscoveryProfileId == null ||
+                !scannerConfigDiscoveryProfileId.equals(profileId)) {
+            scannerConfigDiscoveryProfileId = profileId;
             setDirty(true);
         }
+    }
 	
 	/*
 	 *  O B J E C T   S T A T E   M A I N T E N A N C E
@@ -962,4 +973,5 @@ public class ToolChain extends BuildObject implements IToolChain {
 			}
 		}
 	}
+
 }

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedBuildCPathEntryContainer.java

@@ -56,7 +56,7 @@ import org.eclipse.core.runtime.Platform;
  */
 public class ManagedBuildCPathEntryContainer implements IPathEntryContainer {
     // Managed make per project scanner configuration discovery profile
-    private static final String MM_PP_DISCOVERY_PROFILE_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + ".GCCManagedMakePerProjectProfile"; //$NON-NLS-1$
+    public static final String MM_PP_DISCOVERY_PROFILE_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + ".GCCManagedMakePerProjectProfile"; //$NON-NLS-1$
     private static final String SPECS_FILE_PROVIDER = "specsFile"; //$NON-NLS-1$
     
 	private static final String BUILDER_ID = MakeCorePlugin.getUniqueIdentifier() + ".ScannerConfigBuilder"; //$NON-NLS-1$
@@ -175,7 +175,7 @@ public class ManagedBuildCPathEntryContainer implements IPathEntryContainer {
 
         final IScannerConfigBuilderInfo2 buildInfo = ScannerConfigProfileManager.
                 createScannerConfigBuildInfo2(MakeCorePlugin.getDefault().getPluginPreferences(),
-                                              MM_PP_DISCOVERY_PROFILE_ID, false);
+                        profileInstance.getProfile().getId(), false);
         final IExternalScannerInfoProvider esiProvider = profileInstance.createExternalScannerInfoProvider(SPECS_FILE_PROVIDER);
         
 		// Set the arguments for the provider
@@ -210,10 +210,17 @@ public class ManagedBuildCPathEntryContainer implements IPathEntryContainer {
 			ManagedBuildCPathEntryContainer.outputError(project.getName(), "Build information has not been loaded yet");	//$NON-NLS-1$
 			return (IPathEntry[])entries.toArray(new IPathEntry[entries.size()]);
 		}
+		// get the associated scanner config discovery profile id
+        String scdProfileId = ManagedBuildManager.getScannerInfoProfileId(defaultConfig);
+        if (scdProfileId == null) {
+            // scanner config profile not defined
+            ManagedBuildCPathEntryContainer.outputError(project.getName(), "Scanner config discovery profile not specified for the configuration");    //$NON-NLS-1$
+            return (IPathEntry[])entries.toArray(new IPathEntry[entries.size()]);
+        }
         
 		// See if we can load a dynamic resolver
         SCProfileInstance profileInstance = ScannerConfigProfileManager.getInstance().
-                getSCProfileInstance(project, MM_PP_DISCOVERY_PROFILE_ID);
+                getSCProfileInstance(project, scdProfileId);
         IScannerInfoCollector collector = profileInstance.createScannerInfoCollector();
         
         synchronized(this) {

build/org.eclipse.cdt.managedbuilder.ui/plugin.xml

@@ -1210,11 +1210,11 @@
                cleanCommand="rm -rf"
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser">
                <toolChain
-		          id="cdt.managedbuild.toolchain.gnu.exe.debug"
+                     archList="all"
-		          name="%ToolChainName.Dbg"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
                      osList="solaris,linux,hpux,aix,qnx"
-		          archList="all">
+                     name="%ToolChainName.Dbg"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.exe.debug">
 		          <targetPlatform
 		              id="cdt.managedbuild.target.gnu.platform.exe.debug"
 		              name="%PlatformName.Dbg"
@@ -1277,11 +1277,11 @@
                cleanCommand="rm -rf"
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser">               
                <toolChain
-		          id="cdt.managedbuild.toolchain.gnu.exe.release"
+                     archList="all"
-		          name="%ToolChainName.Rel"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
                      osList="solaris,linux,hpux,aix,qnx"
-		          archList="all">
+                     name="%ToolChainName.Rel"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.exe.release">
 		          <targetPlatform
 		              id="cdt.managedbuild.target.gnu.platform.exe.release"
 		              name="%PlatformName.Rel"		             
@@ -1352,11 +1352,11 @@
                errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"                          
                id="cdt.managedbuild.config.gnu.so.debug">
                <toolChain
-		          id="cdt.managedbuild.toolchain.gnu.so.debug"
+                     archList="all"
-		          name="%ToolChainName.Dbg"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"		          
                      osList="solaris,linux,hpux,aix,qnx"
-		          archList="all">
+                     name="%ToolChainName.Dbg"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.so.debug">
 		          <targetPlatform
 		              id="cdt.managedbuild.target.gnu.platform.so.debug"
 		              name="%PlatformName.Dbg"
@@ -1434,11 +1434,11 @@
                errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"
                id="cdt.managedbuild.config.gnu.so.release">
                <toolChain
-		          id="cdt.managedbuild.toolchain.gnu.so.release"
+                     archList="all"
-		          name="%ToolChainName.Rel"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"		          
                      osList="solaris,linux,hpux,aix,qnx"
-		          archList="all">
+                     name="%ToolChainName.Rel"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.so.release">
 		          <targetPlatform
 		              id="cdt.managedbuild.target.gnu.platform.so.release"
 		              name="%PlatformName.Rel"
@@ -1523,11 +1523,11 @@
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"
 			   id="cdt.managedbuild.config.gnu.lib.debug">
                <toolChain
-		          id="cdt.managedbuild.toolchain.gnu.lib.debug"
+                     archList="all"
-		          name="%ToolChainName.Dbg"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"		          
                      osList="solaris,linux,hpux,aix,qnx"
-		          archList="all">
+                     name="%ToolChainName.Dbg"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.lib.debug">
 				  <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.lib.debug"
 				 	  name="%PlatformName.Dbg"
@@ -1589,11 +1589,11 @@
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"
                id="cdt.managedbuild.config.gnu.lib.release">
                <toolChain
-		          id="cdt.managedbuild.toolchain.gnu.lib.release"
+                     archList="all"
-		          name="%ToolChainName.Rel"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"		          
                      osList="solaris,linux,hpux,aix,qnx"
-		          archList="all">
+                     name="%ToolChainName.Rel"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.lib.release">
 		          <targetPlatform
 		              id="cdt.managedbuild.target.gnu.platform.lib.release"
 		              name="%PlatformName.Rel"
@@ -1662,11 +1662,11 @@
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"
                id="cdt.managedbuild.config.gnu.cygwin.exe.debug">
                <toolChain
-                  id="cdt.managedbuild.toolchain.gnu.cygwin.exe.debug"
+                     archList="all"
-                  name="%ToolChainName.Dbg"
-                  scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
                      osList="win32"
-                  archList="all">
+                     name="%ToolChainName.Dbg"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.cygwin.exe.debug">
                   <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.cygwin.exe.debug"
 				 	  name="%PlatformName.Dbg"
@@ -1732,11 +1732,11 @@
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"               
                id="cdt.managedbuild.config.gnu.cygwin.exe.release">
                <toolChain
-                  id="cdt.managedbuild.toolchain.gnu.cygwin.exe.release"
+                     archList="all"
-                  name="%ToolChainName.Rel"
-                  scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
                      osList="win32"
-                  archList="all">
+                     name="%ToolChainName.Rel"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.cygwin.exe.release">
                   <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.cygwin.exe.release"
 				 	  name="%PlatformName.Rel"
@@ -1809,11 +1809,11 @@
                errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"               
                id="cdt.managedbuild.config.gnu.cygwin.so.debug">
                <toolChain
-                  id="cdt.managedbuild.toolchain.gnu.cygwin.so.debug"
+                     archList="all"
-		          name="%ToolChainName.Dbg"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
                      osList="win32"
-                  archList="all">
+                     name="%ToolChainName.Dbg"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.cygwin.so.debug">
                   <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.cygwin.so.debug"
 				 	  name="%PlatformName.Dbg"
@@ -1889,11 +1889,11 @@
                errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"               
                id="cdt.managedbuild.config.gnu.cygwin.so.release">               
                <toolChain
-                  id="cdt.managedbuild.toolchain.gnu.cygwin.so.release"
+                     archList="all"
-		          name="%ToolChainName.Rel"
-		          scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
                      osList="win32"
-                  archList="all">
+                     name="%ToolChainName.Rel"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.cygwin.so.release">
                   <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.cygwin.so.release"
 				 	  name="%PlatformName.Rel"
@@ -1976,11 +1976,11 @@
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"
                id="cdt.managedbuild.config.gnu.cygwin.lib.debug">
                <toolChain
-                  id="cdt.managedbuild.toolchain.gnu.cygwin.lib.debug"
+                     archList="all"
-                  name="%ToolChainName.Dbg"
-                  scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"                  
                      osList="win32"
-                  archList="all">
+                     name="%ToolChainName.Dbg"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.cygwin.lib.debug">
                   <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.cygwin.lib.debug"
 				 	  name="%PlatformName.Dbg"
@@ -2042,11 +2042,11 @@
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"               
                id="cdt.managedbuild.config.gnu.cygwin.lib.release">
                <toolChain
-                  id="cdt.managedbuild.toolchain.gnu.cygwin.lib.release"
+                     archList="all"
-                  name="%ToolChainName.Rel"
-                  scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"                  
                      osList="win32"
-                  archList="all">
+                     name="%ToolChainName.Rel"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.cygwin.lib.release">
                   <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.cygwin.lib.release"
 				 	  name="%PlatformName.Rel"
@@ -2114,11 +2114,11 @@
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"               
                id="cdt.managedbuild.config.gnu.macosx.exe.debug">
                <toolChain
-                  id="cdt.managedbuild.toolchain.gnu.macosx.exe.debug"
+                     archList="all"
-                  name="%ToolChainName.Dbg"
-                  scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"                  
                      osList="macosx"
-                  archList="all">
+                     name="%ToolChainName.Dbg"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.macosx.exe.debug">
                   <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.macosx.exe.debug"
 				 	  name="%PlatformName.Dbg"
@@ -2181,11 +2181,11 @@
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"                              
                id="cdt.managedbuild.config.macosx.exe.release">
                <toolChain
-                  id="cdt.managedbuild.toolchain.gnu.macosx.exe.release"
+                     archList="all"
-                  name="%ToolChainName.Rel"
-                  scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"                  
                      osList="macosx"
-                  archList="all">
+                     name="%ToolChainName.Rel"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.macosx.exe.release">
                   <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.macosx.exe.release"
 				 	  name="%PlatformName.Rel"
@@ -2256,11 +2256,11 @@
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"                              
                id="cdt.managedbuild.config.macosx.so.debug">
                <toolChain
-                  id="cdt.managedbuild.toolchain.gnu.macosx.so.debug"
+                     archList="all"
-                  name="%ToolChainName.Dbg"
-                  scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"                  
                      osList="macosx"
-                  archList="all">
+                     name="%ToolChainName.Dbg"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.macosx.so.debug">
                   <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.macosx.so.debug"
 				 	  name="%PlatformName.Dbg"
@@ -2347,11 +2347,11 @@
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"               
                id="cdt.managedbuild.config.macosx.so.release">
                <toolChain
-                  id="cdt.managedbuild.toolchain.gnu.macosx.so.release"
+                     archList="all"
-                  name="%ToolChainName.Rel"
-                  scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"                  
                      osList="macosx"
-                  archList="all">
+                     name="%ToolChainName.Rel"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.macosx.so.release">
                   <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.macosx.so.release"
 				 	  name="%PlatformName.Rel"
@@ -2445,11 +2445,11 @@
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"               
                id="cdt.managedbuild.config.macosx.lib.debug">
                <toolChain
-                  id="cdt.managedbuild.toolchain.gnu.macosx.lib.debug"
+                     archList="all"
-                  name="%ToolChainName.Dbg"
-                  scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"                  
                      osList="macosx"
-                  archList="all">
+                     name="%ToolChainName.Dbg"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.macosx.lib.debug">
                   <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.macosx.lib.debug"
 				 	  name="%PlatformName.Dbg"
@@ -2511,11 +2511,11 @@
 			   errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser"               
                id="cdt.managedbuild.config.macosx.lib.release">
                <toolChain
-                  id="cdt.managedbuild.toolchain.gnu.macosx.lib.release"
+                     archList="all"
-                  name="%ToolChainName.Rel"
-                  scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"                  
                      osList="macosx"
-                  archList="all">
+                     name="%ToolChainName.Rel"
+                     scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
+                     id="cdt.managedbuild.toolchain.gnu.macosx.lib.release">
                   <targetPlatform
 					  id="cdt.managedbuild.target.gnu.platform.macosx.lib.release"
 				 	  name="%PlatformName.Rel"