Fix scanning Aliases of nodes which have scanners. (Bug reported by Jeff Petkau.)

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

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index ece238adede94e84003131e961badf422c7eca07..06778a5fd465c5c1ba4da7a483f4d64856425d46 100644 (file)
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -870,6 +870,16 @@ class File(Entry):
 
         try:
             path = target.scanner_paths[scanner]
+        except AttributeError:
+            # The target had no scanner_paths attribute, which means
+            # it's an Alias or some other node that's not actually a
+            # file.  In that case, back off and use the path for this
+            # node itself.
+            try:
+                path = self.scanner_paths[scanner]
+            except KeyError:
+                path = scanner.path(env, self.cwd)
+                self.scanner_paths[scanner] = path
         except KeyError:
             path = scanner.path(env, target.cwd)
             target.scanner_paths[scanner] = path

diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index 6ca81828e0a04eddb061c0d69e966719dfaaaef8..a78e5ee87fc490f017c2479c7ccb9a6e533b73c7 100644 (file)
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -754,6 +754,14 @@ class FSTestCase(unittest.TestCase):
         assert deps == [xyz], deps
         assert s.call_count == 2, s.call_count
 
+        # Make sure we can scan this file even if the target isn't
+        # a file that has a scanner (it might be an Alias, e.g.).
+        class DummyNode:
+            pass
+
+        deps = f12.get_found_includes(env, s, DummyNode())
+        assert deps == [xyz], deps
+
         # Test building a file whose directory is not there yet...
         f1 = fs.File(test.workpath("foo/bar/baz/ack"))
         assert not f1.dir.exists()

diff --git a/test/Alias-scanner.py b/test/Alias-scanner.py
new file mode 100644 (file)
index 0000000..15fa712
--- /dev/null
+++ b/test/Alias-scanner.py
@@ -0,0 +1,60 @@
+#!/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.
+#
+
+"""
+Test that an Alias of a node with a Scanner works.
+"""
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import sys
+import TestSCons
+import TestCmd
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+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()
+
+XBuilder = Builder(action = cat, src_suffix = '.x', suffix = '.c')
+env = Environment(BUILDERS = { 'XBuilder': XBuilder })
+f = env.XBuilder(source = ['file.x'], target = ['file.c'])
+env.Alias(target = ['cfiles'], source = f)
+Default(['cfiles'])
+""")
+
+test.write('file.x', "file.x\n")
+
+test.run()
+
+test.fail_test(test.read('file.c') != "file.x\n")
+
+test.pass_test()