Fix dependency scans of generated files. (John Johnson)

4 files changed, 37 insertions, 21 deletions

diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index fe017ae..08c35c8 100644
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -207,13 +207,13 @@ def _init_nodes(builder, env, overrides, tlist, slist):
         t.set_executor(executor)
         if builder.scanner:
             t.target_scanner = builder.scanner
+        if not hasattr(t, 'source_scanner'):
+            t.source_scanner = env.get_scanner(t.scanner_key())
 
     # Last, add scanners from the Environment to the source Nodes.
     for s in slist:
-        src_key = s.scanner_key()        # the file suffix
-        scanner = env.get_scanner(src_key)
-        if scanner:
-            s.source_scanner = scanner
+        if not hasattr(s, 'source_scanner'):
+             s.source_scanner = env.get_scanner(s.scanner_key())
 
 class EmitterProxy:
     """This is a callable class that can act as a
diff --git a/src/engine/SCons/BuilderTests.py b/src/engine/SCons/BuilderTests.py
index b51eb9f..23f18c4 100644
--- a/src/engine/SCons/BuilderTests.py
+++ b/src/engine/SCons/BuilderTests.py
@@ -752,10 +752,10 @@ class BuilderTestCase(unittest.TestCase):
         env_scanner = TestScanner()
         env = Environment()
         builder = SCons.Builder.Builder(action='action')
-        tgt = builder(env, target='foo.x', source='bar')
+        tgt = builder(env, target='foo.x', source='bar.y')
         src = tgt.sources[0]
         assert tgt.target_scanner != env_scanner, tgt.target_scanner
-        assert src.source_scanner == env_scanner
+        assert src.source_scanner == env_scanner, src.source_scanner
 
     def test_Builder_Args(self):
         """Testing passing extra args to a builder."""
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index a78a2c9..0abc21b 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -924,6 +924,7 @@ class Dir(Base):
         self.abspath_ = self.abspath + os.sep
         self.repositories = []
         self.srcdir = None
+        self.source_scanner = None
         
         self.entries = {}
         self.entries['.'] = self
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 3802aad..4dd0bd9 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -111,9 +111,13 @@ class Node:
         self.implicit = None    # implicit (scanned) dependencies (None means not scanned yet)
         self.parents = {}
         self.wkids = None       # Kids yet to walk, when it's an array
-        self.source_scanner = None      # implicit scanner from scanner map
         self.target_scanner = None      # explicit scanner from this node's Builder
 
+        # If/when this attribute exists, it's an implicit scanner from
+        # the scanner map for an environment.  The attribute is created
+        # when we select the scanner, a value of None means there is none.
+        #self.source_scanner = None
+
         self.env = None
         self.state = None
         self.precious = None
@@ -197,16 +201,21 @@ class Node:
         # Clear out the implicit dependency caches:
         # XXX this really should somehow be made more general and put
         #     under the control of the scanners.
-        if self.source_scanner:
-            self.found_includes = {}
-            self.includes = None
+        try:
+            scanner = self.source_scanner
+        except AttributeError:
+            pass
+        else:
+            if scanner:
+                self.found_includes = {}
+                self.includes = None
 
-            def get_parents(node, parent): return node.get_parents()
-            def clear_cache(node, parent):
-                node.implicit = None
-                node.del_bsig()
-            w = Walker(self, get_parents, ignore_cycle, clear_cache)
-            while w.next(): pass
+                def get_parents(node, parent): return node.get_parents()
+                def clear_cache(node, parent):
+                    node.implicit = None
+                    node.del_bsig()
+                w = Walker(self, get_parents, ignore_cycle, clear_cache)
+                while w.next(): pass
 
         # clear out the content signature, since the contents of this
         # node were presumably just changed:
@@ -384,11 +393,17 @@ class Node:
         build_env = self.get_build_env()
 
         for child in self.children(scan=0):
-            self._add_child(self.implicit,
-                            self.implicit_dict,
-                            child.get_implicit_deps(build_env,
-                                                    child.source_scanner,
-                                                    self))
+            try:
+                scanner = child.source_scanner
+            except AttributeError:
+                pass
+            else:
+                if scanner:
+                    self._add_child(self.implicit,
+                                    self.implicit_dict,
+                                    child.get_implicit_deps(build_env,
+                                                            scanner,
+                                                            self))
 
         # scan this node itself for implicit dependencies
         self._add_child(self.implicit,