sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SCons: Separately label the global non-sticky options.

Browse source 
The global sticky options were being printed with a heading, and then the
global nonsticky options were being printed immediately after them without a
heading. Because the two lists ran together and the first had its own heading,
it looked like -all- those options where sticky even though some of them
aren't. This change adds a label to the second list so it's clear they're
different.
This commit is contained in:
Gabe Black 2011-03-01 03:00:42 -08:00
parent 993e83ef80
commit 9e608a6ad7
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
SConstruct
View file

@ -338,20 +338,23 @@ global_nonsticky_vars.AddVariables(
('update_ref', 'Update test reference outputs', False) ('update_ref', 'Update test reference outputs', False)
) )
# Update main environment with values from ARGUMENTS & global_sticky_vars_file
global_sticky_vars.Update(main)
global_nonsticky_vars.Update(main)
global_help_texts = {
"global_sticky" : global_sticky_vars.GenerateHelpText(main),
"global_nonsticky" : global_nonsticky_vars.GenerateHelpText(main)
}
# base help text # base help text
help_text = ''' help_text = '''
Usage: scons [scons options] [build options] [target(s)] Usage: scons [scons options] [build options] [target(s)]
Global sticky options: Global sticky options:
''' %(global_sticky)s
Global nonsticky options:
# Update main environment with values from ARGUMENTS & global_sticky_vars_file %(global_nonsticky)s
global_sticky_vars.Update(main) ''' % global_help_texts
global_nonsticky_vars.Update(main)
help_text += global_sticky_vars.GenerateHelpText(main)
help_text += global_nonsticky_vars.GenerateHelpText(main)
# Save sticky variable settings back to current variables file # Save sticky variable settings back to current variables file
global_sticky_vars.Save(global_sticky_vars_file, main) global_sticky_vars.Save(global_sticky_vars_file, main)