Adding in new software construction toolkit version.

site_scons/site_tools/concat_source.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 34 matching lines @@
   Returns:
     None if successful; 1 if error.
   """
   if len(target) != 1:
     print 'ERROR: multiple ConcatSource targets when 1 expected'
     return 1
 
   output_lines = [
       '// This file is auto-generated by the ConcatSource builder.']
 
-  for source_file in source:
-    # Skip source files which are not CPP files.  These will be passed through
-    # to the output list by the pseudo-builder.
-    if source_file.suffix not in env['CONCAT_SOURCE_SUFFIXES']:
-      continue
-
-    source_path = str(source_file)
-
+  for source_path in map(str, source):
     if env.get('CC') == 'cl':
       # Add message pragma for nicer progress indication when building with
       # MSVC.
       output_lines.append('#pragma message("--%s")' % (
           source_path.replace("\\", "/")))
 
     output_lines.append('#include "%s"' % source_path)
 
   output_file = open(str(target[0]), 'w')
   # Need an EOL at the end of the file for more finicky build tools
@@ skipping 13 matching lines @@
     If self['CONCAT_SOURCE_ENABLE'], calls self.ConcatSource and returns
     the list of target nodes.  Otherwise, returns the list of source nodes.
     Source nodes which are not CPP files are passed through unchanged to the
     list of output nodes.
   """
   if self.get('CONCAT_SOURCE_ENABLE', True):
     # Scan down source list and separate CPP sources (which we concatenate)
     # from other files (which we pass through).
     cppsource = []
     outputs = []
-    for source_file in SCons.Script.Flatten(source):
-      if self.File(source_file).suffix in self['CONCAT_SOURCE_SUFFIXES']:
+    suffixes = self.Flatten(self.subst_list('$CONCAT_SOURCE_SUFFIXES'))
+    for source_file in self.arg2nodes(source):
+      if source_file.suffix in suffixes:
         cppsource.append(source_file)
       else:
         outputs.append(source_file)
 
     if len(cppsource) > 1:
       # More than one file, so concatenate them together
       outputs += self.ConcatSourceBuilder(target, cppsource)
     else:
       # <2 files, so pass them through; no need for a ConcatSource target
       outputs += cppsource
@@ skipping 16 matching lines @@
   # Suffixes of sources we can concatenate.  Files not in this list will be
   # passed through untouched.  (Note that on Mac, Objective C/C++ files
   # cannot be concatenated with regular C/C++ files.)
   # TODO(rspangler): Probably shouldn't mix C, C++ either...
   env['CONCAT_SOURCE_SUFFIXES'] = ['.c', '.C', '.cxx', '.cpp', '.c++', '.cc',
                                    '.h', '.H', '.hxx', '.hpp', '.hh']
 
   # Add a psuedo-builder method which can look at the environment to determine
   # whether to call the ConcatSource builder or not
   env.AddMethod(ConcatSourcePseudoBuilder, 'ConcatSource')