Renamed packages to contain "language.settings.providers" across all

plugins

build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF

@@ -6,7 +6,7 @@ Bundle-Version: 7.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.make.core.tests.MakeTestsPlugin
 Export-Package: org.eclipse.cdt.make.builder.tests,
  org.eclipse.cdt.make.core.tests,
- org.eclipse.cdt.make.scannerdiscovery;x-internal:=true
+ org.eclipse.cdt.make.language.settings.providers
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
  org.eclipse.cdt.make.core,

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

@@ -6,7 +6,7 @@
          name="org.eclipse.cdt.make.core.tests ErrorParsers"
          point="org.eclipse.cdt.core.ErrorParser">
       <errorparser
-            class="org.eclipse.cdt.make.internal.core.scannerconfig.GCCBuildCommandParser$GCCBuildCommandPatternHighlighter"
+            class="org.eclipse.cdt.make.core.language.settings.providers.GCCBuildCommandParser$GCCBuildCommandPatternHighlighter"
             id="org.eclipse.cdt.core.tests.make.core.GCCBuildCommandPatternHighlighter"
             name="Test Plugin GCC BOP Patterns Highlighter">
       </errorparser>

build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/language/settings/providers/AllLanguageSettingsProvidersMakeCoreTests.java

@@ -8,7 +8,7 @@
  * Contributors:
  *    Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.make.scannerdiscovery;
+package org.eclipse.cdt.make.language.settings.providers;
 
 import junit.framework.TestSuite;
 

build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/language/settings/providers/BuiltinSpecsDetectorTest.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Andrew Gvozdev - Initial API and implementation
  *******************************************************************************/
- package org.eclipse.cdt.make.scannerdiscovery;
+ package org.eclipse.cdt.make.language.settings.providers;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -33,7 +33,7 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 import org.eclipse.cdt.core.testplugin.ResourceHelper;
 import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
 import org.eclipse.cdt.internal.core.XmlUtil;
-import org.eclipse.cdt.make.core.scannerconfig.AbstractBuiltinSpecsDetector;
+import org.eclipse.cdt.make.core.language.settings.providers.AbstractBuiltinSpecsDetector;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;

build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/language/settings/providers/GCCBuildCommandParserTest.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.make.scannerdiscovery;
+package org.eclipse.cdt.make.language.settings.providers;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -38,8 +38,8 @@ import org.eclipse.cdt.core.testplugin.ResourceHelper;
 import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
 import org.eclipse.cdt.internal.core.XmlUtil;
 import org.eclipse.cdt.internal.core.settings.model.CProjectDescriptionManager;
-import org.eclipse.cdt.make.core.scannerconfig.AbstractBuildCommandParser;
+import org.eclipse.cdt.make.core.language.settings.providers.AbstractBuildCommandParser;
-import org.eclipse.cdt.make.internal.core.scannerconfig.GCCBuildCommandParser;
+import org.eclipse.cdt.make.core.language.settings.providers.GCCBuildCommandParser;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;

build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF

@@ -7,6 +7,7 @@ Bundle-Activator: org.eclipse.cdt.make.core.MakeCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.cdt.make.core,
+ org.eclipse.cdt.make.core.language.settings.providers,
  org.eclipse.cdt.make.core.makefile,
  org.eclipse.cdt.make.core.makefile.gnu,
  org.eclipse.cdt.make.core.scannerconfig,

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

@@ -185,7 +185,7 @@
    <extension
          point="org.eclipse.cdt.core.LanguageSettingsProvider">
       <provider
-            class="org.eclipse.cdt.make.internal.core.scannerconfig.GCCBuildCommandParser"
+            class="org.eclipse.cdt.make.core.language.settings.providers.GCCBuildCommandParser"
             id="org.eclipse.cdt.make.core.GCCBuildCommandParser"
             name="CDT GCC Build Output Parser"
             parameter="(gcc)|([gc]\+\+)"

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/AbstractBuildCommandParser.java

@@ -9,7 +9,7 @@
  *     Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.make.core.scannerconfig;
+package org.eclipse.cdt.make.core.language.settings.providers;
 
 import java.util.ArrayList;
 import java.util.List;

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/AbstractBuiltinSpecsDetector.java

@@ -9,7 +9,7 @@
  *     Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.make.core.scannerconfig;
+package org.eclipse.cdt.make.core.language.settings.providers;
 
 import java.io.IOException;
 import java.io.OutputStream;

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/AbstractLanguageSettingsOutputScanner.java

@@ -9,7 +9,7 @@
  *     Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.make.core.scannerconfig;
+package org.eclipse.cdt.make.core.language.settings.providers;
 
 import java.io.File;
 import java.io.IOException;

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/GCCBuildCommandParser.java

@@ -8,14 +8,16 @@
  * Contributors:
  *     Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.make.internal.core.scannerconfig;
+package org.eclipse.cdt.make.core.language.settings.providers;
 
 
 import org.eclipse.cdt.core.errorparsers.RegexErrorPattern;
 import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
-import org.eclipse.cdt.make.core.scannerconfig.AbstractBuildCommandParser;
 
+/**
+ * @since 7.2
+ */
 public class GCCBuildCommandParser extends AbstractBuildCommandParser implements ILanguageSettingsEditableProvider {
 	@SuppressWarnings("nls")
 	static final AbstractOptionParser[] optionParsers = {

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

@@ -543,16 +543,16 @@
    <extension
          point="org.eclipse.cdt.ui.LanguageSettingsProviderAssociation">
       <class-association
-            class="org.eclipse.cdt.make.core.scannerconfig.AbstractBuildCommandParser"
+            class="org.eclipse.cdt.make.core.language.settings.providers.AbstractBuildCommandParser"
             icon="icons/obj16/log_obj.gif"
-            page="org.eclipse.cdt.make.internal.ui.preferences.GCCBuildCommandParserOptionPage"
+            page="org.eclipse.cdt.make.internal.ui.language.settings.providers.GCCBuildCommandParserOptionPage"
             ui-clear-entries="true"
             ui-edit-entries="false">
       </class-association>
       <class-association
-            class="org.eclipse.cdt.make.core.scannerconfig.AbstractBuiltinSpecsDetector"
+            class="org.eclipse.cdt.make.core.language.settings.providers.AbstractBuiltinSpecsDetector"
             icon="icons/obj16/inspect_system.gif"
-            page="org.eclipse.cdt.make.internal.ui.scannerconfig.BuiltinSpecsDetectorOptionPage"
+            page="org.eclipse.cdt.make.internal.ui.language.settings.providers.BuiltinSpecsDetectorOptionPage"
             ui-clear-entries="true"
             ui-edit-entries="false">
       </class-association>
@@ -561,14 +561,14 @@
          point="org.eclipse.cdt.core.CBuildConsole">
       <CBuildConsole
             id="org.eclipse.cdt.make.internal.ui.scannerconfig.ScannerDiscoveryConsole"
-            class="org.eclipse.cdt.make.internal.ui.scannerconfig.ScannerDiscoveryConsole">
+            class="org.eclipse.cdt.make.internal.ui.language.settings.providers.ScannerDiscoveryConsole">
       </CBuildConsole>
    </extension>
    <extension
          point="org.eclipse.cdt.core.CBuildConsole">
       <CBuildConsole
             id="org.eclipse.cdt.make.internal.ui.scannerconfig.ScannerDiscoveryGlobalConsole"
-            class="org.eclipse.cdt.make.internal.ui.scannerconfig.ScannerDiscoveryGlobalConsole">
+            class="org.eclipse.cdt.make.internal.ui.language.settings.providers.ScannerDiscoveryGlobalConsole">
       </CBuildConsole>
    </extension>
 </plugin>

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/language/settings/providers/BuiltinSpecsDetectorOptionPage.java

@@ -9,13 +9,13 @@
  *     Andrew Gvozdev - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.make.internal.ui.scannerconfig;
+package org.eclipse.cdt.make.internal.ui.language.settings.providers;
 
 import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
 import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
 import org.eclipse.cdt.internal.ui.language.settings.providers.AbstractLanguageSettingProviderOptionPage;
 import org.eclipse.cdt.internal.ui.newui.StatusMessageLine;
-import org.eclipse.cdt.make.core.scannerconfig.AbstractBuiltinSpecsDetector;
+import org.eclipse.cdt.make.core.language.settings.providers.AbstractBuiltinSpecsDetector;
 import org.eclipse.cdt.utils.ui.controls.ControlFactory;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/language/settings/providers/GCCBuildCommandParserOptionPage.java

@@ -9,13 +9,13 @@
  *     Andrew Gvozdev - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.make.internal.ui.preferences;
+package org.eclipse.cdt.make.internal.ui.language.settings.providers;
 
 import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
 import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
 import org.eclipse.cdt.internal.ui.language.settings.providers.AbstractLanguageSettingProviderOptionPage;
 import org.eclipse.cdt.internal.ui.newui.StatusMessageLine;
-import org.eclipse.cdt.make.core.scannerconfig.AbstractBuildCommandParser;
+import org.eclipse.cdt.make.core.language.settings.providers.AbstractBuildCommandParser;
 import org.eclipse.cdt.utils.ui.controls.ControlFactory;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/language/settings/providers/ScannerDiscoveryConsole.java

@@ -9,7 +9,7 @@
  *     Andrew Gvozdev - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.make.internal.ui.scannerconfig;
+package org.eclipse.cdt.make.internal.ui.language.settings.providers;
 
 import java.net.URL;
 

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/language/settings/providers/ScannerDiscoveryGlobalConsole.java

@@ -9,7 +9,7 @@
  *     Andrew Gvozdev - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.make.internal.ui.scannerconfig;
+package org.eclipse.cdt.make.internal.ui.language.settings.providers;
 
 import java.io.IOException;
 import java.net.URL;

build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF

@@ -6,8 +6,8 @@ Bundle-Version: 8.1.0.qualifier
 Bundle-Activator: org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin
 Bundle-Vendor: Eclipse CDT
 Bundle-Localization: plugin
-Export-Package: org.eclipse.cdt.build.core.scannerconfig.tests;x-internal:=true,
+Export-Package: org.eclipse.cdt.managedbuilder.core.tests,
- org.eclipse.cdt.managedbuilder.core.tests,
+ org.eclipse.cdt.managedbuilder.language.settings.providers.tests,
  org.eclipse.cdt.managedbuilder.templateengine.tests,
  org.eclipse.cdt.managedbuilder.testplugin,
  org.eclipse.cdt.managedbuilder.tests.suite,

build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java

@@ -15,7 +15,6 @@ package org.eclipse.cdt.managedbuilder.tests.suite;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.cdt.build.core.scannerconfig.tests.AllLanguageSettingsProvidersMBSTests;
 import org.eclipse.cdt.build.core.scannerconfig.tests.CfgScannerConfigProfileManagerTests;
 import org.eclipse.cdt.build.core.scannerconfig.tests.GCCSpecsConsoleParserTest;
 import org.eclipse.cdt.core.CCorePlugin;
@@ -40,6 +39,7 @@ import org.eclipse.cdt.managedbuilder.core.tests.OptionCategoryEnablementTests;
 import org.eclipse.cdt.managedbuilder.core.tests.OptionEnablementTests;
 import org.eclipse.cdt.managedbuilder.core.tests.PathConverterTest;
 import org.eclipse.cdt.managedbuilder.core.tests.ResourceBuildCoreTests;
+import org.eclipse.cdt.managedbuilder.language.settings.providers.tests.AllLanguageSettingsProvidersMBSTests;
 import org.eclipse.cdt.managedbuilder.templateengine.tests.AllTemplateEngineTests;
 import org.eclipse.cdt.projectmodel.tests.BackwardCompatiblityTests;
 import org.eclipse.cdt.projectmodel.tests.CProjectDescriptionSerializationTests;

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTests.java

@@ -9,7 +9,7 @@
  *    Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.build.core.scannerconfig.tests;
+package org.eclipse.cdt.managedbuilder.language.settings.providers.tests;
 
 import junit.framework.TestSuite;
 

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Andrew Gvozdev - Initial API and implementation
  *******************************************************************************/
- package org.eclipse.cdt.build.core.scannerconfig.tests;
+ package org.eclipse.cdt.managedbuilder.language.settings.providers.tests;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,8 +24,8 @@ import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 import org.eclipse.cdt.core.testplugin.ResourceHelper;
 import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
-import org.eclipse.cdt.managedbuilder.internal.scannerconfig.GCCBuiltinSpecsDetector;
+import org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetector;
-import org.eclipse.cdt.managedbuilder.internal.scannerconfig.GCCBuiltinSpecsDetectorCygwin;
+import org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorCygwin;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/LanguageSettingsProvidersMBSTest.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Andrew Gvozdev - Initial API and implementation
  *******************************************************************************/
- package org.eclipse.cdt.build.core.scannerconfig.tests;
+ package org.eclipse.cdt.managedbuilder.language.settings.providers.tests;
 
 import java.util.ArrayList;
 import java.util.List;

build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF

@@ -17,8 +17,10 @@ Export-Package: org.eclipse.cdt.build.core.scannerconfig,
  org.eclipse.cdt.managedbuilder.internal.core;x-friends:="org.eclipse.cdt.managedbuilder.ui",
  org.eclipse.cdt.managedbuilder.internal.dataprovider;x-internal:=true,
  org.eclipse.cdt.managedbuilder.internal.envvar;x-internal:=true,
+ org.eclipse.cdt.managedbuilder.internal.language.settings.providers;x-internal:=true,
  org.eclipse.cdt.managedbuilder.internal.macros;x-friends:="org.eclipse.cdt.managedbuilder.ui",
  org.eclipse.cdt.managedbuilder.internal.scannerconfig;x-internal:=true,
+ org.eclipse.cdt.managedbuilder.language.settings.providers,
  org.eclipse.cdt.managedbuilder.macros,
  org.eclipse.cdt.managedbuilder.makegen,
  org.eclipse.cdt.managedbuilder.makegen.gnu,

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

@@ -601,12 +601,12 @@
    <extension
          point="org.eclipse.cdt.core.LanguageSettingsProvider">
       <provider
-            class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.MBSLanguageSettingsProvider"
+            class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.MBSLanguageSettingsProvider"
             id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider"
             name="CDT Managed Build Setting Entries">
       </provider>
       <provider
-            class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.GCCBuiltinSpecsDetector"
+            class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetector"
             id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector"
             name="CDT GCC Builtin Compiler Settings"
             parameter="${COMMAND} -E -P -v -dD ${INPUTS}">
@@ -614,7 +614,7 @@
          <language-scope id="org.eclipse.cdt.core.g++"/>
       </provider>
       <provider
-            class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.GCCBuiltinSpecsDetectorCygwin"
+            class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorCygwin"
             id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorCygwin"
             name="CDT GCC Builtin Compiler Settings Cygwin"
             parameter="sh -c &quot;${COMMAND} -E -P -v -dD ${INPUTS}&quot;">

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

@@ -26,7 +26,7 @@ import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvide
 import org.eclipse.cdt.core.model.ICModelMarker;
 import org.eclipse.cdt.core.resources.IConsole;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
-import org.eclipse.cdt.make.core.scannerconfig.AbstractBuildCommandParser;
+import org.eclipse.cdt.make.core.language.settings.providers.AbstractBuildCommandParser;
 import org.eclipse.cdt.managedbuilder.buildmodel.BuildDescriptionManager;
 import org.eclipse.cdt.managedbuilder.buildmodel.IBuildDescription;
 import org.eclipse.cdt.managedbuilder.internal.buildmodel.BuildDescription;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/GCCBuiltinSpecsDetector.java

@@ -9,7 +9,7 @@
  *     Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.managedbuilder.internal.scannerconfig;
+package org.eclipse.cdt.managedbuilder.internal.language.settings.providers;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,7 +17,7 @@ import java.util.List;
 import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
-import org.eclipse.cdt.managedbuilder.scannerconfig.ToolchainBuiltinSpecsDetector;
+import org.eclipse.cdt.managedbuilder.language.settings.providers.ToolchainBuiltinSpecsDetector;
 import org.eclipse.core.runtime.CoreException;
 
 /**

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/GCCBuiltinSpecsDetectorCygwin.java

@@ -9,7 +9,7 @@
  *     Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.managedbuilder.internal.scannerconfig;
+package org.eclipse.cdt.managedbuilder.internal.language.settings.providers;
 
 import java.net.URI;
 import java.net.URISyntaxException;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/MBSLanguageSettingsProvider.java

@@ -9,7 +9,7 @@
  *     Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.managedbuilder.internal.scannerconfig;
+package org.eclipse.cdt.managedbuilder.internal.language.settings.providers;
 
 import java.util.ArrayList;
 import java.util.List;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ToolchainBuiltinSpecsDetector.java

@@ -9,12 +9,12 @@
  *     Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.managedbuilder.scannerconfig;
+package org.eclipse.cdt.managedbuilder.language.settings.providers;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.cdt.make.core.scannerconfig.AbstractBuiltinSpecsDetector;
+import org.eclipse.cdt.make.core.language.settings.providers.AbstractBuiltinSpecsDetector;
 import org.eclipse.cdt.managedbuilder.core.IInputType;
 import org.eclipse.cdt.managedbuilder.core.ITool;
 import org.eclipse.cdt.managedbuilder.core.IToolChain;

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

@@ -87,7 +87,7 @@
          <language-scope id="org.eclipse.cdt.core.g++"/>
       </provider>
       <provider
-            class="org.eclipse.cdt.make.internal.core.scannerconfig.GCCBuildCommandParser"
+            class="org.eclipse.cdt.make.core.language.settings.providers.GCCBuildCommandParser"
             id="org.eclipse.cdt.managedbuilder.xlc.core.XlcBuildCommandParser"
             name="%XlcBuildCommandParserName"
             parameter="xl[cC]"

xlc/org.eclipse.cdt.managedbuilder.xlc.core/src/org/eclipse/cdt/managedbuilder/xlc/core/XlcBuiltinSpecsDetector.java

@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
 
 import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider;
 import org.eclipse.cdt.core.settings.model.ICSettingEntry;
-import org.eclipse.cdt.managedbuilder.scannerconfig.ToolchainBuiltinSpecsDetector;
+import org.eclipse.cdt.managedbuilder.language.settings.providers.ToolchainBuiltinSpecsDetector;