diff options
| author | Russel Winder <russel@winder.org.uk> | 2015-12-24 16:32:14 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2015-12-24 16:32:14 (GMT) |
| commit | 2a270c8f314e959c78e9deda29c8f250bb934dd6 (patch) | |
| tree | 7008e644357036404f0861c8ba1bbbf43b2b4123 /src/engine/SCons/Script/SConscript.xml | |
| parent | a7d764ed831fa3243aa0bd3307f641e1e1f9f8a8 (diff) | |
| parent | 9d558dd65deacc958edc1f0da2dab1ec56ff4e4e (diff) | |
| download | SCons-2a270c8f314e959c78e9deda29c8f250bb934dd6.zip SCons-2a270c8f314e959c78e9deda29c8f250bb934dd6.tar.gz SCons-2a270c8f314e959c78e9deda29c8f250bb934dd6.tar.bz2 | |
Post merge commit for safety. Building Fortran code works, but tests fail.
Diffstat (limited to 'src/engine/SCons/Script/SConscript.xml')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.xml | 16 |
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> |