mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 09:16:02 +02:00
Code Issues Wiki Activity

patch from vlad

Browse source
This commit is contained in:
David Inglis 2004-04-22 13:07:10 +00:00
parent 0aa20e710b
commit 3b65eeb53f
2 changed files with 94 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

145
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/ScannerInfoCollector.java
View file

@ -165,6 +165,7 @@ public class ScannerInfoCollector {
/** /**
* Compare discovered include paths and symbol definitions with the ones from scanInfo. * Compare discovered include paths and symbol definitions with the ones from scanInfo.
*
* @param scanInfo * @param scanInfo
* @param projectName * @param projectName
* @return * @return
@ -172,65 +173,101 @@ public class ScannerInfoCollector {
private boolean scannerConfigNeedsUpdate(DiscoveredScannerInfo discScanInfo, String projectName) { private boolean scannerConfigNeedsUpdate(DiscoveredScannerInfo discScanInfo, String projectName) {
List includes = (List) discoveredIncludes.get(projectName); List includes = (List) discoveredIncludes.get(projectName);
List symbols = (List) discoveredSymbols.get(projectName); List symbols = (List) discoveredSymbols.get(projectName);
if (includes == null && symbols == null)
return false;
// Step 1. Add discovered scanner config to the existing discovered scanner config boolean addedIncludes = includePathsNeedUpdate(discScanInfo, projectName, includes);
// add the includes from the latest discovery boolean addedSymbols = definedSymbolsNeedUpdate(discScanInfo, projectName, symbols);
boolean addedIncludes = false;
List sumIncludes = (List) sumDiscoveredIncludes.get(projectName);
if (sumIncludes == null) {
sumIncludes = new ArrayList(includes);
sumDiscoveredIncludes.put(projectName, sumIncludes);
addedIncludes = true;
}
else {
for (Iterator i = includes.iterator(); i.hasNext(); ) {
String include = (String) i.next();
if (!sumIncludes.contains(include)) {
addedIncludes |= sumIncludes.add(include);
}
}
}
// try to translate cygpaths to absolute paths
List finalSumIncludes = translateIncludePaths(sumIncludes);
// add the symbols from the latest discovery
boolean addedSymbols = false;
Map sumSymbols = (Map) sumDiscoveredSymbols.get(projectName);
if (sumSymbols == null) {
sumSymbols = new LinkedHashMap();
sumDiscoveredSymbols.put(projectName, sumSymbols);
}
addedSymbols = ScannerConfigUtil.scAddSymbolsList2SymbolEntryMap(sumSymbols, symbols, false);
// Step 2. Get project's scanner config
LinkedHashMap persistedIncludes = discScanInfo.getDiscoveredIncludePaths();
LinkedHashMap persistedSymbols = discScanInfo.getDiscoveredSymbolDefinitions();
// Step 3. Merge scanner config from steps 1 and 2
for (Iterator i = finalSumIncludes.iterator(); i.hasNext(); ) {
String include = (String) i.next();
if (!persistedIncludes.containsKey(include)) {
persistedIncludes.put(include,
((new Path(include)).toFile().exists()) ? Boolean.FALSE : Boolean.TRUE);
addedIncludes |= true;
}
}
LinkedHashMap candidateSymbols = new LinkedHashMap(persistedSymbols);
addedSymbols |= ScannerConfigUtil.scAddSymbolEntryMap2SymbolEntryMap(candidateSymbols, sumSymbols);
// Step 4. Set resulting scanner config
discScanInfo.setDiscoveredIncludePaths(persistedIncludes);
discScanInfo.setDiscoveredSymbolDefinitions(candidateSymbols);
// invalidate discovered include paths and symbol definitions
discoveredIncludes.put(projectName, null);
discoveredSymbols.put(projectName, null);
return (addedIncludes | addedSymbols); return (addedIncludes | addedSymbols);
} }
/**
* Compare include paths with already discovered.
*
* @param discScanInfo
* @param projectName
* @param includes
* @return
*/
private boolean includePathsNeedUpdate(DiscoveredScannerInfo discScanInfo, String projectName, List includes) {
boolean addedIncludes = false;
if (includes != null) {
// Step 1. Add discovered scanner config to the existing discovered scanner config
// add the includes from the latest discovery
List sumIncludes = (List) sumDiscoveredIncludes.get(projectName);
if (sumIncludes == null) {
sumIncludes = new ArrayList(includes);
sumDiscoveredIncludes.put(projectName, sumIncludes);
addedIncludes = true;
}
else {
for (Iterator i = includes.iterator(); i.hasNext(); ) {
String include = (String) i.next();
if (!sumIncludes.contains(include)) {
addedIncludes |= sumIncludes.add(include);
}
}
}
// try to translate cygpaths to absolute paths
List finalSumIncludes = translateIncludePaths(sumIncludes);
// Step 2. Get project's scanner config
LinkedHashMap persistedIncludes = discScanInfo.getDiscoveredIncludePaths();
// Step 3. Merge scanner config from steps 1 and 2
for (Iterator i = finalSumIncludes.iterator(); i.hasNext(); ) {
String include = (String) i.next();
if (!persistedIncludes.containsKey(include)) {
persistedIncludes.put(include,
((new Path(include)).toFile().exists()) ? Boolean.FALSE : Boolean.TRUE);
addedIncludes |= true;
}
}
// Step 4. Set resulting scanner config
discScanInfo.setDiscoveredIncludePaths(persistedIncludes);
// Step 5. Invalidate discovered include paths and symbol definitions
discoveredIncludes.put(projectName, null);
}
return addedIncludes;
}
/**
* Compare symbol definitions with already discovered.
*
* @param discScanInfo
* @param projectName
* @param symbols
* @return
*/
private boolean definedSymbolsNeedUpdate(DiscoveredScannerInfo discScanInfo, String projectName, List symbols) {
boolean addedSymbols = false;
if (symbols != null) {
// Step 1. Add discovered scanner config to the existing discovered scanner config
// add the symbols from the latest discovery
Map sumSymbols = (Map) sumDiscoveredSymbols.get(projectName);
if (sumSymbols == null) {
sumSymbols = new LinkedHashMap();
sumDiscoveredSymbols.put(projectName, sumSymbols);
}
addedSymbols = ScannerConfigUtil.scAddSymbolsList2SymbolEntryMap(sumSymbols, symbols, false);
// Step 2. Get project's scanner config
LinkedHashMap persistedSymbols = discScanInfo.getDiscoveredSymbolDefinitions();
// Step 3. Merge scanner config from steps 1 and 2
LinkedHashMap candidateSymbols = new LinkedHashMap(persistedSymbols);
addedSymbols |= ScannerConfigUtil.scAddSymbolEntryMap2SymbolEntryMap(candidateSymbols, sumSymbols);
// Step 4. Set resulting scanner config
discScanInfo.setDiscoveredSymbolDefinitions(candidateSymbols);
// Step 5. Invalidate discovered include paths and symbol definitions
discoveredSymbols.put(projectName, null);
}
return addedSymbols;
}
/** /**
* @param sumIncludes * @param sumIncludes
* @return * @return

4
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/ScannerInfoConsoleParserFactory.java
View file

@ -84,7 +84,9 @@ public class ScannerInfoConsoleParserFactory {
// builder not installed or disabled // builder not installed or disabled
scBuildInfo = null; scBuildInfo = null;
} }
if (scBuildInfo != null && scBuildInfo.isMakeBuilderConsoleParserEnabled()) { if (scBuildInfo != null &&
scBuildInfo.isAutoDiscoveryEnabled() &&
scBuildInfo.isMakeBuilderConsoleParserEnabled()) {
// get the make builder console parser // get the make builder console parser
IScannerInfoConsoleParser clParser = MakeCorePlugin.getDefault(). IScannerInfoConsoleParser clParser = MakeCorePlugin.getDefault().
getScannerInfoConsoleParser(scBuildInfo.getMakeBuilderConsoleParserId()); getScannerInfoConsoleParser(scBuildInfo.getMakeBuilderConsoleParserId());