diff options
| author | Mats Wichmann <mats@linux.com> | 2019-02-08 16:45:15 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2019-02-08 16:54:40 (GMT) |
| commit | de01f7ea3cd258c893e1262800b96dd85ae89133 (patch) | |
| tree | 2fccbc839f100a05c36c8c6660071d733b89c8cf /doc | |
| parent | 9f090132091e56c123262106f3563142787c2fcf (diff) | |
| download | SCons-de01f7ea3cd258c893e1262800b96dd85ae89133.zip SCons-de01f7ea3cd258c893e1262800b96dd85ae89133.tar.gz SCons-de01f7ea3cd258c893e1262800b96dd85ae89133.tar.bz2 | |
Add textfile tool to defaults
PR #3242 added the Textfile and Substfile builders to the default builder
list (for issue #3147), but didn't finish the job: the textfile tool
needs to be added to the default list of tools as well. This time
with a testcase that fails if the tool is not added. Minor doc tweak.
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/generated/builders.gen | 4 | ||||
| -rw-r--r-- | doc/generated/functions.gen | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen index 6f03cd3..dc05443 100644 --- a/doc/generated/builders.gen +++ b/doc/generated/builders.gen @@ -2377,7 +2377,7 @@ and the result replaces the key. </para> <example_commands xmlns="http://www.scons.org/dbxsd/v1.0"> -env = Environment(tools = ['default', 'textfile']) +env = Environment(tools=['default']) env['prefix'] = '/usr/bin' script_dict = {'@prefix@': '/bin', '@exec_prefix@': '$prefix'} @@ -2404,7 +2404,7 @@ env.Substfile('bar.in', SUBST_DICT = good_bar) # the SUBST_DICT may be in common (and not an override) substutions = {} -subst = Environment(tools = ['textfile'], SUBST_DICT = substitutions) +subst = Environment(tools=['textfile'], SUBST_DICT=substitutions) substitutions['@foo@'] = 'foo' subst['SUBST_DICT']['@bar@'] = 'bar' subst.Substfile('pgm1.c', [Value('#include "@foo@.h"'), diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen index 617a0a4..9fc9d4b 100644 --- a/doc/generated/functions.gen +++ b/doc/generated/functions.gen @@ -1197,6 +1197,10 @@ Multiple calls to <function xmlns="http://www.scons.org/dbxsd/v1.0">Default</function> are legal, and add to the list of default targets. +As noted above, both forms of this call affect the +same global list of default targets; the +construction environment method applies +construction variable expansion to the targets. </para> <para xmlns="http://www.scons.org/dbxsd/v1.0"> |