def SConscript(*ls, **kw):
files, exports = GetSConscriptFilenames(ls, kw)
+ default_fs = SCons.Node.FS.default_fs
+ top = default_fs.Top
+ sd = default_fs.SConstruct.rfile().dir
+
# evaluate each SConscript file
results = []
for fn in files:
if isinstance(fn, SCons.Node.Node):
f = fn
else:
- f = SCons.Node.FS.default_fs.File(str(fn))
+ f = default_fs.File(str(fn))
_file_ = None
- old_dir = SCons.Node.FS.default_fs.getcwd()
- SCons.Node.FS.default_fs.chdir(SCons.Node.FS.default_fs.Dir('#'),
- change_os_dir=1)
+ old_dir = default_fs.getcwd()
+
+ # Change directory to the top of the source
+ # tree to make sure the os's cwd and the cwd of
+ # SCons.Node.FS.default_fs match so we can open the
+ # SConscript.
+ default_fs.chdir(top, change_os_dir=1)
if f.rexists():
- # Change directory to top of source tree to make sure
- # the os's cwd and the cwd of SCons.Node.FS.default_fs
- # match so we can open the SConscript.
_file_ = open(f.rstr(), "r")
elif f.has_builder():
# The SConscript file apparently exists in a source
- # code management system. Build it, but then remove
+ # code management system. Build it, but then clear
# the builder so that it doesn't get built *again*
# during the actual build phase.
f.build()
if os.path.exists(s):
_file_ = open(s, "r")
if _file_:
- SCons.Node.FS.default_fs.chdir(f.dir,
- change_os_dir=sconscript_chdir)
- # prepend the SConscript directory to sys.path so
- # that Python modules in the SConscript directory can
- # be easily imported
+ # Chdir to the SConscript directory. Use a path
+ # name relative to the SConstruct file so that if
+ # we're using the -f option, we're essentially
+ # creating a parallel SConscript directory structure
+ # in our local directory tree.
+ #
+ # XXX This is broken for multiple-repository cases
+ # where the SConstruct and SConscript files might be
+ # in different Repositories. For now, cross that
+ # bridge when someone comes to it.
+ ldir = default_fs.Dir(f.dir.get_path(sd))
+ default_fs.chdir(ldir, change_os_dir=sconscript_chdir)
+
+ # Append the SConscript directory to the beginning
+ # of sys.path so Python modules in the SConscript
+ # directory can be easily imported.
sys.path = [ f.dir.abspath ] + sys.path
# This is the magic line that actually reads up and
finally:
sys.path = old_sys_path
frame = stack.pop()
- SCons.Node.FS.default_fs.chdir(frame.prev_dir)
+ default_fs.chdir(frame.prev_dir)
if old_dir:
- SCons.Node.FS.default_fs.chdir(old_dir,
- change_os_dir=sconscript_chdir)
+ default_fs.chdir(old_dir, change_os_dir=sconscript_chdir)
results.append(frame.retval)
--- /dev/null
+#!/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__"
+
+import os.path
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('work', 'repository', ['repository', 'src'])
+
+work_aaa = test.workpath('work', 'aaa')
+work_bbb = test.workpath('work', 'bbb')
+work_ccc = test.workpath('work', 'ccc')
+work_src_xxx = test.workpath('work', 'src', 'xxx')
+work_src_yyy = test.workpath('work', 'src', 'yyy')
+
+opts = "-f " + test.workpath('repository', 'SConstruct')
+
+test.write(['repository', 'SConstruct'], """\
+Repository(r'%s')
+def cat(env, source, target):
+ target = str(target[0])
+ source = map(str, source)
+ f = open(target, "wb")
+ for src in source:
+ f.write(open(src, "rb").read())
+ f.close()
+
+env = Environment(BUILDERS={'Build':Builder(action=cat)})
+env.Build('aaa.out', 'aaa.in')
+env.Build('bbb.out', 'bbb.in')
+env.Build('ccc.out', 'ccc.in')
+SConscript('src/SConscript', "env")
+""" % test.workpath('repository'))
+
+test.write(['repository', 'src', 'SConscript'], """
+Import("env")
+env.Build('xxx.out', 'xxx.in')
+env.Build('yyy.out', 'yyy.in')
+""")
+
+test.write(['repository', 'aaa.in'], "repository/aaa.in\n")
+test.write(['repository', 'bbb.in'], "repository/bbb.in\n")
+test.write(['repository', 'ccc.in'], "repository/ccc.in\n")
+
+test.write(['repository', 'src', 'xxx.in'], "repository/src/xxx.in\n")
+test.write(['repository', 'src', 'yyy.in'], "repository/src/yyy.in\n")
+
+#
+# Make the repository non-writable,
+# so we'll detect if we try to write into it accidentally.
+test.writable('repository', 0)
+
+#
+test.run(chdir = 'work', options = opts, arguments = 'aaa.out')
+
+test.fail_test(test.read(['work', 'aaa.out']) != "repository/aaa.in\n")
+test.fail_test(os.path.exists(test.workpath('work', 'bbb.out')))
+test.fail_test(os.path.exists(test.workpath('work', 'ccc.out')))
+test.fail_test(os.path.exists(test.workpath('work', 'src', 'xxx.out')))
+test.fail_test(os.path.exists(test.workpath('work', 'src', 'yyy.out')))
+
+test.run(chdir = 'work', options = opts, arguments = 'bbb.out src')
+
+test.fail_test(test.read(['work', 'bbb.out']) != "repository/bbb.in\n")
+test.fail_test(os.path.exists(test.workpath('work', 'ccc.out')))
+test.fail_test(test.read(['work', 'src', 'xxx.out']) != "repository/src/xxx.in\n")
+test.fail_test(test.read(['work', 'src', 'yyy.out']) != "repository/src/yyy.in\n")
+
+#
+test.run(chdir = 'work', options = opts, arguments = '.')
+
+test.fail_test(test.read(['work', 'ccc.out']) != "repository/ccc.in\n")
+
+#
+test.pass_test()
projects / scons.git / commitdiff