diff options
| author | Chris Recoskie | 2008-01-28 16:14:25 +0000 |
|---|---|---|
| committer | Chris Recoskie | 2008-01-28 16:14:25 +0000 |
| commit | adeb184f758f0daeab6256544cf55d27ce17ba80 (patch) | |
| tree | c7462d3e912fab4e2acfd27904ead05277643fad | |
| parent | c0af1ff0a0d1831e5e4ca45c16093840a551820f (diff) | |
| download | org.eclipse.cdt-adeb184f758f0daeab6256544cf55d27ce17ba80.tar.gz org.eclipse.cdt-adeb184f758f0daeab6256544cf55d27ce17ba80.tar.xz org.eclipse.cdt-adeb184f758f0daeab6256544cf55d27ce17ba80.zip | |
fixing scanner config for standard make... now resolves compiler root macro correctly
3 files changed, 11 insertions, 5 deletions
diff --git a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsRunSIProvider.java b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsRunSIProvider.java index 18e685e195e..343f5f56a24 100644 --- a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsRunSIProvider.java +++ b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/XlCSpecsRunSIProvider.java @@ -36,7 +36,7 @@ public class XlCSpecsRunSIProvider extends GCCSpecsRunSIProvider { if (rc) { try { - this.fCompileCommand = new Path(BuildMacroProvider.getDefault() + this.fCompileCommand = new Path(ManagedBuildManager.getBuildMacroProvider() .resolveValue( this.fCompileCommand.toString(), EMPTY_STRING, diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml index c6512f75346..f24a2d1e4e1 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml @@ -3165,7 +3165,7 @@ point="org.eclipse.core.variables.dynamicVariables"> <variable description="%variableDescription" - name="XL_compiler_root" + name="XL_compilerRoot" resolver="org.eclipse.cdt.managedbuilder.xlc.ui.variables.DynamicVariableResolver" supportsArgument="false"> </variable> diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/variables/DynamicVariableResolver.java b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/variables/DynamicVariableResolver.java index 4522d1ab623..2943c09fe97 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/variables/DynamicVariableResolver.java +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/variables/DynamicVariableResolver.java @@ -27,9 +27,15 @@ public class DynamicVariableResolver implements IDynamicVariableResolver { * @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable, java.lang.String) */ public String resolveValue(IDynamicVariable variable, String argument) - throws CoreException { - IPreferenceStore prefStore = XLCUIPlugin.getDefault().getPreferenceStore(); - return prefStore.getString(PreferenceConstants.P_XL_COMPILER_ROOT); + throws CoreException { + + if (variable.getName().equals((PreferenceConstants.P_XL_COMPILER_ROOT))) { + IPreferenceStore prefStore = XLCUIPlugin.getDefault() + .getPreferenceStore(); + return prefStore.getString(PreferenceConstants.P_XL_COMPILER_ROOT); + } + + return null; } } |