diff options
| author | William Deegan <bill@baddogconsulting.com> | 2015-09-28 17:57:12 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2015-09-28 17:57:12 (GMT) |
| commit | 936a25097bed77935a44c7397ad45121ea61be66 (patch) | |
| tree | b2f818b3c5bdae79f70b75f58347b691af431720 /src/engine/SCons/Script/__init__.py | |
| parent | 60ec8bc52b7c15a3f017a898b20644810609d185 (diff) | |
| parent | 7e15cea215477c4eb495be1e8459e7eacd02b235 (diff) | |
| download | SCons-936a25097bed77935a44c7397ad45121ea61be66.zip SCons-936a25097bed77935a44c7397ad45121ea61be66.tar.gz SCons-936a25097bed77935a44c7397ad45121ea61be66.tar.bz2 | |
Merged in billcroberts/scons (pull request #226)
Diffstat (limited to 'src/engine/SCons/Script/__init__.py')
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index 90b1fc3..4dcd055 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -41,6 +41,7 @@ start_time = time.time() import collections import os +import StringIO import sys # Special chicken-and-egg handling of the "--debug=memoizer" flag: @@ -107,6 +108,7 @@ QuestionTask = Main.QuestionTask #SConscriptSettableOptions = Main.SConscriptSettableOptions AddOption = Main.AddOption +PrintHelp = Main.PrintHelp GetOption = Main.GetOption SetOption = Main.SetOption Progress = Main.Progress @@ -258,10 +260,17 @@ def _Set_Default_Targets(env, tlist): # help_text = None -def HelpFunction(text): +def HelpFunction(text, append=False): global help_text - if SCons.Script.help_text is None: - SCons.Script.help_text = text + if help_text is None: + if append: + s = StringIO.StringIO() + PrintHelp(s) + help_text = s.getvalue() + s.close() + else: + help_text = "" + help_text = help_text + "\nLocal Build Variables:\n" + text else: help_text = help_text + text |