Pulling in latest software construction toolkit.

site_scons/site_tools/gather_inputs.py

 #!/usr/bin/python2.4
 # Copyright 2008, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 46 matching lines @@
   if exclude_pattern:
     exclude_pattern = re.compile(exclude_pattern)
 
   def _FindSources(ptrns, tgt, all):
     """Internal Recursive function to find all pattern matches."""
     # Recursively process lists
     if SCons.Util.is_List(tgt):
       for t in tgt:
         _FindSources(ptrns, t, all)
     else:
+      # Get key to use for tracking whether we've seen this node
+      target_abspath = None
+      if hasattr(tgt, 'abspath'):
+        # Use target's absolute path as the key
+        target_abspath = tgt.abspath
+        target_key = target_abspath
+      else:
+        # Hope node's representation is unique enough (the default repr
+        # contains a pointer to the target as a string).  This works for
+        # Alias() nodes.
+        target_key = repr(tgt)
+
       # Skip if we have been here before
-      if tgt.abspath in all: return
+      if target_key in all: return
       # Note that we have been here
-      all[tgt.abspath] = True
+      all[target_key] = True
       # Skip ones that match an exclude pattern, if we have one.
-      if exclude_pattern and exclude_pattern.match(tgt.abspath): return
+      if (exclude_pattern and target_abspath
+          and exclude_pattern.match(target_abspath)):
+        return
 
       # Handle non-leaf nodes recursively
       lst = tgt.children(scan=1)
       if lst:
         _FindSources(ptrns, lst, all)
         return
 
       # See who it matches
       for pattern, lst in ptrns.items():
         # Get real file (backed by repositories).
         rfile = tgt.rfile()
-        # Add to the list for the first pattern that matches.
-        if pattern.match(rfile.path):
+        # Add files to the list for the first pattern that matches (implicitly,
+        # don't add directories).
+        if rfile.isfile() and pattern.match(rfile.path):
           lst.append(rfile.abspath)
           break
 
   # Prepare a group for each pattern.
   patterns = {}
   for g in groups:
     patterns[re.compile(g, re.IGNORECASE)] = []
 
   # Do the search.
   _FindSources(patterns, target, {})
 
   return patterns.values()
 
 
 def generate(env):
   # NOTE: SCons requires the use of this name, which fails gpylint.
   """SCons entry point for this tool."""
 
   # Add a method to gather all inputs needed by a target.
   env.AddMethod(GatherInputs, 'GatherInputs')