Delay any creation of DefaultEnvironment() until after the SConscript files are read.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@996 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 52a75ce5a0ffe69b717dce40bd22d0e6c2ebdabb..22d69c055f0ff7be9c2db03a898c276284909322 100644 (file)
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -188,10 +188,10 @@ def get_MkdirBuilder():
     global MkdirBuilder
     if MkdirBuilder is None:
         import SCons.Builder
-        import SCons.Defaults
-        env = SCons.Defaults.DefaultEnvironment()
+        # "env" will get filled in by Executor.get_build_env()
+        # calling SCons.Defaults.DefaultEnvironment() when necessary.
         MkdirBuilder = SCons.Builder.Builder(action = Mkdir,
-                                             env = env,
+                                             env = None,
                                              explain = None)
     return MkdirBuilder
 
@@ -257,18 +257,20 @@ def get_DefaultSCCSBuilder():
     global DefaultSCCSBuilder
     if DefaultSCCSBuilder is None:
         import SCons.Builder
-        import SCons.Defaults
+        # "env" will get filled in by Executor.get_build_env()
+        # calling SCons.Defaults.DefaultEnvironment() when necessary.
         DefaultSCCSBuilder = SCons.Builder.Builder(action = '$SCCSCOM',
-                                                   env = SCons.Defaults.DefaultEnvironment())
+                                                   env = None)
     return DefaultSCCSBuilder
 
 def get_DefaultRCSBuilder():
     global DefaultRCSBuilder
     if DefaultRCSBuilder is None:
         import SCons.Builder
-        import SCons.Defaults
+        # "env" will get filled in by Executor.get_build_env()
+        # calling SCons.Defaults.DefaultEnvironment() when necessary.
         DefaultRCSBuilder = SCons.Builder.Builder(action = '$RCS_COCOM',
-                                                  env = SCons.Defaults.DefaultEnvironment())
+                                                  env = None)
     return DefaultRCSBuilder
 
 #

diff --git a/test/ConstructionEnvironment.py b/test/ConstructionEnvironment.py
new file mode 100644 (file)
index 0000000..259a3ce
--- /dev/null
+++ b/test/ConstructionEnvironment.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Test that setting values in SCons.Defaults.ConstructionEnvironment
+will, in fact, affect the DefaultEnvironment() that's created.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+import SCons.Defaults
+SCons.Defaults.ConstructionEnvironment.update({
+        'XXX'   : 777,
+})
+print DefaultEnvironment()['XXX']
+""")
+
+expect = test.wrap_stdout(read_str = "777\n",
+                          build_str = "scons: `.' is up to date.\n")
+
+test.run(arguments = '.', stdout = expect)
+
+test.pass_test()