changeset cf1afc88070f in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=cf1afc88070f
description:
SCons: Separately label the global non-sticky options.
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.
diffstat:
SConstruct | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diffs (35 lines):
diff -r 265202bbac87 -r cf1afc88070f SConstruct
--- a/SConstruct Tue Mar 01 02:59:09 2011 -0800
+++ b/SConstruct Tue Mar 01 03:00:42 2011 -0800
@@ -338,20 +338,23 @@
('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
help_text = '''
Usage: scons [scons options] [build options] [target(s)]
Global sticky options:
-'''
-
-# Update main environment with values from ARGUMENTS & global_sticky_vars_file
-global_sticky_vars.Update(main)
-global_nonsticky_vars.Update(main)
-
-help_text += global_sticky_vars.GenerateHelpText(main)
-help_text += global_nonsticky_vars.GenerateHelpText(main)
+%(global_sticky)s
+Global nonsticky options:
+%(global_nonsticky)s
+''' % global_help_texts
# Save sticky variable settings back to current variables file
global_sticky_vars.Save(global_sticky_vars_file, main)
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
