diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2011-09-10 11:25:54 +0200 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2011-09-10 11:25:54 +0200 |
| commit | f920539cfcaf32813d390bfa501a08ea8bf8ec89 (patch) | |
| tree | 1b8d1d57e9b38d43d01c28521c2e34aff743adb5 /doc/user/command-line.xml | |
| parent | f9b265b27769aff6cff204cea5402d69ead3dda0 (diff) | |
| parent | ba4425ab5227fd9597fccd368bffff6bf1032149 (diff) | |
Merge commit 'upstream/2.1.0'
Diffstat (limited to 'doc/user/command-line.xml')
| -rw-r--r-- | doc/user/command-line.xml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/doc/user/command-line.xml b/doc/user/command-line.xml index 8bc72bb..f06442e 100644 --- a/doc/user/command-line.xml +++ b/doc/user/command-line.xml @@ -1,6 +1,6 @@ <!-- - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation + Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -214,7 +214,10 @@ </para> - <programlisting></programlisting> + <programlisting> + if not GetOption('help'): + SConscript('src/SConscript', export='env') + </programlisting> <para> @@ -1252,7 +1255,7 @@ <screen> % <userinput>scons -Q COLOR=magenta foo.o</userinput> - scons: *** Invalid value for option COLOR: magenta + scons: *** Invalid value for option COLOR: magenta. Valid values are: ('red', 'green', 'blue') File "/home/my/project/SConstruct", line 5, in <module> </screen> @@ -1308,15 +1311,15 @@ <screen> % <userinput>scons -Q COLOR=Red foo.o</userinput> - scons: *** Invalid value for option COLOR: Red + scons: *** Invalid value for option COLOR: Red. Valid values are: ('red', 'green', 'blue') File "/home/my/project/SConstruct", line 5, in <module> % <userinput>scons -Q COLOR=BLUE foo.o</userinput> - scons: *** Invalid value for option COLOR: BLUE + scons: *** Invalid value for option COLOR: BLUE. Valid values are: ('red', 'green', 'blue') File "/home/my/project/SConstruct", line 5, in <module> % <userinput>scons -Q COLOR=nAvY foo.o</userinput> - scons: *** Invalid value for option COLOR: nAvY + scons: *** Invalid value for option COLOR: nAvY. Valid values are: ('red', 'green', 'blue') File "/home/my/project/SConstruct", line 5, in <module> </screen> @@ -2107,7 +2110,7 @@ Second, the contents of the &DEFAULT_TARGETS; list change - in response to calls to the &Default;: function, + in response to calls to the &Default; function, as you can see from the following &SConstruct; file: </para> |