From d29e766785be4c5008fc1f1325017e4eb6ec387e Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Mon, 12 Sep 2011 15:40:19 -0400 Subject: [PATCH] Do not create default legacy SD profile when LSP functionality is enabled --- .../scannerconfig2/CfgScannerConfigInfoFactory2.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java index 5f04bca0b9f..a6257e4bf01 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java @@ -19,6 +19,7 @@ import java.util.Map.Entry; import org.eclipse.cdt.build.core.scannerconfig.CfgInfoContext; import org.eclipse.cdt.build.core.scannerconfig.ICfgScannerConfigBuilderInfo2Set; import org.eclipse.cdt.build.internal.core.scannerconfig.CfgScannerConfigUtil; +import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.make.core.MakeCorePlugin; @@ -36,6 +37,7 @@ import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin; import org.eclipse.cdt.managedbuilder.internal.core.Configuration; import org.eclipse.cdt.managedbuilder.internal.dataprovider.BuildConfigurationData; +import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Preferences; import org.eclipse.core.runtime.QualifiedName; @@ -209,7 +211,12 @@ public class CfgScannerConfigInfoFactory2 { } } if (id == null) { - id = CfgScannerConfigUtil.getDefaultProfileId(context, true); + // Language Settings Providers are meant to replace legacy scanner discovery + // so do not try to find default profile + IProject project = cfg.getOwner().getProject(); + if (!ScannerDiscoveryLegacySupport.isLanguageSettingsProvidersFunctionalityEnabled(project)) { + id = CfgScannerConfigUtil.getDefaultProfileId(context, true); + } } InfoContext baseContext = context.toInfoContext();