- Set a "multi" on Aliases so multiple calls will append to an Alias.
+ - Fix emitter functions' use of path names when using BuildDir or
+ in subdirectories.
+
+ - Fix --implicit-cache causing redundant rebuilds when the header
+ file list changed.
+
From Zed Shaw:
- Add an Append() method to Environments, to append values to
pre = self.get_prefix(env, args)
suf = self.get_suffix(env, args)
- tlist = SCons.Node.arg2nodes(adjustixes(target,
- pre, suf),
- self.target_factory)
src_suf = self.get_src_suffix(env, args)
- slist = SCons.Node.arg2nodes(adjustixes(source,
- None,
- src_suf),
- self.source_factory)
if self.emitter:
+ # pass the targets and sources to the emitter as strings
+ # rather than nodes since str(node) doesn't work
+ # properly from any directory other than the top directory,
+ # and emitters are called "in" the SConscript directory:
+ tlist = adjustixes(target, pre, suf)
+ slist = adjustixes(source, None, src_suf)
+
emit_args = { 'target' : tlist,
'source' : slist,
'env' : env }
emit_args.update(args)
target, source = apply(self.emitter, (), emit_args)
- # Have to run it through again in case the
- # function returns non-Node targets/sources.
- tlist = SCons.Node.arg2nodes(adjustixes(target,
- pre, suf),
- self.target_factory)
- slist = SCons.Node.arg2nodes(adjustixes(source,
- None,
- src_suf),
- self.source_factory)
-
- return tlist, slist
+ tlist = SCons.Node.arg2nodes(adjustixes(target, pre, suf),
+ self.target_factory)
+ slist = SCons.Node.arg2nodes(adjustixes(source, None, src_suf),
+ self.source_factory)
+
+ return tlist, slist
def __call__(self, env, target = None, source = None, **kw):
tlist, slist = self._create_nodes(env, kw, target, source)
if calc.current(self, calc.bsig(self)):
return
else:
+ # one of this node's sources has changed, so
+ # we need to recalculate the implicit deps,
+ # and the bsig:
self.implicit = []
+ self.bsig = None
for child in self.children(scan=0):
self._add_child(self.implicit,
--- /dev/null
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# 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 TestSCons
+import os
+import os.path
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct',"""
+BuildDir('var1', 'src', duplicate=0)
+BuildDir('var2', 'src', duplicate=1)
+SConscript('src/SConscript')
+SConscript('var1/SConscript')
+SConscript('var2/SConscript')
+""")
+
+test.subdir('src')
+
+test.write('src/f.in', 'f.in')
+
+test.write('src/SConscript',"""
+def build(target, source, env):
+ for t in target:
+ open(str(t), "wt").write(str(t))
+
+def emitter(target, source, env):
+ target.append(str(target[0])+".foo")
+ return target,source
+
+b = Builder(name='foo', action=build, emitter=emitter)
+
+env=Environment(BUILDERS=[b])
+env.foo('f.out', 'f.in')
+""")
+
+test.run(arguments='.')
+
+test.fail_test(not os.path.exists(test.workpath('src', 'f.out')))
+test.fail_test(not os.path.exists(test.workpath('src', 'f.out.foo')))
+test.fail_test(not os.path.exists(test.workpath('var1', 'f.out')))
+test.fail_test(not os.path.exists(test.workpath('var1', 'f.out.foo')))
+test.fail_test(not os.path.exists(test.workpath('var2', 'f.out')))
+test.fail_test(not os.path.exists(test.workpath('var2', 'f.out.foo')))
+
+test.pass_test()
#define BAR_STRING "include/bar.h 1\n"
""")
+test.write(['include', 'baz.h'],
+r"""
+#define BAZ_STRING "include/baz.h 1\n"
+""")
+
test.write(['subdir', 'prog.c'],
r"""
#include <foo.h>
test.up_to_date(arguments = args)
+# Make sure that changing the order of includes causes rebuilds and
+# doesn't produce redundant rebuilds:
+test.write(['include', 'foo.h'],
+r"""
+#define FOO_STRING "include/foo.h 2\n"
+#include "bar.h"
+#include "baz.h"
+""")
+
+test.run(arguments = "--implicit-cache " + args)
+
+test.run(program = test.workpath(prog),
+ stdout = "subdir/prog.c\ninclude/foo.h 2\ninclude/bar.h 1\n")
+
+test.run(program = test.workpath(subdir_prog),
+ stdout = "subdir/prog.c\nsubdir/include/foo.h 1\nsubdir/include/bar.h 1\n")
+
+test.run(program = test.workpath(variant_prog),
+ stdout = "subdir/prog.c\ninclude/foo.h 2\ninclude/bar.h 1\n")
+
+test.up_to_date(arguments = args)
+
+test.write(['include', 'foo.h'],
+r"""
+#define FOO_STRING "include/foo.h 2\n"
+#include "baz.h"
+#include "bar.h"
+""")
+
+test.run(arguments = "--implicit-cache " + args)
+
+test.run(program = test.workpath(prog),
+ stdout = "subdir/prog.c\ninclude/foo.h 2\ninclude/bar.h 1\n")
+
+test.run(program = test.workpath(subdir_prog),
+ stdout = "subdir/prog.c\nsubdir/include/foo.h 1\nsubdir/include/bar.h 1\n")
+
+test.run(program = test.workpath(variant_prog),
+ stdout = "subdir/prog.c\ninclude/foo.h 2\ninclude/bar.h 1\n")
+
+test.up_to_date(arguments = args)
+
+
+
# Add inc2/foo.h that should shadow include/foo.h, but
# because of implicit dependency caching, scons doesn't
# detect this:
projects / scons.git / commitdiff