diff options
| author | Doug Schaefer | 2013-01-04 18:47:51 +0000 |
|---|---|---|
| committer | Doug Schaefer | 2013-01-04 19:57:25 +0000 |
| commit | f0f4c6e022df2a9de74bf8ea8b616e828b96507f (patch) | |
| tree | 3166e97d3dace98f6525ddb59d1b8857b97c184d | |
| parent | 12858752126802336a6f790393795da5bf578773 (diff) | |
| download | org.eclipse.cdt-f0f4c6e022df2a9de74bf8ea8b616e828b96507f.tar.gz org.eclipse.cdt-f0f4c6e022df2a9de74bf8ea8b616e828b96507f.tar.xz org.eclipse.cdt-f0f4c6e022df2a9de74bf8ea8b616e828b96507f.zip | |
Bug 397469 - Fix problem with scanner discovery on relative source
paths.
Change-Id: Ic8630565de6d0481c3ebc1a92f3841460e8f17d1
Reviewed-on: https://git.eclipse.org/r/9462
Reviewed-by: Doug Schaefer <dschaefer@qnx.com>
IP-Clean: Doug Schaefer <dschaefer@qnx.com>
Tested-by: Doug Schaefer <dschaefer@qnx.com>
2 files changed, 3 insertions, 2 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/ScannerInfoConsoleParserUtility.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/ScannerInfoConsoleParserUtility.java index 1ff5e0f1e53..af58dd60d6a 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/ScannerInfoConsoleParserUtility.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/ScannerInfoConsoleParserUtility.java @@ -221,7 +221,7 @@ public class ScannerInfoConsoleParserUtility extends AbstractGCCBOPConsoleParser // appending fileName to cwd should yield file path filePath = cwd.append(fileName); } - if (!filePath.toString().equalsIgnoreCase(EFSExtensionManager.getDefault().getPathFromURI(file.getLocationURI()))) { + if (!filePath.toOSString().equalsIgnoreCase(EFSExtensionManager.getDefault().getPathFromURI(file.getLocationURI()))) { // must be the cwd is wrong // check if file name starts with ".." if (fileName.startsWith("..")) { //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/EFSExtensionProvider.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/EFSExtensionProvider.java index 10053b70211..7e8712bfe2f 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/EFSExtensionProvider.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/EFSExtensionProvider.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.core; +import java.io.File; import java.net.URI; import java.net.URISyntaxException; @@ -54,7 +55,7 @@ public abstract class EFSExtensionProvider { * physical file. */ public String getPathFromURI(URI locationURI) { - return locationURI.getPath(); + return new File(locationURI).getAbsolutePath(); } /** |