summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Script/SConscript.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-06-08 13:22:57 (GMT)
committerSteven Knight <knight@baldmt.com>2003-06-08 13:22:57 (GMT)
commit4d7ed00302f2f872f9719125b4fcb048e4ecb7ef (patch)
tree4afaba4669ddae8c3ce9972f79471d8387930e87 /src/engine/SCons/Script/SConscript.py
parent8fc3c77d320fb435cb9268d31c34a58b18a58b54 (diff)
downloadSCons-4d7ed00302f2f872f9719125b4fcb048e4ecb7ef.zip
SCons-4d7ed00302f2f872f9719125b4fcb048e4ecb7ef.tar.gz
SCons-4d7ed00302f2f872f9719125b4fcb048e4ecb7ef.tar.bz2
Add MSVS Project file support. (Greg Spencer)
Diffstat (limited to 'src/engine/SCons/Script/SConscript.py')
-rw-r--r--src/engine/SCons/Script/SConscript.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index 5258d90..1e14658 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -112,11 +112,16 @@ def compute_exports(exports):
class Frame:
"""A frame on the SConstruct/SConscript call stack"""
- def __init__(self, exports):
+ def __init__(self, exports, sconscript):
self.globals = BuildDefaultGlobals()
self.retval = None
self.prev_dir = SCons.Node.FS.default_fs.getcwd()
self.exports = compute_exports(exports) # exports from the calling SConscript
+ # make sure the sconscript attr is a Node.
+ if isinstance(sconscript, SCons.Node.Node):
+ self.sconscript = sconscript
+ else:
+ self.sconscript = SCons.Node.FS.default_fs.File(str(sconscript))
# the SConstruct/SConscript call stack:
stack = []
@@ -215,7 +220,7 @@ def SConscript(*ls, **kw):
# evaluate each SConscript file
results = []
for fn in files:
- stack.append(Frame(exports))
+ stack.append(Frame(exports,fn))
old_sys_path = sys.path
try:
if fn == "-":