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 handling of cygdrive in scanner discovery

Browse source
This commit is contained in:
Markus Schorn 2006-11-06 13:16:26 +00:00
parent 02e693474e
commit d5e1e3f2ea
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParserUtility.java
View file

@ -93,26 +93,25 @@ public abstract class AbstractGCCBOPConsoleParserUtility {
pwd = dir.removeFirstSegments(fBaseDirectory.segmentCount()); pwd = dir.removeFirstSegments(fBaseDirectory.segmentCount());
} else { } else {
// check if it is a cygpath // check if it is a cygpath
if (dir.toString().startsWith("/cygdrive/")) { //$NON-NLS-1$ pwd= convertCygpath(dir);
char driveLetter = dir.toString().charAt(10);
driveLetter = (Character.isLowerCase(driveLetter)) ? Character.toUpperCase(driveLetter) : driveLetter;
StringBuffer buf = new StringBuffer();
buf.append(driveLetter);
buf.append(':');
String drive = buf.toString();
pwd = dir.removeFirstSegments(2);
pwd = pwd.setDevice(drive);
pwd = pwd.makeAbsolute();
}
else {
pwd = dir;
}
} }
fDirectoryStack.addElement(pwd); fDirectoryStack.addElement(pwd);
} }
} }
protected IPath popDirectory() { protected IPath convertCygpath(IPath path) {
if (path.segmentCount() > 1 && path.segment(0).equals("cygdrive")) { //$NON-NLS-1$
StringBuffer buf = new StringBuffer(2);
buf.append(Character.toUpperCase(path.segment(1).charAt(0)));
buf.append(':');
path = path.removeFirstSegments(2);
path = path.setDevice(buf.toString());
path = path.makeAbsolute();
}
return path;
}
protected IPath popDirectory() {
int i = getDirectoryLevel(); int i = getDirectoryLevel();
if (i != 0) { if (i != 0) {
IPath dir = (IPath) fDirectoryStack.lastElement(); IPath dir = (IPath) fDirectoryStack.lastElement();

5
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParserUtility.java
View file

@ -175,7 +175,10 @@ public class GCCPerFileBOPConsoleParserUtility extends AbstractGCCBOPConsolePars
*/ */
IPath getAbsolutePath(String filePath) { IPath getAbsolutePath(String filePath) {
IPath pFilePath; IPath pFilePath;
if (filePath.startsWith("/") || filePath.startsWith("\\") || //$NON-NLS-1$ //$NON-NLS-2$ if (filePath.startsWith("/")) { //$NON-NLS-1$
return convertCygpath(new Path(filePath));
}
else if (filePath.startsWith("\\") || //$NON-NLS-1$
(!filePath.startsWith(".") && //$NON-NLS-1$ (!filePath.startsWith(".") && //$NON-NLS-1$
filePath.length() > 2 && filePath.charAt(1) == ':' && filePath.length() > 2 && filePath.charAt(1) == ':' &&
(filePath.charAt(2) == '\\' || filePath.charAt(2) == '/'))) { (filePath.charAt(2) == '\\' || filePath.charAt(2) == '/'))) {