Fix the use of Configure() contexts in nested subsidiary SConscript files. (Jon Rafkind)

4 files changed, 65 insertions, 3 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 44bff4a..6dcc38c 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -726,6 +726,11 @@ RELEASE 0.97 - XXX
   - Add a PathAccept validator to the list of new canned PathOption
     validators.
 
+  From Jon Rafkind:
+
+  - Fix the use of Configure() contexts from nested subsidiary
+    SConscript files.
+
   From Christoph Schulz:
 
   - Add support for $CONFIGUREDIR and $CONFIGURELOG variables to control
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index ef77355..f932d30 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -161,7 +161,7 @@ def _SConscript(fs, *files, **kw):
         call_stack.append(Frame(fs, exports, fn))
         old_sys_path = sys.path
         try:
-            SCons.Script.sconscript_reading = 1
+            SCons.Script.sconscript_reading = SCons.Script.sconscript_reading + 1
             if fn == "-":
                 exec sys.stdin in call_stack[-1].globals
             else:
@@ -229,7 +229,7 @@ def _SConscript(fs, *files, **kw):
                              "Ignoring missing SConscript '%s'" % f.path)
 
         finally:
-            SCons.Script.sconscript_reading = 0
+            SCons.Script.sconscript_reading = SCons.Script.sconscript_reading - 1
             sys.path = old_sys_path
             frame = call_stack.pop()
             try:
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index f8f46f7..97ffdce 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -245,7 +245,7 @@ def HelpFunction(text):
         help_text = help_text + text
 
 #
-# Will be set to 1 if we are reading a SConscript.
+# Will be non-zero if we are reading an SConscript file.
 sconscript_reading = 0
 
 #
diff --git a/test/Configure/from-SConscripts.py b/test/Configure/from-SConscripts.py
new file mode 100644
index 0000000..42cd3d2
--- /dev/null
+++ b/test/Configure/from-SConscripts.py
@@ -0,0 +1,57 @@
+#!/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__"
+
+"""
+Make sure we can call Configure() from subsidiary SConscript calls.
+
+This was broken at one point when we were using the internal
+sconscript_reading flag (which is basically a hint for whether or not
+we're in a Builder call) as a semaphore, not a counter.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """\
+env = SConscript('x.scons')
+""")
+
+test.write('x.scons', """\
+env = SConscript('y.scons')
+config = env.Configure()
+env = config.Finish()
+Return('env')
+""")
+
+test.write('y.scons', """\
+env = Environment()
+Return('env')
+""")
+
+test.run(arguments = '.')
+
+test.pass_test()