mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 11:55:40 +02:00
Code Issues Wiki Activity

some fixes to project description manager and build system to allow EFS hosted projects to function better

Browse source
This commit is contained in:
Chris Recoskie 2008-02-05 19:30:03 +00:00
parent 80485fce8a
commit 48c5584887
3 changed files with 12 additions and 9 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/AbstractGCCBOPConsoleParserUtility.java
View file

@ -89,7 +89,7 @@ public abstract class AbstractGCCBOPConsoleParserUtility {
protected void pushDirectory(IPath dir) {
if (dir != null) {
IPath pwd = null;
if (fBaseDirectory.isPrefixOf(dir)) {
if (fBaseDirectory != null && fBaseDirectory.isPrefixOf(dir)) {
pwd = dir.removeFirstSegments(fBaseDirectory.segmentCount());
} else {
// check if it is a cygpath

17
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
View file

@ -89,6 +89,7 @@ import org.eclipse.cdt.internal.core.model.CElementDelta;
import org.eclipse.cdt.internal.core.model.CModelManager;
import org.eclipse.cdt.internal.core.settings.model.CExternalSettinsDeltaCalculator.ExtSettingsDelta;
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileInfo;
import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@ -1963,13 +1964,15 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=96258
URI location = rscFile.getLocationURI();
if (location != null) {
File file = toLocalFile(location, null/*no progress monitor available*/);
if (file != null && file.exists()) {
try {
stream = new FileInputStream(file);
} catch (FileNotFoundException e) {
throw ExceptionFactory.createCoreException(e);
}
IFileStore file = EFS.getStore(location);
IFileInfo info = null;
if(file != null) {
info = file.fetchInfo();
}
if (info != null && info.exists()) {
stream = file.openInputStream(EFS.NONE, null);
}
}
}

2
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java
View file

@ -205,7 +205,7 @@ public class CdtMacroSupplier extends CoreMacroSupplierBase {
macro = new CdtVariable(macroName,ICdtVariable.VALUE_TEXT,project.getName());
} else if("ProjDirPath".equals(macroName)){ //$NON-NLS-1$
IProject project = getProject(cfg);
if(project != null)
if(project != null && project.getLocation() != null) // in the EFS world getLocation() can return null
macro = new CdtVariable(macroName,ICdtVariable.VALUE_TEXT,project.getLocation().toString());
}
/* else if("BuildArtifactFileName".equals(macroName)){ //$NON-NLS-1$