mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-28 18:53:20 +02:00
Code Issues Wiki Activity

Bug 315187 Unknown tool option silently breaks ManagedBuild tool command line generation

Browse source
This commit is contained in:
James Blackburn 2010-06-01 14:00:33 +00:00
parent e09733c754
commit 12978a0406
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsPrefStore.java
View file

@ -151,20 +151,18 @@ public class ToolSettingsPrefStore implements IPreferenceStore {
else if((optCategory.getId() + COMMAND_LINE_SUFFIX).equals(name)) else if((optCategory.getId() + COMMAND_LINE_SUFFIX).equals(name))
return ((Tool)optCategory).getCommandLinePattern(); return ((Tool)optCategory).getCommandLinePattern();
else if(ALL_OPTIONS_ID.equals(name)){ else if(ALL_OPTIONS_ID.equals(name)){
try { SupplierBasedCdtVariableSubstitutor macroSubstitutor = new BuildfileMacroSubstitutor(null, EMPTY_STRING, " "); //$NON-NLS-1$
SupplierBasedCdtVariableSubstitutor macroSubstitutor = new BuildfileMacroSubstitutor(null, EMPTY_STRING, " "); //$NON-NLS-1$ Tool tool = (Tool)optCategory;
Tool tool = (Tool)optCategory; String[] flags = tool.getToolCommandFlags(
String[] flags = tool.getToolCommandFlags( null,
null, null,
null, macroSubstitutor,
macroSubstitutor, obtainMacroProvider());
obtainMacroProvider()); IManagedCommandLineGenerator cmdLGen = tool.getCommandLineGenerator();
IManagedCommandLineGenerator cmdLGen = tool.getCommandLineGenerator(); IManagedCommandLineInfo cmdLInfo = cmdLGen.generateCommandLineInfo(tool,
IManagedCommandLineInfo cmdLInfo = cmdLGen.generateCommandLineInfo(tool, EMPTY_STRING, flags, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING,
EMPTY_STRING, flags, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, null,tool.getCommandLinePattern());
null,tool.getCommandLinePattern()); return cmdLInfo.getFlags();
return cmdLInfo.getFlags();
} catch (BuildException e) {}
} }
} else { } else {
Object val = getOptionValue(name); Object val = getOptionValue(name);