mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Bug 423342 - MinGW builds fail with custom EFS

Browse source 
Signed-off-by: Piotr Aniola <piotr.aniola@pl.ibm.com>
Change-Id: I9aafac7355350d076a197159c8ba4f4d05812eeb
Reviewed-on: https://git.eclipse.org/r/19442
Tested-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
This commit is contained in:
Piotr Aniola 2013-12-06 17:19:27 +01:00 • committed by Marc-Andre Laperle
parent 79c6c7d775
commit 13ed63ea3a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2006, 2011 Intel Corporation and others. * Copyright (c) 2006, 2015 Intel 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
@ -68,6 +68,7 @@ import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGeneratorType;
import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyInfo; import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyInfo;
import org.eclipse.cdt.managedbuilder.pdomdepgen.PDOMDependencyGenerator; import org.eclipse.cdt.managedbuilder.pdomdepgen.PDOMDependencyGenerator;
import org.eclipse.cdt.utils.EFSExtensionManager; import org.eclipse.cdt.utils.EFSExtensionManager;
import org.eclipse.cdt.utils.UNCPathConverter;
import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.filesystem.URIUtil; import org.eclipse.core.filesystem.URIUtil;
@ -987,7 +988,8 @@ public class BuildDescription implements IBuildDescription {
} }
private IPath getProjectLocation() { private IPath getProjectLocation() {
return new Path(fProject.getLocationURI().getPath()); URI uri = fProject.getLocationURI();
return UNCPathConverter.toPath(uri);
} }
private BuildResource[] addOutputs(IPath paths[], BuildIOType buildArg, IPath outDirPath){ private BuildResource[] addOutputs(IPath paths[], BuildIOType buildArg, IPath outDirPath){
@ -997,7 +999,7 @@ public class BuildDescription implements IBuildDescription {
IPath outFullPath = path; IPath outFullPath = path;
IPath outWorkspacePath = path; IPath outWorkspacePath = path;
IPath outProjPath; IPath outProjPath;
IPath projLocation = new Path(fProject.getLocationURI().getPath()); IPath projLocation = getProjectLocation();
if(outFullPath.isAbsolute()){ if(outFullPath.isAbsolute()){
outProjPath = outFullPath; outProjPath = outFullPath;