summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Oberhuber2011-08-18 11:42:02 (EDT)
committer Andrew Gvozdev2011-08-18 13:40:55 (EDT)
commit950f133f77d2f390e9a069015aa4c64e776a9d03 (patch)
treeacc89128093f05f04b414e8a1892ba09543b3b48
parent623b9132819c9dbd49484104ef5c78d409a48ec6 (diff)
downloadorg.eclipse.cdt-950f133f77d2f390e9a069015aa4c64e776a9d03.zip
org.eclipse.cdt-950f133f77d2f390e9a069015aa4c64e776a9d03.tar.gz
org.eclipse.cdt-950f133f77d2f390e9a069015aa4c64e776a9d03.tar.bz2
bug 345750: [Scanner Discovery] Per File Build output parser misses
includes with drive-relative paths when sources are behind a linked resource
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParserUtility.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParserUtility.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParserUtility.java
index a29caeb..2c33136 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParserUtility.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParserUtility.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,6 +10,7 @@
* Martin Oberhuber (Wind River Systems) - bug 155096
* Gerhard Schaber (Wind River Systems)
* Markus Schorn (Wind River Systems)
+ * Martin Oberhuber (Wind River) - bug 345750: discover drive-relative paths
*******************************************************************************/
package org.eclipse.cdt.make.internal.core.scannerconfig.gnu;
@@ -223,6 +224,14 @@ public class GCCPerFileBOPConsoleParserUtility extends AbstractGCCBOPConsolePars
* @return filePath : IPath - not <code>null</code>
*/
public IPath getAbsolutePath(String filePath) {
+ IPath p = getAbsolutePath2(filePath);
+ if (p.getDevice()==null) {
+ p = p.setDevice(getWorkingDirectory().getDevice());
+ }
+ return p;
+ }
+
+ private IPath getAbsolutePath2(String filePath) {
IPath pFilePath;
if (filePath.startsWith("/")) { //$NON-NLS-1$
return convertCygpath(new Path(filePath));