diff --git a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF index 35010caf6c8..1cb128cd491 100644 --- a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: org.eclipse.cdt.make.core.tests;singleton:=true 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.language.settings.providers + org.eclipse.cdt.make.core.tests Require-Bundle: org.eclipse.core.runtime, org.junit, org.eclipse.cdt.make.core, diff --git a/build/org.eclipse.cdt.make.core.tests/plugin.xml b/build/org.eclipse.cdt.make.core.tests/plugin.xml deleted file mode 100644 index beb8ba79882..00000000000 --- a/build/org.eclipse.cdt.make.core.tests/plugin.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/language/settings/providers/AllLanguageSettingsProvidersMakeCoreTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/language/settings/providers/AllLanguageSettingsProvidersMakeCoreTests.java deleted file mode 100644 index d51efdaa6db..00000000000 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/language/settings/providers/AllLanguageSettingsProvidersMakeCoreTests.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Andrew Gvozdev and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Andrew Gvozdev - initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.make.language.settings.providers; - -import junit.framework.TestSuite; - -public class AllLanguageSettingsProvidersMakeCoreTests extends TestSuite { - - public static TestSuite suite() { - return new AllLanguageSettingsProvidersMakeCoreTests(); - } - - public AllLanguageSettingsProvidersMakeCoreTests() { - super(AllLanguageSettingsProvidersMakeCoreTests.class.getName()); - - addTestSuite(GCCBuildCommandParserTest.class); - addTestSuite(BuiltinSpecsDetectorTest.class); - } -} diff --git a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF index b78b237cef4..3a2cbd5d68b 100644 --- a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ 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, diff --git a/build/org.eclipse.cdt.make.core/plugin.xml b/build/org.eclipse.cdt.make.core/plugin.xml index ceb0a4c2718..36067e63368 100644 --- a/build/org.eclipse.cdt.make.core/plugin.xml +++ b/build/org.eclipse.cdt.make.core/plugin.xml @@ -182,15 +182,5 @@ class="org.eclipse.cdt.make.internal.core.dataprovider.MakeConfigurationDataProvider" /> - - - - diff --git a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF index 1986bb3259e..dfc8152316b 100644 --- a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF @@ -35,8 +35,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)";resolution:=optional, org.eclipse.compare;bundle-version="[3.3.0,4.0.0)", - org.eclipse.core.filesystem;bundle-version="1.2.0", - org.eclipse.ui.console;bundle-version="3.5.100" + org.eclipse.core.filesystem;bundle-version="1.2.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: com.ibm.icu.text diff --git a/build/org.eclipse.cdt.make.ui/icons/obj16/search.gif b/build/org.eclipse.cdt.make.ui/icons/obj16/search.gif deleted file mode 100644 index d540a01f4d9..00000000000 Binary files a/build/org.eclipse.cdt.make.ui/icons/obj16/search.gif and /dev/null differ diff --git a/build/org.eclipse.cdt.make.ui/plugin.properties b/build/org.eclipse.cdt.make.ui/plugin.properties index 4db795b46c4..21b341f00ec 100644 --- a/build/org.eclipse.cdt.make.ui/plugin.properties +++ b/build/org.eclipse.cdt.make.ui/plugin.properties @@ -44,9 +44,6 @@ PreferenceBuildSettings.name=Settings ErrorParsersTab.name=Error Parsers ErrorParsersTab.tooltip=Error Parsers scan build output and report errors in Problems view -LanguageSettingsProvidersTab.name=Discovery -LanguageSettingsProvidersTab.tooltip=Language settings providers - PreferenceMakeProject.name=New Make Projects PreferenceMake.name=Make Targets PreferenceMakefileEditor.name=Makefile Editor diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml index a5a26108a06..002d57859e9 100644 --- a/build/org.eclipse.cdt.make.ui/plugin.xml +++ b/build/org.eclipse.cdt.make.ui/plugin.xml @@ -470,14 +470,6 @@ tooltip="%ErrorParsersTab.tooltip" weight="020"> - - - - - - - - - - - - - - - - diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml index 9e0a06463ee..67494d80a53 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml @@ -9301,4 +9301,14 @@ + + + + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTests.java index 4927c628e31..9659fbe9a6f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/AllLanguageSettingsProvidersMBSTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Andrew Gvozdev and others. + * Copyright (c) 2010, 2012 Andrew Gvozdev and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -23,6 +23,8 @@ public class AllLanguageSettingsProvidersMBSTests extends TestSuite { super(AllLanguageSettingsProvidersMBSTests.class.getName()); addTestSuite(LanguageSettingsProvidersMBSTest.class); + addTestSuite(GCCBuildCommandParserTest.class); + addTestSuite(BuiltinSpecsDetectorTest.class); addTestSuite(GCCBuiltinSpecsDetectorTest.class); } } diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/language/settings/providers/BuiltinSpecsDetectorTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java similarity index 98% rename from build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/language/settings/providers/BuiltinSpecsDetectorTest.java rename to build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java index 251aae6b49a..fab13c3a8e8 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/language/settings/providers/BuiltinSpecsDetectorTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Andrew Gvozdev and others. + * Copyright (c) 2010, 2012 Andrew Gvozdev and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,7 +8,7 @@ * Contributors: * Andrew Gvozdev - Initial API and implementation *******************************************************************************/ - package org.eclipse.cdt.make.language.settings.providers; + package org.eclipse.cdt.managedbuilder.language.settings.providers.tests; import java.io.IOException; import java.io.OutputStream; @@ -34,7 +34,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.language.settings.providers.AbstractBuiltinSpecsDetector; +import org.eclipse.cdt.managedbuilder.language.settings.providers.AbstractBuiltinSpecsDetector; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/language/settings/providers/GCCBuildCommandParserTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java similarity index 99% rename from build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/language/settings/providers/GCCBuildCommandParserTest.java rename to build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java index 64ce467b106..f077c39c5fe 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/language/settings/providers/GCCBuildCommandParserTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java @@ -8,7 +8,7 @@ * Contributors: * Andrew Gvozdev - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.make.language.settings.providers; +package org.eclipse.cdt.managedbuilder.language.settings.providers.tests; 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.language.settings.providers.AbstractBuildCommandParser; -import org.eclipse.cdt.make.core.language.settings.providers.GCCBuildCommandParser; +import org.eclipse.cdt.managedbuilder.language.settings.providers.AbstractBuildCommandParser; +import org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -56,7 +56,7 @@ import org.w3c.dom.Element; public class GCCBuildCommandParserTest extends BaseTestCase { // ID of the parser taken from the extension point - private static final String GCC_BUILD_COMMAND_PARSER_EXT = "org.eclipse.cdt.make.core.GCCBuildCommandParser"; //$NON-NLS-1$ + private static final String GCC_BUILD_COMMAND_PARSER_EXT = "org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"; //$NON-NLS-1$ private static final String PROVIDER_ID = "provider.id"; private static final String PROVIDER_NAME = "provider name"; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java index b13d4fe9539..d6d47f398f2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java @@ -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.language.settings.providers.GCCBuiltinSpecsDetector; import org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorCygwin; +import org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml index bcd5b536211..c8c2e7e40ad 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml +++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml @@ -606,7 +606,7 @@ name="CDT Managed Build Setting Entries"> @@ -621,6 +621,13 @@ + + args){ return BuilderFactory.createBuilders(project, args); } - + public static IBuilder createCustomBuilder(IConfiguration cfg, String builderId) throws CoreException{ return BuilderFactory.createCustomBuilder(cfg, builderId); } - + public static IBuilder createCustomBuilder(IConfiguration cfg, IBuilder base){ return BuilderFactory.createCustomBuilder(cfg, base); } - + public static IBuilder createBuilderForEclipseBuilder(IConfiguration cfg, String eclipseBuilderID) throws CoreException { return BuilderFactory.createBuilderForEclipseBuilder(cfg, eclipseBuilderID); } - + public boolean isOldStyleMakeProject(IProject project){ return ProjectConverter.isOldStyleMakeProject(project); } @@ -283,12 +285,10 @@ public class ManagedBuilderCorePlugin extends Plugin { ProjectConverter.convertOldStdMakeToNewStyle(project, monitor); } - -// public IDiscoveredPathManager getDiscoveryManager() { -// if ( fDiscoveryPathManager == null) { -// fDiscoveryPathManager = new DiscoveredPathManager(); -// fDiscoveryPathManager.startup(); -// } -// return fDiscoveryPathManager; -// } + /** + * @since 8.1 + */ + public static IPath getWorkingDirectory() { + return MakeCorePlugin.getDefault().getStateLocation(); + } } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/GCCBuiltinSpecsDetectorCygwin.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/GCCBuiltinSpecsDetectorCygwin.java index 5081ab12476..00e8b291613 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/GCCBuiltinSpecsDetectorCygwin.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/GCCBuiltinSpecsDetectorCygwin.java @@ -14,11 +14,12 @@ package org.eclipse.cdt.managedbuilder.internal.language.settings.providers; import java.net.URI; import java.net.URISyntaxException; +import org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector; import org.eclipse.core.resources.IResource; /** * Class to detect built-in compiler settings. - * The paths are converted to cygwin "filesystem" representation. + * The paths are converted to cygwin "file-system" representation. * */ public class GCCBuiltinSpecsDetectorCygwin extends GCCBuiltinSpecsDetector { diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/AbstractBuildCommandParser.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuildCommandParser.java similarity index 96% rename from build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/AbstractBuildCommandParser.java rename to build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuildCommandParser.java index 6bff1fa1f2b..e030f4b582b 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/AbstractBuildCommandParser.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuildCommandParser.java @@ -9,7 +9,7 @@ * Andrew Gvozdev - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.make.core.language.settings.providers; +package org.eclipse.cdt.managedbuilder.language.settings.providers; import java.util.ArrayList; import java.util.Arrays; @@ -26,7 +26,7 @@ import org.eclipse.cdt.core.errorparsers.RegexErrorParser; import org.eclipse.cdt.core.errorparsers.RegexErrorPattern; import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.make.core.MakeCorePlugin; +import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -42,10 +42,10 @@ import org.eclipse.core.runtime.jobs.Job; * Abstract class for providers parsing compiler option from build command when it * is present in build output. * - * @since 7.2 + * @since 8.1 */ public abstract class AbstractBuildCommandParser extends AbstractLanguageSettingsOutputScanner { - public static final Object JOB_FAMILY_BUILD_COMMAND_PARSER = "org.eclipse.cdt.make.core.scannerconfig.AbstractBuildCommandParser"; + public static final Object JOB_FAMILY_BUILD_COMMAND_PARSER = "org.eclipse.cdt.managedbuilder.AbstractBuildCommandParser"; //$NON-NLS-1$ private static final String ATTR_PARAMETER = "parameter"; //$NON-NLS-1$ private static final String LEADING_PATH_PATTERN = "\\S+[/\\\\]"; //$NON-NLS-1$ @@ -205,7 +205,7 @@ public abstract class AbstractBuildCommandParser extends AbstractLanguageSetting if (settingsFolder.isAccessible()) rule = currentProject.getFile(".settings/language.settings.xml"); } catch (CoreException e) { - MakeCorePlugin.log(e); + ManagedBuilderCorePlugin.log(e); } } } diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/AbstractBuiltinSpecsDetector.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuiltinSpecsDetector.java similarity index 86% rename from build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/AbstractBuiltinSpecsDetector.java rename to build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuiltinSpecsDetector.java index 42ffb3193ec..1a33a97b6de 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/AbstractBuiltinSpecsDetector.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuiltinSpecsDetector.java @@ -9,7 +9,7 @@ * Andrew Gvozdev - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.make.core.language.settings.providers; +package org.eclipse.cdt.managedbuilder.language.settings.providers; import java.io.IOException; import java.io.OutputStream; @@ -25,7 +25,6 @@ import org.eclipse.cdt.core.ICommandLauncher; import org.eclipse.cdt.core.IConsoleParser; import org.eclipse.cdt.core.IMarkerGenerator; import org.eclipse.cdt.core.ProblemMarkerInfo; -import org.eclipse.cdt.core.language.settings.providers.ICBuildOutputParser; import org.eclipse.cdt.core.language.settings.providers.ICListenerAgent; import org.eclipse.cdt.core.language.settings.providers.IWorkingDirectoryTracker; import org.eclipse.cdt.core.model.ILanguage; @@ -38,7 +37,7 @@ import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.internal.core.BuildRunnerHelper; import org.eclipse.cdt.internal.core.XmlUtil; import org.eclipse.cdt.internal.core.language.settings.providers.LanguageSettingsLogger; -import org.eclipse.cdt.make.core.MakeCorePlugin; +import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin; import org.eclipse.cdt.utils.CommandLineUtil; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; @@ -65,11 +64,11 @@ import org.w3c.dom.Element; * Abstract parser capable to execute compiler command printing built-in compiler * specs and parse built-in language settings out of it. * - * @since 7.2 + * @since 8.1 */ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSettingsOutputScanner implements ICListenerAgent { // TODO - refine id after settling with the plugin - public static final String JOB_FAMILY_BUILTIN_SPECS_DETECTOR = "org.eclipse.cdt.make.core.scannerconfig.AbstractBuiltinSpecsDetector"; + public static final String JOB_FAMILY_BUILTIN_SPECS_DETECTOR = "org.eclipse.cdt.managedbuilder.AbstractBuiltinSpecsDetector"; //$NON-NLS-1$ protected static final String COMPILER_MACRO = "${COMMAND}"; //$NON-NLS-1$ protected static final String SPEC_FILE_MACRO = "${INPUTS}"; //$NON-NLS-1$ @@ -83,13 +82,12 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti private static final int TICKS_OUTPUT_PARSING = 1 * MONITOR_SCALE; private static final int TICKS_EXECUTE_COMMAND = 1 * MONITOR_SCALE; - private static final String CDT_MAKE_UI_PLUGIN_ID = "org.eclipse.cdt.make.ui"; //$NON-NLS-1$ + private static final String CDT_MANAGEDBUILDER_UI_PLUGIN_ID = "org.eclipse.cdt.managedbuilder.ui"; //$NON-NLS-1$ private static final String DEFAULT_CONSOLE_ICON = "icons/obj16/inspect_system.gif"; //$NON-NLS-1$ private static final String GMAKE_ERROR_PARSER_ID = "org.eclipse.cdt.core.GmakeErrorParser"; //$NON-NLS-1$ private static final String ATTR_PARAMETER = "parameter"; //$NON-NLS-1$ private static final String ATTR_CONSOLE = "console"; //$NON-NLS-1$ - private static final String NEWLINE = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$ protected URI mappedRootURI = null; protected URI buildDirURI = null; @@ -139,7 +137,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti } } } catch (CoreException e) { - return new Status(Status.ERROR, MakeCorePlugin.getUniqueIdentifier(), "Error checking markers.", e); //$NON-NLS-1$ + return new Status(Status.ERROR, ManagedBuilderCorePlugin.PLUGIN_ID, "Error checking markers.", e); //$NON-NLS-1$ } try { @@ -154,7 +152,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti marker.setAttribute(IMarker.LOCATION, "Project Properties, C++ Preprocessor Include.../Providers, [" + providerName + "] options"); } } catch (CoreException e) { - return new Status(Status.ERROR, MakeCorePlugin.getUniqueIdentifier(), "Error adding markers.", e); //$NON-NLS-1$ + return new Status(Status.ERROR, ManagedBuilderCorePlugin.PLUGIN_ID, "Error adding markers.", e); //$NON-NLS-1$ } return Status.OK_STATUS; @@ -175,7 +173,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti } } } catch (CoreException e) { - MakeCorePlugin.log(new Status(Status.ERROR, MakeCorePlugin.getUniqueIdentifier(), "Error deleting markers.", e)); //$NON-NLS-1$ + ManagedBuilderCorePlugin.log(new Status(Status.ERROR, ManagedBuilderCorePlugin.PLUGIN_ID, "Error deleting markers.", e)); //$NON-NLS-1$ } } @@ -338,8 +336,8 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti startup(currentCfgDescription, null); status = runForEachLanguage(monitor); } catch (CoreException e) { - MakeCorePlugin.log(e); - status = new Status(IStatus.ERROR, MakeCorePlugin.PLUGIN_ID, IStatus.ERROR, "Error running Builtin Specs Detector", e); + ManagedBuilderCorePlugin.log(e); + status = new Status(IStatus.ERROR, ManagedBuilderCorePlugin.PLUGIN_ID, IStatus.ERROR, "Error running Builtin Specs Detector", e); } finally { shutdown(); } @@ -377,7 +375,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti * TODO */ protected IStatus runForEachLanguage(IProgressMonitor monitor) { - MultiStatus status = new MultiStatus(MakeCorePlugin.PLUGIN_ID, IStatus.OK, "Problem running CDT Scanner Discovery provider " + getId(), null); + MultiStatus status = new MultiStatus(ManagedBuilderCorePlugin.PLUGIN_ID, IStatus.OK, "Problem running CDT Scanner Discovery provider " + getId(), null); if (monitor == null) { monitor = new NullProgressMonitor(); @@ -405,8 +403,8 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti startupForLanguage(languageId); runForLanguage(new SubProgressMonitor(monitor, TICKS_RUN_FOR_ONE_LANGUAGE)); } catch (Exception e) { - IStatus s = new Status(IStatus.ERROR, MakeCorePlugin.PLUGIN_ID, IStatus.ERROR, "Error running Builtin Specs Detector", e); //$NON-NLS-1$ - MakeCorePlugin.log(s); + IStatus s = new Status(IStatus.ERROR, ManagedBuilderCorePlugin.PLUGIN_ID, IStatus.ERROR, "Error running Builtin Specs Detector", e); //$NON-NLS-1$ + ManagedBuilderCorePlugin.log(s); status.merge(s); } finally { shutdownForLanguage(); @@ -431,8 +429,8 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti } catch (OperationCanceledException e) { // user chose to cancel operation, do not threaten them with red error signs } catch (Exception e) { - status.merge(new Status(IStatus.ERROR, MakeCorePlugin.PLUGIN_ID, IStatus.ERROR, "Error running Builtin Specs Detector", e)); - MakeCorePlugin.log(status); + status.merge(new Status(IStatus.ERROR, ManagedBuilderCorePlugin.PLUGIN_ID, IStatus.ERROR, "Error running Builtin Specs Detector", e)); + ManagedBuilderCorePlugin.log(status); } finally { monitor.done(); } @@ -485,7 +483,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti console = startProviderConsole(); } else { // that looks in extension points registry and won't find the id, this console is not shown - console = CCorePlugin.getDefault().getConsole(MakeCorePlugin.PLUGIN_ID + ".console.hidden"); //$NON-NLS-1$ + console = CCorePlugin.getDefault().getConsole(ManagedBuilderCorePlugin.PLUGIN_ID + ".console.hidden"); //$NON-NLS-1$ } console.start(currentProject); @@ -526,13 +524,13 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti buildRunnerHelper.goodbye(); } catch (Exception e) { - Status status = new Status(IStatus.ERROR, MakeCorePlugin.PLUGIN_ID, "Internal error running scanner discovery", e); - MakeCorePlugin.log(new CoreException(status)); + Status status = new Status(IStatus.ERROR, ManagedBuilderCorePlugin.PLUGIN_ID, "Internal error running scanner discovery", e); + ManagedBuilderCorePlugin.log(new CoreException(status)); } finally { try { buildRunnerHelper.close(); } catch (IOException e) { - MakeCorePlugin.log(e); + ManagedBuilderCorePlugin.log(e); } monitor.done(); } @@ -553,19 +551,38 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti } private IConsole startProviderConsole() { - String extConsoleId; - if (currentProject != null) { - extConsoleId = "org.eclipse.cdt.make.internal.ui.scannerconfig.ScannerDiscoveryConsole"; - } else { - // TODO This console is not colored! - extConsoleId = "org.eclipse.cdt.make.internal.ui.scannerconfig.ScannerDiscoveryGlobalConsole"; - } - ILanguage ld = LanguageManager.getInstance().getLanguage(currentLanguageId); - String consoleId = MakeCorePlugin.PLUGIN_ID + '.' + getId() + '.' + currentLanguageId; - String consoleName = getName() + ", " + ld.getName(); - URL defaultIcon = Platform.getBundle(CDT_MAKE_UI_PLUGIN_ID).getEntry(DEFAULT_CONSOLE_ICON); + IConsole console = null; + + if (isConsoleEnabled && currentLanguageId != null) { + String extConsoleId; + if (currentProject != null) { + extConsoleId = "org.eclipse.cdt.managedbuilder.ScannerDiscoveryConsole"; + } else { + // TODO This console is not colored! + extConsoleId = "org.eclipse.cdt.managedbuilder.ScannerDiscoveryGlobalConsole"; + } + ILanguage ld = LanguageManager.getInstance().getLanguage(currentLanguageId); + if (ld != null) { + String consoleId = ManagedBuilderCorePlugin.PLUGIN_ID + '.' + getId() + '.' + currentLanguageId; + String consoleName = getName() + ", " + ld.getName(); + URL defaultIcon = Platform.getBundle(CDT_MANAGEDBUILDER_UI_PLUGIN_ID).getEntry(DEFAULT_CONSOLE_ICON); + if (defaultIcon == null) { + @SuppressWarnings("nls") + String msg = "Unable to find icon " + DEFAULT_CONSOLE_ICON + " in plugin " + CDT_MANAGEDBUILDER_UI_PLUGIN_ID; + ManagedBuilderCorePlugin.log(new Status(IStatus.ERROR, ManagedBuilderCorePlugin.PLUGIN_ID, msg)); + } + + console = CCorePlugin.getDefault().getConsole(extConsoleId, consoleId, consoleName, defaultIcon); + } + } + + if (console == null) { + // that looks in extension points registry and won't find the id, this console is not shown + console = CCorePlugin.getDefault().getConsole(ManagedBuilderCorePlugin.PLUGIN_ID + ".console.hidden"); //$NON-NLS-1$ + } + + - IConsole console = CCorePlugin.getDefault().getConsole(extConsoleId, consoleId, consoleName, defaultIcon); return console; } @@ -577,7 +594,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti } String specFileName = SPEC_FILE_BASE + ext; - IPath workingLocation = MakeCorePlugin.getWorkingDirectory(); + IPath workingLocation = ManagedBuilderCorePlugin.getWorkingDirectory(); IPath fileLocation = workingLocation.append(specFileName); specFile = new java.io.File(fileLocation.toOSString()); @@ -587,7 +604,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti try { specFile.createNewFile(); } catch (IOException e) { - MakeCorePlugin.log(e); + ManagedBuilderCorePlugin.log(e); } } @@ -615,7 +632,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti } if (ext == null) { - MakeCorePlugin.log(new Status(IStatus.ERROR, MakeCorePlugin.PLUGIN_ID, "Unable to find file extension for language " + languageId)); //$NON-NLS-1$ + ManagedBuilderCorePlugin.log(new Status(IStatus.ERROR, ManagedBuilderCorePlugin.PLUGIN_ID, "Unable to find file extension for language " + languageId)); //$NON-NLS-1$ } return ext; } diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/AbstractLanguageSettingsOutputScanner.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractLanguageSettingsOutputScanner.java similarity index 98% rename from build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/AbstractLanguageSettingsOutputScanner.java rename to build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractLanguageSettingsOutputScanner.java index 9765042bc8a..9d85ded9a2b 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/AbstractLanguageSettingsOutputScanner.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractLanguageSettingsOutputScanner.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Andrew Gvozdev and others. + * Copyright (c) 2009, 2012 Andrew Gvozdev and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -9,7 +9,7 @@ * Andrew Gvozdev - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.make.core.language.settings.providers; +package org.eclipse.cdt.managedbuilder.language.settings.providers; import java.io.File; import java.io.IOException; @@ -27,7 +27,6 @@ import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ErrorParserManager; import org.eclipse.cdt.core.cdtvariables.CdtVariableException; import org.eclipse.cdt.core.cdtvariables.ICdtVariableManager; -import org.eclipse.cdt.core.language.settings.providers.ICBuildOutputParser; import org.eclipse.cdt.core.language.settings.providers.IWorkingDirectoryTracker; import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider; @@ -37,7 +36,7 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.cdt.core.settings.model.util.CDataUtil; import org.eclipse.cdt.internal.core.XmlUtil; import org.eclipse.cdt.internal.core.language.settings.providers.LanguageSettingsLogger; -import org.eclipse.cdt.make.core.MakeCorePlugin; +import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin; import org.eclipse.cdt.utils.EFSExtensionManager; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.resources.IContainer; @@ -54,7 +53,7 @@ import org.w3c.dom.Element; /** * Abstract class for providers capable to parse build output. * - * @since 7.2 + * @since 8.1 */ public abstract class AbstractLanguageSettingsOutputScanner extends LanguageSettingsSerializableProvider implements ICBuildOutputParser { protected static final String ATTR_KEEP_RELATIVE_PATHS = "keep-relative-paths"; //$NON-NLS-1$ @@ -295,7 +294,7 @@ public abstract class AbstractLanguageSettingsOutputScanner extends LanguageSett } } catch (Throwable e) { // protect from rogue parsers extending this class - MakeCorePlugin.log(e); + ManagedBuilderCorePlugin.log(e); } } } @@ -496,9 +495,11 @@ public abstract class AbstractLanguageSettingsOutputScanner extends LanguageSett ICdtVariableManager vmanager = CCorePlugin.getDefault().getCdtVariableManager(); builderCWD = vmanager.resolveValue(builderCWD, "", null, currentCfgDescription); //$NON-NLS-1$ } catch (CdtVariableException e) { - MakeCorePlugin.log(e); + ManagedBuilderCorePlugin.log(e); + } + if (builderCWD != null && !builderCWD.isEmpty()) { + buildDirURI = org.eclipse.core.filesystem.URIUtil.toURI(builderCWD); } - buildDirURI = org.eclipse.core.filesystem.URIUtil.toURI(builderCWD); } } @@ -709,7 +710,7 @@ public abstract class AbstractLanguageSettingsOutputScanner extends LanguageSett fileURI.getPort(), path + '/', fileURI.getQuery(), fileURI.getFragment()); } catch (URISyntaxException e) { // It should be valid URI here or something is wrong - MakeCorePlugin.log(e); + ManagedBuilderCorePlugin.log(e); } return cwdURI; @@ -851,7 +852,7 @@ public abstract class AbstractLanguageSettingsOutputScanner extends LanguageSett String canonicalPathStr = file.getCanonicalPath(); return new Path(canonicalPathStr); } catch (Exception e) { - MakeCorePlugin.log(e); + ManagedBuilderCorePlugin.log(e); } return null; } diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/GCCBuildCommandParser.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/GCCBuildCommandParser.java similarity index 95% rename from build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/GCCBuildCommandParser.java rename to build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/GCCBuildCommandParser.java index e176f415dc1..92ec9d2a1fd 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/language/settings/providers/GCCBuildCommandParser.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/GCCBuildCommandParser.java @@ -8,7 +8,7 @@ * Contributors: * Andrew Gvozdev - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.make.core.language.settings.providers; +package org.eclipse.cdt.managedbuilder.language.settings.providers; import org.eclipse.cdt.core.errorparsers.RegexErrorPattern; @@ -16,7 +16,7 @@ import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditabl import org.eclipse.cdt.core.settings.model.ICSettingEntry; /** - * @since 7.2 + * @since 8.1 */ public class GCCBuildCommandParser extends AbstractBuildCommandParser implements ILanguageSettingsEditableProvider { @SuppressWarnings("nls") @@ -53,7 +53,7 @@ public class GCCBuildCommandParser extends AbstractBuildCommandParser implements public static class GCCBuildCommandPatternHighlighter extends AbstractBuildCommandParser.AbstractBuildCommandPatternHighlighter { // ID of the parser taken from the existing extension point - private static final String GCC_BUILD_COMMAND_PARSER_EXT = "org.eclipse.cdt.make.core.GCCBuildCommandParser"; //$NON-NLS-1$ + private static final String GCC_BUILD_COMMAND_PARSER_EXT = "org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"; //$NON-NLS-1$ public GCCBuildCommandPatternHighlighter() { super(GCC_BUILD_COMMAND_PARSER_EXT); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/GCCBuiltinSpecsDetector.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/GCCBuiltinSpecsDetector.java similarity index 96% rename from build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/GCCBuiltinSpecsDetector.java rename to build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/GCCBuiltinSpecsDetector.java index 947f3b7df87..f6a5a4899e4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/GCCBuiltinSpecsDetector.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/GCCBuiltinSpecsDetector.java @@ -9,7 +9,7 @@ * Andrew Gvozdev - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.managedbuilder.internal.language.settings.providers; +package org.eclipse.cdt.managedbuilder.language.settings.providers; import java.util.ArrayList; import java.util.List; @@ -18,11 +18,12 @@ import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditabl import org.eclipse.cdt.core.language.settings.providers.IWorkingDirectoryTracker; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICSettingEntry; -import org.eclipse.cdt.managedbuilder.language.settings.providers.ToolchainBuiltinSpecsDetector; import org.eclipse.core.runtime.CoreException; /** * Language settings provider to detect built-in compiler settings for GCC compiler. + * + * @since 8.1 */ public class GCCBuiltinSpecsDetector extends ToolchainBuiltinSpecsDetector implements ILanguageSettingsEditableProvider { // ID must match the toolchain definition in org.eclipse.cdt.managedbuilder.core.buildDefinitions extension point diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ICBuildOutputParser.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ICBuildOutputParser.java similarity index 88% rename from core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ICBuildOutputParser.java rename to build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ICBuildOutputParser.java index f7165b4e0f8..1f294ac14c6 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ICBuildOutputParser.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ICBuildOutputParser.java @@ -9,16 +9,17 @@ * Andrew Gvozdev - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.language.settings.providers; +package org.eclipse.cdt.managedbuilder.language.settings.providers; import org.eclipse.cdt.core.IConsoleParser; +import org.eclipse.cdt.core.language.settings.providers.IWorkingDirectoryTracker; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.core.runtime.CoreException; /** * Console parser interface extended to support language settings providers. * - * @since 5.4 + * @since 8.1 */ public interface ICBuildOutputParser extends IConsoleParser { /** diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ToolchainBuiltinSpecsDetector.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ToolchainBuiltinSpecsDetector.java index 579793b3f81..3a5412d61fd 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ToolchainBuiltinSpecsDetector.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/ToolchainBuiltinSpecsDetector.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Andrew Gvozdev and others. + * Copyright (c) 2009, 2012 Andrew Gvozdev and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.cdt.managedbuilder.language.settings.providers; import java.util.HashMap; import java.util.Map; -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; diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml index 3e6c0caa23e..af177faa5b7 100644 --- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml +++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml @@ -1704,7 +1704,7 @@ @@ -1772,7 +1772,7 @@ configurationEnvironmentSupplier="org.eclipse.cdt.managedbuilder.gnu.cygwin.GnuCygwinConfigurationEnvironmentSupplier" id="cdt.managedbuild.toolchain.gnu.cygwin.base" isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.cygwin.IsGnuCygwinToolChainSupported" - languageSettingsProviders="org.eclipse.cdt.make.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorCygwin" + languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorCygwin" name="%ToolChainName.Cygwin" osList="win32" targetTool="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base;cdt.managedbuild.tool.gnu.c.linker.cygwin.base;cdt.managedbuild.tool.gnu.archiver"> @@ -1842,7 +1842,7 @@ configurationEnvironmentSupplier="org.eclipse.cdt.managedbuilder.gnu.mingw.MingwEnvironmentVariableSupplier" id="cdt.managedbuild.toolchain.gnu.mingw.base" isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.mingw.MingwIsToolChainSupported" - languageSettingsProviders="org.eclipse.cdt.make.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" + languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" name="%ToolChainName.MinGW" osList="win32" targetTool="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base;cdt.managedbuild.tool.gnu.c.linker.mingw.base;cdt.managedbuild.tool.gnu.archiver"> @@ -2086,7 +2086,7 @@ + languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"> + languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"> + languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"> + + + + - - + - - + + + + + + + + + + + + + + +