diff options
author | Steven Knight <knight@baldmt.com> | 2003-06-09 10:14:17 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2003-06-09 10:14:17 (GMT) |
commit | 8b30616143d7c08df410885ccf7cff1cf599a659 (patch) | |
tree | 5f0af4c8a2467be8d39118e9881fe37d67e836a8 /doc/man/scons.1 | |
parent | 4d7ed00302f2f872f9719125b4fcb048e4ecb7ef (diff) | |
download | SCons-8b30616143d7c08df410885ccf7cff1cf599a659.zip SCons-8b30616143d7c08df410885ccf7cff1cf599a659.tar.gz SCons-8b30616143d7c08df410885ccf7cff1cf599a659.tar.bz2 |
Fix Options.Update().
Diffstat (limited to 'doc/man/scons.1')
-rw-r--r-- | doc/man/scons.1 | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/doc/man/scons.1 b/doc/man/scons.1 index 32546ed..054bbd1 100644 --- a/doc/man/scons.1 +++ b/doc/man/scons.1 @@ -3393,14 +3393,30 @@ command line or a text-based SConscript file through an Options object. To create an Options object, call the Options() function: .TP -.RI Options([ files ]) +.RI Options([ files "], [" args ]) This creates an Options object that will read construction variables from -the file or list of filenames given in the +the file or list of filenames specified in +.IR files . +If no files are specified, +or the .I files -argument. If no files are given, then no files will be read. Example: +argument is +.BR None , +then no files will be read. +The optional argument +.I args +is a dictionary of +values that will override anything read from the specified files; +it is primarily intended to be passed the +.B ARGUMENTS +dictionary that holds variables +specified on the command line. +Example: .ES opts = Options('custom.py') +opts = Options('overrides.py', ARGUMENTS) +opts = Options(None, {FOO:'expansion', BAR:7}) .EE Options objects have the following methods: @@ -3426,7 +3442,7 @@ opts.Add('CC', 'The C compiler') .EE .TP -.RI Update( env ) +.RI Update( env ", [" args ]) This updates a construction environment .I env with the customized construction variables. Normally this method is not |