Skip to main content
summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorJames Blackburn2010-06-01 10:00:33 -0400
committerJames Blackburn2010-06-01 10:00:33 -0400
commit12978a0406692c0dcaf1285901eb1d460e8cff30 (patch)
tree9597530d83ba3f6da3e87aaa7a9683e6405cddba /build
parente09733c7548975de21cc84959db64be548015810 (diff)
downloadorg.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')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java26
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 c4541df01f..d9e17f1d7d 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);

Back to the top