mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
bug 345750: [Scanner Discovery] Per File Build output parser misses
includes with drive-relative paths when sources are behind a linked resource
This commit is contained in:
parent
623b913281
commit
950f133f77
1 changed files with 10 additions and 1 deletions
|
@ -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
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
@ -10,6 +10,7 @@
|
||||||
* Martin Oberhuber (Wind River Systems) - bug 155096
|
* Martin Oberhuber (Wind River Systems) - bug 155096
|
||||||
* Gerhard Schaber (Wind River Systems)
|
* Gerhard Schaber (Wind River Systems)
|
||||||
* Markus Schorn (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;
|
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>
|
* @return filePath : IPath - not <code>null</code>
|
||||||
*/
|
*/
|
||||||
public IPath getAbsolutePath(String filePath) {
|
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;
|
IPath pFilePath;
|
||||||
if (filePath.startsWith("/")) { //$NON-NLS-1$
|
if (filePath.startsWith("/")) { //$NON-NLS-1$
|
||||||
return convertCygpath(new Path(filePath));
|
return convertCygpath(new Path(filePath));
|
||||||
|
|
Loading…
Add table
Reference in a new issue