summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Script
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2015-09-28 21:02:37 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2015-09-28 21:02:37 (GMT)
commit11addeb3aef797cce9414a51b4229da51f3780a1 (patch)
tree7b8573350bc25cd1b78f8b9f8f5f2b7a55692679 /src/engine/SCons/Script
parentb2b1d5d272bdcfe1f9dc7c4bc57b8c8927fe7784 (diff)
parent898fa44b70ce4998801db843dbe5b263f4d34a18 (diff)
downloadSCons-11addeb3aef797cce9414a51b4229da51f3780a1.zip
SCons-11addeb3aef797cce9414a51b4229da51f3780a1.tar.gz
SCons-11addeb3aef797cce9414a51b4229da51f3780a1.tar.bz2
merge
Diffstat (limited to 'src/engine/SCons/Script')
-rw-r--r--src/engine/SCons/Script/SConscript.xml16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/engine/SCons/Script/SConscript.xml b/src/engine/SCons/Script/SConscript.xml
index c74ad5e..8553fbe 100644
--- a/src/engine/SCons/Script/SConscript.xml
+++ b/src/engine/SCons/Script/SConscript.xml
@@ -240,7 +240,7 @@ file is found.
<scons_function name="Help">
<arguments>
-(text)
+(text, append=False)
</arguments>
<summary>
<para>
@@ -248,12 +248,18 @@ This specifies help text to be printed if the
<option>-h</option>
argument is given to
&scons;.
-If
+If
&f-Help;
-is called multiple times, the text is appended together in the order
-that
+is called multiple times, the text is appended together in the order that
&f-Help;
-is called.
+is called. With append set to False, any
+&f-Help;
+text generated with
+&f-AddOption;
+is clobbered. If append is True, the AddOption help is prepended to the help
+string, thus preserving the
+<option>-h</option>
+message.
</para>
</summary>
</scons_function>