Fix files with the same name as subdirs.

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index c297718430c1158f9c4afbefc48e8b46c1395ff0..c8610781a0e1703dc0d7c15c5f97b3d6503c4bde 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -37,6 +37,13 @@ RELEASE 0.10 - XXX
   - Fix specifying only the source file to MultiStepBuilders such as
     the Program Builder.  (Bug reported by Dean Bair.)
 
+  - Fix an exception when building from a file with the same basename as
+    the subdirectory in which it lives.  (Bug reported by Gerard Patel.)
+
+  - Fix automatic deduction of a target file name when there are
+    multiple source files specified; the target is now deduced from just
+    the first source file in the list.
+
   From Steve Leblanc:
 
   - Add a Clean() method to support removing user-specified targets

diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index 2c458556f1f394cd460afeddc54d29d957115db7..9c91c0112f19b43bc8b8fe5c200200d4a312622b 100644 (file)
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -285,9 +285,10 @@ class BuilderBase:
 
         source = adjustixes(source, None, src_suf)
         if target is None:
-            target = map(lambda x, s=suf:
-                                os.path.splitext(os.path.split(str(x))[1])[0] + s,
-                         source)
+            s = source[0]
+            if isinstance(s, SCons.Node.Node):
+                s = os.path.split(str(s))[1]
+            target = [ os.path.splitext(s)[0] + suf ]
         else:
             target = adjustixes(target, pre, suf)
 

diff --git a/src/engine/SCons/BuilderTests.py b/src/engine/SCons/BuilderTests.py
index 57069dfc5ec3ab170bbe0cd4b5b38217aac83d41..5c0f0d62fc654f449bb8381f68904474f1de2720 100644 (file)
--- a/src/engine/SCons/BuilderTests.py
+++ b/src/engine/SCons/BuilderTests.py
@@ -641,15 +641,10 @@ class BuilderTestCase(unittest.TestCase):
         assert str(tgt.sources[0]) == 'ccc.x.c', map(str, tgt.sources)
 
         tgt = b(env, ['d0.c', 'd1.c'])
-        assert len(tgt) == 2, map(str, tgt)
-        assert str(tgt[0]) == 'd0.o', map(str, tgt)
-        assert str(tgt[1]) == 'd1.o', map(str, tgt)
-        assert len(tgt[0].sources) == 2,  map(str, tgt[0].sources)
-        assert str(tgt[0].sources[0]) == 'd0.c', map(str, tgt[0].sources)
-        assert str(tgt[0].sources[1]) == 'd1.c', map(str, tgt[0].sources)
-        assert len(tgt[1].sources) == 2,  map(str, tgt[1].sources)
-        assert str(tgt[1].sources[0]) == 'd0.c', map(str, tgt[1].sources)
-        assert str(tgt[1].sources[1]) == 'd1.c', map(str, tgt[1].sources)
+        assert str(tgt) == 'd0.o', str(tgt)
+        assert len(tgt.sources) == 2,  map(str, tgt.sources)
+        assert str(tgt.sources[0]) == 'd0.c', map(str, tgt.sources)
+        assert str(tgt.sources[1]) == 'd1.c', map(str, tgt.sources)
 
         tgt = b(env, source='eee')
         assert str(tgt) == 'eee.o', str(tgt)
@@ -667,28 +662,18 @@ class BuilderTestCase(unittest.TestCase):
         assert str(tgt.sources[0]) == 'ggg.x.c', map(str, tgt.sources)
 
         tgt = b(env, source=['h0.c', 'h1.c'])
-        assert len(tgt) == 2, map(str, tgt)
-        assert str(tgt[0]) == 'h0.o', map(str, tgt)
-        assert str(tgt[1]) == 'h1.o', map(str, tgt)
-        assert len(tgt[0].sources) == 2,  map(str, tgt[0].sources)
-        assert str(tgt[0].sources[0]) == 'h0.c', map(str, tgt[0].sources)
-        assert str(tgt[0].sources[1]) == 'h1.c', map(str, tgt[0].sources)
-        assert len(tgt[1].sources) == 2,  map(str, tgt[1].sources)
-        assert str(tgt[1].sources[0]) == 'h0.c', map(str, tgt[1].sources)
-        assert str(tgt[1].sources[1]) == 'h1.c', map(str, tgt[1].sources)
+        assert str(tgt) == 'h0.o', str(tgt)
+        assert len(tgt.sources) == 2,  map(str, tgt.sources)
+        assert str(tgt.sources[0]) == 'h0.c', map(str, tgt.sources)
+        assert str(tgt.sources[1]) == 'h1.c', map(str, tgt.sources)
 
         w = b(env, target='i0.w', source=['i0.x'])
         y = b(env, target='i1.y', source=['i1.z'])
         tgt = b(env, source=[w, y])
-        assert len(tgt) == 2, map(str, tgt)
-        assert str(tgt[0]) == 'i0.o'
-        assert str(tgt[1]) == 'i1.o'
-        assert len(tgt[0].sources) == 2, map(str, tgt[0].sources)
-        assert str(tgt[0].sources[0]) == 'i0.w', map(str, tgt[0].sources)
-        assert str(tgt[0].sources[1]) == 'i1.y', map(str, tgt[0].sources)
-        assert len(tgt[1].sources) == 2, map(str, tgt[1].sources)
-        assert str(tgt[1].sources[0]) == 'i0.w', map(str, tgt[1].sources)
-        assert str(tgt[1].sources[1]) == 'i1.y', map(str, tgt[1].sources)
+        assert str(tgt) == 'i0.o', str(tgt)
+        assert len(tgt.sources) == 2, map(str, tgt.sources)
+        assert str(tgt.sources[0]) == 'i0.w', map(str, tgt.sources)
+        assert str(tgt.sources[1]) == 'i1.y', map(str, tgt.sources)
 
 
 if __name__ == "__main__":

diff --git a/test/no-target.py b/test/no-target.py
index dd24a8d70addf443b99b9d387dfb1e33955976e5..45e108811732528604fb06e1179dfec93e646399 100644 (file)
--- a/test/no-target.py
+++ b/test/no-target.py
@@ -30,8 +30,9 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
-test.subdir('subdir')
+test.subdir('subdir', ['subdir', 'ccc'])
 
+ccc_ccc_in = os.path.join('ccc', 'ccc.in')
 subdir_SConscript = os.path.join('subdir', 'SConscript')
 
 test.write('SConstruct', r"""
@@ -42,7 +43,6 @@ 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())
@@ -53,16 +53,19 @@ env = Environment(BUILDERS={'Build':b})
 env.Build('aaa.in')
 n = env.Build('bbb.in', 'bbb.input')
 env.Build(n)
-""")
+env.Build(source = r'%s')
+""" % ccc_ccc_in)
 
 test.write(['subdir', 'aaa.in'], "subdir/aaa.in\n")
 test.write(['subdir', 'bbb.input'], "subdir/bbb.input\n")
+test.write(['subdir', 'ccc', 'ccc.in'], "subdir/ccc/ccc.in\n")
 
 #
 test.run(arguments = '.')
 
 test.fail_test(test.read(['subdir', 'aaa.out']) != "subdir/aaa.in\n")
 test.fail_test(test.read(['subdir', 'bbb.out']) != "subdir/bbb.input\n")
+test.fail_test(test.read(['subdir', 'ccc', 'ccc.out']) != "subdir/ccc/ccc.in\n")
 
 #
 test.pass_test()

diff --git a/test/same-name.py b/test/same-name.py
new file mode 100644 (file)
index 0000000..7b5fd55
--- /dev/null
+++ b/test/same-name.py
@@ -0,0 +1,74 @@
+#!/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__"
+
+"""
+Make sure that we can build from a source file with the same basename as
+the subdirectory in which it lives.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('bu')
+
+test.write('SConstruct', """
+env = Environment(CPPPATH = ['.'])
+env.Program(source = ['foo.c', 'bu/bu.c'])
+""")
+
+test.write('foo.c', r"""
+#include <bu/bu.h>
+int
+main(int argc, char *argv[])
+{
+       argv[argc++] = "--";
+        bu();
+       printf("foo.c\n");
+       exit (0);
+}
+""")
+
+test.write(['bu', 'bu.h'], r"""
+void bu(void);
+""")
+
+test.write(['bu', 'bu.c'], r"""
+void
+bu(void)
+{
+        printf("bu/bu.c\n");
+}
+""")
+
+test.run(arguments = '.')
+
+test.run(program = test.workpath("foo"), stdout ="""\
+bu/bu.c
+foo.c
+""")
+
+test.pass_test()