Pulling in latest software construction toolkit.

site_scons/site_tools/target_platform_windows.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 85 matching lines @@
   like:
 
       mt.exe : general error c101008d: Failed to write the updated manifest to
       the resource of file "(name of exe)". Access is denied.
 
   with mt.exe returning an errorlevel (return code) of 31.  The workaround is
   to retry running mt.exe after a short delay.
   """
 
   cmdline = env.subst(
-      'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;%d'
+      'mt.exe -nologo -manifest "$MANIFEST_FILE" -outputresource:"$TARGET";%d'
       % resource_num,
       target=target, source=source)
   print cmdline
 
   for retry in range(5):
     # If this is a retry, print a message and delay first
     if retry:
       # mt.exe failed to write to the target file.  Print a warning message,
       # delay 3 seconds, and retry.
       print 'Warning: mt.exe failed to write to %s; retrying.' % target[0]
@@ skipping 55 matching lines @@
         LINKFLAGS=['/SUBSYSTEM:CONSOLE'],
     )
 
 #------------------------------------------------------------------------------
 
 
 def generate(env):
   # NOTE: SCons requires the use of this name, which fails gpylint.
   """SCons entry point for this tool."""
 
-  # Set up environment paths first
+  # Bring in the outside PATH, INCLUDE, and LIB if not blocked.
+  if not env.get('MSVC_BLOCK_ENVIRONMENT_CHANGES'):
+    env.AppendENVPath('PATH', os.environ.get('PATH', '[]'))
+    env.AppendENVPath('INCLUDE', os.environ.get('INCLUDE', '[]'))
+    env.AppendENVPath('LIB', os.environ.get('LIB', '[]'))
 
   # Load various Visual Studio related tools.
   env.Tool('as')
   env.Tool('msvs')
   env.Tool('windows_hard_link')
 
   pre_msvc_env = env['ENV'].copy()
 
   env.Tool('msvc')
   env.Tool('mslib')
   env.Tool('mslink')
 
+  # Find VC80_DIR if it isn't already set.
+  if not env.get('VC80_DIR'):
+    # Look in each directory in the path for cl.exe.
+    for p in env['ENV']['PATH'].split(os.pathsep):
+      # Use the directory two layers up if it exists.
+      if os.path.exists(os.path.join(p, 'cl.exe')):
+        env['VC80_DIR'] = os.path.dirname(os.path.dirname(p))
+
   # The msvc, mslink, and mslib tools search the registry for installed copies
   # of Visual Studio and prepends them to the PATH, INCLUDE, and LIB
   # environment variables.  Block these changes if necessary.
   if env.get('MSVC_BLOCK_ENVIRONMENT_CHANGES'):
     env['ENV'] = pre_msvc_env
 
   # Declare bits
   DeclareBit('windows', 'Target platform is windows.',
              exclusive_groups=('target_platform'))
   env.SetBits('windows')
 
   env.Replace(
       TARGET_PLATFORM='WINDOWS',
       COMPONENT_PLATFORM_SETUP=ComponentPlatformSetup,
 
       # A better rebuild command (actually cleans, then rebuild)
       MSVSREBUILDCOM=''.join(['$MSVSSCONSCOM -c "$MSVSBUILDTARGET" && ',
                               '$MSVSSCONSCOM "$MSVSBUILDTARGET"']),
+
+      CCFLAG_INCLUDE='/FI',     # Command line option to include a header
   )
 
   env.Append(
       HOST_PLATFORMS=['WINDOWS'],
       CPPDEFINES=['OS_WINDOWS=OS_WINDOWS'],
 
       # Turn up the warning level
       CCFLAGS=['/W3'],
 
       # Force x86 platform for now
@@ skipping 14 matching lines @@
           '/MT',     # link with LIBCMT.LIB (multi-threaded, static linked crt)
           '/GS',     # enable security checks
       ],
 
       # Settings for component_builders
       COMPONENT_LIBRARY_LINK_SUFFIXES=['.lib'],
       COMPONENT_LIBRARY_DEBUG_SUFFIXES=['.pdb'],
   )
 
   # Add manifests to EXEs and DLLs
+  env['MANIFEST_FILE'] = '${TARGET}.manifest'  # To allow override.
   wait_action = SCons.Script.Action(WaitForWritable,
                                     lambda target, source, env: ''),
   env['LINKCOM'] = [
       env['LINKCOM'],
       SCons.Script.Action(RunManifestExe, lambda target, source, env: ''),
       SCons.Script.Delete('${TARGET}.manifest'),
       wait_action,
   ]
   env['SHLINKCOM'] = [
       env['SHLINKCOM'],
       SCons.Script.Action(RunManifestDll, lambda target, source, env: ''),
       SCons.Script.Delete('${TARGET}.manifest'),
       wait_action,
   ]
   env['WINDOWS_INSERT_MANIFESTS'] = True
   env.Append(LINKFLAGS=['-manifest'])