mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00
Code Issues Wiki Activity

Bug 313503 Shouldn't pass empty "" arguments to tool options as it results in subsequent arguments being eaten

Browse source
This commit is contained in:
James Blackburn 2010-05-19 12:22:46 +00:00
parent 37f471698a
commit 2900e91389
1 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
View file

@ -2577,10 +2577,12 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
case IOption.STRING_LIST :
case IOption.INCLUDE_FILES :
case IOption.INCLUDE_PATH :
case IOption.LIBRARY_PATHS :
case IOption.LIBRARY_FILES :
case IOption.MACRO_FILES :
case IOption.UNDEF_INCLUDE_FILES :
case IOption.UNDEF_INCLUDE_PATH :
case IOption.UNDEF_LIBRARY_PATHS :
case IOption.UNDEF_LIBRARY_FILES :
case IOption.UNDEF_MACRO_FILES : {
@ -2592,32 +2594,14 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
String[] list = CdtVariableResolver.resolveStringListValues(option.getBasicStringListValue(), macroSubstitutor, true);
if(list != null){
for (String temp : list) {
if(temp.length() > 0)
if(temp.length() > 0 && !temp.equals(EMPTY_QUOTED_STRING))
sb.append( evaluateCommand( listCmd, temp ) + WHITE_SPACE );
}
}
}
}
break;
case IOption.INCLUDE_PATH :
case IOption.UNDEF_INCLUDE_PATH :{
String incCmd = option.getCommand();
IMacroContextInfo info = provider.getMacroContextInfo(IBuildMacroProvider.CONTEXT_FILE,
new FileContextData(inputFileLocation, outputFileLocation, option, this));
if(info != null) {
macroSubstitutor.setMacroContextInfo(info);
String[] paths = CdtVariableResolver.resolveStringListValues(option.getBasicStringListValue(), macroSubstitutor, true);
if(paths != null){
for (String temp : paths) {
if(temp.length() > 0 && !temp.equals(EMPTY_QUOTED_STRING))
sb.append( evaluateCommand( incCmd, temp ) + WHITE_SPACE);
}
}
}
}
break;
case IOption.PREPROCESSOR_SYMBOLS :
case IOption.UNDEF_PREPROCESSOR_SYMBOLS :{
String defCmd = option.getCommand();