Pulling in latest software construction toolkit.

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 42 matching 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)
 
-    if 'msvc' in env['TOOLS']:
+    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
-  output_lines.append('\n')
-
-  output_file = open(str(target[0]), 'w')
-  output_file.write('\n'.join(output_lines))
+  output_file.write('\n'.join(output_lines) + '\n')
   output_file.close()
 
 
 def ConcatSourcePseudoBuilder(self, target, source):
   """ConcatSource pseudo-builder; calls builder or passes through source nodes.
 
   Args:
     self: Environment in which to build
     target: List of target nodes
     source: List of source nodes
@@ skipping 40 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')