diff options
author | Dirk Baechle <dl9obn@darc.de> | 2012-01-10 20:49:24 (GMT) |
---|---|---|
committer | Dirk Baechle <dl9obn@darc.de> | 2012-01-10 20:49:24 (GMT) |
commit | f545565f60f55af38e36f93ee9d75386aa0cd5d8 (patch) | |
tree | 781f1c3bec1a0dc02b836d976f7b768935a2ecc5 /doc/user/command-line.xml | |
parent | 0dee7fcd44dad6209f6b9384a5b857f0c07e4267 (diff) | |
download | SCons-f545565f60f55af38e36f93ee9d75386aa0cd5d8.zip SCons-f545565f60f55af38e36f93ee9d75386aa0cd5d8.tar.gz SCons-f545565f60f55af38e36f93ee9d75386aa0cd5d8.tar.bz2 |
- fix for issue #2809, corrected documentation for command-line variables
Diffstat (limited to 'doc/user/command-line.xml')
-rw-r--r-- | doc/user/command-line.xml | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/doc/user/command-line.xml b/doc/user/command-line.xml index 1bb84e2..49edf8a 100644 --- a/doc/user/command-line.xml +++ b/doc/user/command-line.xml @@ -875,7 +875,7 @@ </para> <programlisting> - vars = Variables() + vars = Variables(None, ARGUMENTS) vars.Add('RELEASE', 'Set to 1 to build for release', 0) env = Environment(variables = vars, CPPDEFINES={'RELEASE_BUILD' : '${RELEASE}'}) @@ -885,8 +885,9 @@ <para> This &SConstruct; file first creates a &Variables; object - (the <literal>vars = Variables()</literal> call), - and then uses the object's &Add; + which uses the values from the command-line options dictionary &ARGUMENTS; + (the <literal>vars = Variables(None, ARGUMENTS)</literal> call). + It then uses the object's &Add; method to indicate that the &RELEASE; variable can be set on the command line, and that its default value will be <literal>0</literal> @@ -928,7 +929,7 @@ &PathOption;, &PackageOption; and &AddOptions;. These older names still work, and you may encounter them in older - &SConscript; fles, + &SConscript; files, but they have been officially deprecated as of &SCons; version 2.0. @@ -960,7 +961,7 @@ </para> <programlisting> - vars = Variables('custom.py') + vars = Variables(None, ARGUMENTS) vars.Add('RELEASE', 'Set to 1 to build for release', 0) env = Environment(variables = vars) Help(vars.GenerateHelpText(env)) @@ -1069,6 +1070,23 @@ cc -o foo foo.o bar.o </screen> + <para> + + Finally, you can combine both methods with: + + </para> + + <screen> + vars = Variables('custom.py', ARGUMENTS) + </screen> + + <para> + + where values in the option file &custom_py; get overwritten + by the ones specified on the command line. + + </para> + </section> <section> |