Put auto-deduced target names in the same directory as the source file.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@446 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 1b74766eeebdcdd5cf563f1cb5c554f86c636262..7eaf87fa8ec5d6d9e298a56a4759acc1da2373b4 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -19,6 +19,9 @@ RELEASE 0.09 -
 
  - Add Repository() functionality.
 
+ - Fix auto-deduction of target names so that deduced targets end
+   up in the same subdirectory as the source.
+
  From Anthony Roach:
 
  - Fixed use of command lines with spaces in their arguments,

diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index c1e93c211960a7b8add653e65061a3803a402596..9edd12187d3eeed1abf4b7b316eb1dc7e58ae073 100644 (file)
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -283,27 +283,27 @@ class BuilderBase:
         pre = self.get_prefix(env)
         suf = self.get_suffix(env)
         src_suf = self.get_src_suffix(env)
+
+        source = adjustixes(source, None, src_suf)
+        if target is None:
+            target = map(lambda x, s=suf: os.path.splitext(x)[0] + s,
+                         source)
+        else:
+            target = adjustixes(target, pre, suf)
+
         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,
+            emit_args = { 'target' : target,
+                          'source' : source,
                           'env' : env }
             emit_args.update(args)
             target, source = apply(self.emitter, (), emit_args)
 
-        slist = SCons.Node.arg2nodes(adjustixes(source, None, src_suf),
-                                     self.source_factory)
-        if target is None:
-            target = map(lambda x, s=suf: os.path.splitext(str(x))[0] + s,
-                         slist)
-        tlist = SCons.Node.arg2nodes(adjustixes(target, pre, suf),
-                                     self.target_factory)
+        slist = SCons.Node.arg2nodes(source, self.source_factory)
+        tlist = SCons.Node.arg2nodes(target, self.target_factory)
 
         return tlist, slist
 

diff --git a/test/no-target.py b/test/no-target.py
new file mode 100644 (file)
index 0000000..7aa56c4
--- /dev/null
+++ b/test/no-target.py
@@ -0,0 +1,64 @@
+#!/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 os.path
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('subdir')
+
+subdir_SConscript = os.path.join('subdir', 'SConscript')
+
+test.write('SConstruct', r"""
+SConscript(r'%s')
+""" % subdir_SConscript)
+
+test.write(subdir_SConscript, r"""
+def cat(env, source, target):
+    target = str(target[0])
+    source = map(str, source)
+    print 'cat(%s) > %s' % (source, target)
+    f = open(target, "wb")
+    for src in source:
+        f.write(open(src, "rb").read())
+    f.close()
+
+b = Builder(action=cat, suffix='.out', src_suffix='.in')
+env = Environment(BUILDERS={'Build':b})
+env.Build('aaa.in')
+""")
+
+test.write(['subdir', 'aaa.in'], "subdir/aaa.in\n")
+
+#
+test.run(arguments = '.')
+
+test.fail_test(test.read(['subdir', 'aaa.out']) != "subdir/aaa.in\n")
+
+#
+test.pass_test()