mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 20:05:35 +02:00
Code Issues Wiki Activity

Bug 156436 - added handling for cygpaths that may come back.

Browse source
This commit is contained in:
Doug Schaefer 2006-09-08 18:52:25 +00:00
parent d9919c2047
commit 909ada32f1
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ErrorParserManager.java
View file

@ -22,6 +22,7 @@ import java.util.Map;
import java.util.Vector; import java.util.Vector;
import org.eclipse.cdt.core.resources.ACBuilder; import org.eclipse.cdt.core.resources.ACBuilder;
import org.eclipse.cdt.utils.CygPath;
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.IResource; import org.eclipse.core.resources.IResource;
@ -31,6 +32,7 @@ import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
public class ErrorParserManager extends OutputStream { public class ErrorParserManager extends OutputStream {
@ -58,6 +60,10 @@ public class ErrorParserManager extends OutputStream {
private boolean hasErrors = false; private boolean hasErrors = false;
// Cygpath helpers
private CygPath cygpath;
private boolean cygpathInstalled = Platform.getOS().equals(Platform.OS_WIN32);
public ErrorParserManager(ACBuilder builder) { public ErrorParserManager(ACBuilder builder) {
this(builder.getProject(), builder); this(builder.getProject(), builder);
} }
@ -294,6 +300,26 @@ public class ErrorParserManager extends OutputStream {
} catch (Exception e) { } catch (Exception e) {
} }
// That didn't work, see if it is a cygpath
if (file == null && cygpathInstalled) {
try {
if (cygpath == null)
cygpath = new CygPath();
fp = new Path(cygpath.getFileName(filePath));
if (fBaseDirectory.isPrefixOf(fp)) {
int segments = fBaseDirectory.matchingFirstSegments(fp);
path = fp.removeFirstSegments(segments);
} else {
path = fp;
}
file = findFileInWorkspace(path);
} catch (IOException e) {
// cygpath must not be installed, don't try this again
cygpathInstalled = false;
} catch (Exception e) {
}
}
// We have to do another try, on Windows for cases like "TEST.C" vs "test.c" // We have to do another try, on Windows for cases like "TEST.C" vs "test.c"
// We use the java.io.File canonical path. // We use the java.io.File canonical path.
if (file == null || !file.exists()) { if (file == null || !file.exists()) {