From 470ce6cd41fee74a9c5706821991586b78fb5f12 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Thu, 20 Oct 2011 17:18:18 -0400 Subject: [PATCH] Fixed bug breaking JUnit test --- ...AbstractLanguageSettingsOutputScanner.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractLanguageSettingsOutputScanner.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractLanguageSettingsOutputScanner.java index 11b758a36e3..db838a754f4 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractLanguageSettingsOutputScanner.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractLanguageSettingsOutputScanner.java @@ -452,15 +452,18 @@ public abstract class AbstractLanguageSettingsOutputScanner extends LanguageSett } if (buildDirURI == null && currentCfgDescription != null) { - String builderCWD = currentCfgDescription.getBuildSetting().getBuilderCWD().toString(); - try { - // TODO - here is a hack to overcome ${workspace_loc:/prj-name} returned by builder - ICdtVariableManager vmanager = CCorePlugin.getDefault().getCdtVariableManager(); - builderCWD = vmanager.resolveValue(builderCWD, "", null, currentCfgDescription); - } catch (CdtVariableException e) { - MakeCorePlugin.log(e); + IPath pathBuilderCWD = currentCfgDescription.getBuildSetting().getBuilderCWD(); + if (pathBuilderCWD != null) { + String builderCWD = pathBuilderCWD.toString(); + try { + // TODO - here is a hack to overcome ${workspace_loc:/prj-name} returned by builder + ICdtVariableManager vmanager = CCorePlugin.getDefault().getCdtVariableManager(); + builderCWD = vmanager.resolveValue(builderCWD, "", null, currentCfgDescription); + } catch (CdtVariableException e) { + MakeCorePlugin.log(e); + } + buildDirURI = org.eclipse.core.filesystem.URIUtil.toURI(builderCWD); } - buildDirURI = org.eclipse.core.filesystem.URIUtil.toURI(builderCWD); } if (buildDirURI == null && currentProject != null) {