mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Re-fix for PR 102058: Per file discovery + Extended Scanner Info + C Project does not work

Browse source 
Fixing per project scanner config discovery too.
This commit is contained in:
Vladimir Hirsl 2005-06-29 15:46:44 +00:00
parent 05422c38fe
commit b6a787a64a
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathManager.java
View file

@ -125,7 +125,7 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
* @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager#updateDiscoveredInfo(org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo, java.util.List)
*/
public void updateDiscoveredInfo(IDiscoveredPathInfo info, List changedResources) throws CoreException {
if (fDiscoveredMap.get(info.getProject()) != info) {
if (fDiscoveredMap.get(info.getProject()) != null) {
IDiscoveredScannerInfoSerializable serializable = info.getSerializable();
if (serializable != null) {
IProject project = info.getProject();

6
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/PerFileSICollector.java
View file

@ -417,8 +417,12 @@ public class PerFileSICollector implements IScannerInfoCollector2, IScannerInfoC
// update scanner configuration
// MakeCorePlugin.getDefault().getDiscoveryManager().
// updateDiscoveredInfo(createPathInfoObject(), siChangedForFileList);
IDiscoveredPathInfo pathInfo = MakeCorePlugin.getDefault().getDiscoveryManager().getDiscoveredInfo(project);
if (!(pathInfo instanceof IPerFileDiscoveredPathInfo)) {
pathInfo = createPathInfoObject();
}
MakeCorePlugin.getDefault().getDiscoveryManager().
updateDiscoveredInfo(createPathInfoObject(), new ArrayList(siChangedForFileMap.keySet()));
updateDiscoveredInfo(pathInfo, new ArrayList(siChangedForFileMap.keySet()));
monitor.worked(50);
} catch (CoreException e) {
MakeCorePlugin.log(e);