Skip to main content
summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDoug Schaefer2010-05-31 16:41:13 -0400
committerDoug Schaefer2010-05-31 16:41:13 -0400
commitb1ad4e2fb07848987b4e9fa25964cded69f12250 (patch)
treef7bcc274f79479796875f8fa2d5e2bdfdf73a16d /build
parentce9eb6b7d63d542321978c8e97292d6b9a3817f6 (diff)
downloadorg.eclipse.cdt-b1ad4e2fb07848987b4e9fa25964cded69f12250.tar.gz
org.eclipse.cdt-b1ad4e2fb07848987b4e9fa25964cded69f12250.tar.xz
org.eclipse.cdt-b1ad4e2fb07848987b4e9fa25964cded69f12250.zip
Bug 314015 Test fix for scanner discovery.
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java
index 356bc1ab26..43d667c66e 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/ScannerConfigBuilder.java
@@ -11,8 +11,8 @@
package org.eclipse.cdt.build.core.scannerconfig;
import java.util.Map;
-import java.util.Properties;
import java.util.Map.Entry;
+import java.util.Properties;
import org.eclipse.cdt.build.internal.core.scannerconfig.CfgDiscoveredPathManager;
import org.eclipse.cdt.build.internal.core.scannerconfig.jobs.CfgSCJobsUtil;
@@ -199,8 +199,9 @@ public class ScannerConfigBuilder extends ACBuilder {
// update and persist scanner configuration
CfgSCJobsUtil.updateScannerConfiguration(project, context, instance, buildInfo2, new SubProgressMonitor(monitor, 30));
- // this erroneously removes the infor right after it gets created... bad
- //CfgDiscoveredPathManager.getInstance().removeDiscoveredInfo(project, context, false);
+ // Remove the previous discovered path info to ensure it get's regenerated.
+ // TODO we should really only do this if the information has changed
+ CfgDiscoveredPathManager.getInstance().removeDiscoveredInfo(project, context, false);
if((flags & PERFORM_CORE_UPDATE) != 0)
CfgDiscoveredPathManager.getInstance().updateCoreSettings(project, new IConfiguration[]{cfg});

Back to the top