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

Bug 397469 - Fix problem with scanner discovery on relative source

Browse 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>
This commit is contained in:
Doug Schaefer 2013-01-04 13:47:51 -05:00
parent 1285875212
commit f0f4c6e022
2 changed files with 3 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/gnu/ScannerInfoConsoleParserUtility.java
View file

@ -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$

3
core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/EFSExtensionProvider.java
View file

@ -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();
}
/**