update example to simplify map_filename and relocate emitter to after that variable is set as it uses it

7 files changed, 17 insertions, 16 deletions

diff --git a/SCons/__init__.py b/SCons/__init__.py
index d169eef..e9e0684 100644
--- a/SCons/__init__.py
+++ b/SCons/__init__.py
@@ -1,9 +1,9 @@
-__version__="4.1.0.post1"
+__version__="4.1.1a"
 __copyright__="Copyright (c) 2001 - 2021 The SCons Foundation"
 __developer__="bdbaddog"
-__date__="2021-01-20 04:32:28"
+__date__="2021-02-26 22:38:25"
 __buildsys__="ProDog2020"
-__revision__="dc58c175da659d6c0bb3e049ba56fb42e77546cd"
-__build__="dc58c175da659d6c0bb3e049ba56fb42e77546cd"
+__revision__="3fa309f8fc5472fa067d7c04481fd0a5d3e86352"
+__build__="3fa309f8fc5472fa067d7c04481fd0a5d3e86352"
 # make sure compatibility is always in place
 import SCons.compat # noqa
\ No newline at end of file
diff --git a/doc/generated/examples/builderswriting_ex2_1.xml b/doc/generated/examples/builderswriting_ex2_1.xml
index 3391653..f19cb80 100644
--- a/doc/generated/examples/builderswriting_ex2_1.xml
+++ b/doc/generated/examples/builderswriting_ex2_1.xml
@@ -1,5 +1,5 @@
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
 AttributeError: 'SConsEnvironment' object has no attribute 'Program':
-  File "/home/my/project/SConstruct", line 4:
+  File "/home/my/project/SConstruct", line 7:
     env.Program('hello.c')
 </screen>
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index e215ac5..27c8771 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,8 +1,8 @@
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+cc -o f4.o -c f4.c
+cc -o f5.o -c f5.c
 cc -o f3.o -c f3.c
-cc -o f1.o -c f1.c
 cc -o f2.o -c f2.c
-cc -o f5.o -c f5.c
-cc -o f4.o -c f4.c
+cc -o f1.o -c f1.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index 6b90e1c..85556b1 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.xml
@@ -2,5 +2,5 @@
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/Users/bdbaddog/devel/scons/git/as_scons/scripts/scons.py", line 96, in &lt;module&gt;
+File "/Users/bdbaddog/devel/scons/git/scons-bugfixes-3/scripts/scons.py", line 96, in &lt;module&gt;
 </screen>
diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen
index 382315e..61b1fed 100644
--- a/doc/generated/functions.gen
+++ b/doc/generated/functions.gen
@@ -481,10 +481,10 @@ Example:
 </para>
 
 <example_commands>
-print 'before:',env['ENV']['INCLUDE']
+print('before:', env['ENV']['INCLUDE'])
 include_path = '/foo/bar:/foo'
 env.AppendENVPath('INCLUDE', include_path)
-print 'after:',env['ENV']['INCLUDE']
+print('after:', env['ENV']['INCLUDE'])
 
 yields:
 before: /foo:/biz
@@ -2973,10 +2973,10 @@ Example:
 </para>
 
 <example_commands>
-print 'before:',env['ENV']['INCLUDE']
+print('before:', env['ENV']['INCLUDE'])
 include_path = '/foo/bar:/foo'
 env.PrependENVPath('INCLUDE', include_path)
-print 'after:',env['ENV']['INCLUDE']
+print('after:', env['ENV']['INCLUDE'])
 </example_commands>
 
 <para>
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 1ac53fe..84ef3b1 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -1615,7 +1615,7 @@ Note that, by default,
 &scons;
 does
 <emphasis>not</emphasis>
-propagate the environment in force when you
+propagate the environment in effect when you
 execute
 &scons;
 to the commands used to build target files.
diff --git a/doc/user/builders-writing.xml b/doc/user/builders-writing.xml
index 6b32068..942bc35 100644
--- a/doc/user/builders-writing.xml
+++ b/doc/user/builders-writing.xml
@@ -864,12 +864,13 @@ cat
     <scons_example name="builders_adding_emitter">
 
       <file name="SConstruct" printme="1">
+env = Environment()
+map_filename = "${TARGET.name}.map"
+
 def map_emitter(target, source, env):
     target.append(map_filename)
     return target, source
 
-env = Environment()
-map_filename = "${TARGET.name}" + ".map"
 env.Append(LINKFLAGS="-Wl,-Map={},--cref".format(map_filename))
 env.Append(PROGEMITTER=map_emitter)
 env.Program('hello.c')