diff options
| author | Steven Knight <knight@baldmt.com> | 2005-12-28 04:36:08 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-12-28 04:36:08 (GMT) |
| commit | fda39509db065f7c935dd4442436dfa2f6bdc37e (patch) | |
| tree | b8a3e0f1a918898bd22d233ffdd1e20822c86c84 /src | |
| parent | b03e7ab4ca681e521249cfed7a727299c76378db (diff) | |
| download | SCons-fda39509db065f7c935dd4442436dfa2f6bdc37e.zip SCons-fda39509db065f7c935dd4442436dfa2f6bdc37e.tar.gz SCons-fda39509db065f7c935dd4442436dfa2f6bdc37e.tar.bz2 | |
Fix the use of Configure() contexts in nested subsidiary SConscript files. (Jon Rafkind)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 2 |
3 files changed, 8 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 # |