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

Fix for 202093 by Gerhard Schaber, per file scanner discovery ignores linked folders.

Browse source
This commit is contained in:
Markus Schorn 2007-09-04 08:23:33 +00:00
parent f73314ecbe
commit fc2132103b
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParser.java
View file

@ -26,6 +26,8 @@ import org.eclipse.cdt.make.internal.core.scannerconfig.util.CCommandDSC;
import org.eclipse.cdt.make.internal.core.scannerconfig.util.TraceUtil; import org.eclipse.cdt.make.internal.core.scannerconfig.util.TraceUtil;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
@ -117,7 +119,21 @@ public class GCCPerFileBOPConsoleParser extends AbstractGCCBOPConsoleParser {
CCommandDSC cmd = fUtil.getNewCCommandDSC(tokens, compilerInvocationIndex, extensionsIndex > 0); CCommandDSC cmd = fUtil.getNewCCommandDSC(tokens, compilerInvocationIndex, extensionsIndex > 0);
IPath baseDirectory = fUtil.getBaseDirectory(); IPath baseDirectory = fUtil.getBaseDirectory();
if (baseDirectory.isPrefixOf(pFilePath)) { boolean isValidPath = baseDirectory.isPrefixOf(pFilePath);
if (!isValidPath) {
IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
IFile[] foundOccurrences = wsRoot.findFilesForLocation(pFilePath);
if (foundOccurrences != null) {
for (int j=0; j<foundOccurrences.length; j++) {
IProject foundProject = foundOccurrences[j].getProject();
if (foundProject != null && foundProject.getLocation().equals(baseDirectory)) {
isValidPath = true;
break;
}
}
}
}
if (isValidPath) {
List cmdList = new ArrayList(); List cmdList = new ArrayList();
cmdList.add(cmd); cmdList.add(cmd);
Map sc = new HashMap(1); Map sc = new HashMap(1);