diff options
| author | James Blackburn | 2010-06-01 14:00:33 +0000 |
|---|---|---|
| committer | James Blackburn | 2010-06-01 14:00:33 +0000 |
| commit | 12978a0406692c0dcaf1285901eb1d460e8cff30 (patch) | |
| tree | 9597530d83ba3f6da3e87aaa7a9683e6405cddba /build/org.eclipse.cdt.managedbuilder.ui | |
| parent | e09733c7548975de21cc84959db64be548015810 (diff) | |
| download | org.eclipse.cdt-12978a0406692c0dcaf1285901eb1d460e8cff30.tar.gz org.eclipse.cdt-12978a0406692c0dcaf1285901eb1d460e8cff30.tar.xz org.eclipse.cdt-12978a0406692c0dcaf1285901eb1d460e8cff30.zip | |
Bug 315187 Unknown tool option silently breaks ManagedBuild tool command line generation
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.ui')
| -rw-r--r-- | build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java index c4541df01f1..d9e17f1d7de 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java @@ -151,20 +151,18 @@ public class ToolSettingsPrefStore implements IPreferenceStore { else if((optCategory.getId() + COMMAND_LINE_SUFFIX).equals(name)) return ((Tool)optCategory).getCommandLinePattern(); else if(ALL_OPTIONS_ID.equals(name)){ - try { - SupplierBasedCdtVariableSubstitutor macroSubstitutor = new BuildfileMacroSubstitutor(null, EMPTY_STRING, " "); //$NON-NLS-1$ - Tool tool = (Tool)optCategory; - String[] flags = tool.getToolCommandFlags( - null, - null, - macroSubstitutor, - obtainMacroProvider()); - IManagedCommandLineGenerator cmdLGen = tool.getCommandLineGenerator(); - IManagedCommandLineInfo cmdLInfo = cmdLGen.generateCommandLineInfo(tool, - EMPTY_STRING, flags, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, - null,tool.getCommandLinePattern()); - return cmdLInfo.getFlags(); - } catch (BuildException e) {} + SupplierBasedCdtVariableSubstitutor macroSubstitutor = new BuildfileMacroSubstitutor(null, EMPTY_STRING, " "); //$NON-NLS-1$ + Tool tool = (Tool)optCategory; + String[] flags = tool.getToolCommandFlags( + null, + null, + macroSubstitutor, + obtainMacroProvider()); + IManagedCommandLineGenerator cmdLGen = tool.getCommandLineGenerator(); + IManagedCommandLineInfo cmdLInfo = cmdLGen.generateCommandLineInfo(tool, + EMPTY_STRING, flags, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, + null,tool.getCommandLinePattern()); + return cmdLInfo.getFlags(); } } else { Object val = getOptionValue(name); |