diff options
| author | Andrew Gvozdev | 2009-09-03 18:00:25 +0000 |
|---|---|---|
| committer | Andrew Gvozdev | 2009-09-03 18:00:25 +0000 |
| commit | 6018a38286328d8177a7295cda2ffe618dc7ad2c (patch) | |
| tree | 650652d1f29d2ace6febbd3f0ab4cae0389db0d2 /build/org.eclipse.cdt.make.core | |
| parent | db47eeb81844785381c1c875eaa4385f80f99f49 (diff) | |
| download | org.eclipse.cdt-6018a38286328d8177a7295cda2ffe618dc7ad2c.tar.gz org.eclipse.cdt-6018a38286328d8177a7295cda2ffe618dc7ad2c.tar.xz org.eclipse.cdt-6018a38286328d8177a7295cda2ffe618dc7ad2c.zip | |
bug 226419: [Scanner Discovery] "Other toolchain" projects attempt scanner config discovery
Diffstat (limited to 'build/org.eclipse.cdt.make.core')
2 files changed, 8 insertions, 5 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathInitializer.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathInitializer.java index a640408c788..4b67a08bd57 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathInitializer.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathInitializer.java @@ -30,8 +30,12 @@ public class DiscoveredPathInitializer extends PathEntryContainerInitializer { public void initialize(IPath containerPath, ICProject cProject) throws CoreException { IProject project = cProject.getProject(); IScannerConfigBuilderInfo2 buildInfo = ScannerConfigProfileManager.createScannerConfigBuildInfo2(project); + String selectedProfileId = buildInfo.getSelectedProfileId(); + if (ScannerConfigProfileManager.NULL_PROFILE_ID.equals(selectedProfileId)) + return; + ScannerConfigScope profileScope = ScannerConfigProfileManager.getInstance(). - getSCProfileConfiguration(buildInfo.getSelectedProfileId()).getProfileScope(); + getSCProfileConfiguration(selectedProfileId).getProfileScope(); if (ScannerConfigScope.PROJECT_SCOPE.equals(profileScope)) { CoreModel.setPathEntryContainer(new ICProject[]{cProject}, new DiscoveredPathContainer(project), null); } diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfileManager.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfileManager.java index 8ccb4c7eee7..9f7036eb2fd 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfileManager.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigProfileManager.java @@ -35,8 +35,8 @@ import org.eclipse.core.runtime.Preferences; public final class ScannerConfigProfileManager { public static final String SI_PROFILE_SIMPLE_ID = "ScannerConfigurationDiscoveryProfile"; //$NON-NLS-1$ public static final String PER_PROJECT_PROFILE_ID = MakeCorePlugin.getUniqueIdentifier() + ".GCCStandardMakePerProjectProfile"; //$NON-NLS-1$ - public static final String DEFAULT_SI_PROFILE_ID = PER_PROJECT_PROFILE_ID; - public static final String NULL_PROFILE_ID = "";//$NON-NLS-1$ + public static final String NULL_PROFILE_ID = "";//$NON-NLS-1$ + public static final String DEFAULT_SI_PROFILE_ID = NULL_PROFILE_ID; private final Map<IProject, Map<InfoContext, Object>> projectToProfileInstanceMap; private List<String> profileIds; @@ -171,9 +171,8 @@ public final class ScannerConfigProfileManager { } /** - * returns the list of profile IDs supported for this context * @param context - * @return + * @return the list of profile IDs supported for this context */ public List<String> getProfileIds(InfoContext context){ if(context.isDefaultContext() || context.getProject() == null) |