Pulling in latest software construction toolkit.

site_scons/site_tools/atlmfc_vc80.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 13 matching lines @@
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 """Windows ATL MFC for VC80 (Visual Studio 2005) tool for SCons.
 
 Note that ATL MFC requires the commercial (non-free) version of Visual Studio
-2005.  Using this in an open-source project thus limits the size of the
+2005.  Using this in an open-source project thus limits the size of the 
 developer community to those with the commercial version.
 """
 
 import os
 
 
 def _FindLocalInstall():
   """Returns the directory containing the local install of the tool.
-
+  
   Returns:
     Path to tool (as a string), or None if not found.
   """
   # TODO(rspangler): Should use a better search.  Probably needs to be based on
   # msvs tool, as msvc detection is.
   default_dir = 'C:/Program Files/Microsoft Visual Studio 8/VC/atlmfc'
   if os.path.exists(default_dir):
     return default_dir
   else:
     return None
 
 
 def generate(env):
   # NOTE: SCons requires the use of this name, which fails gpylint.
   """SCons entry point for this tool."""
 
   if not env.get('ATLMFC_VC80_DIR'):
     env['ATLMFC_VC80_DIR'] = _FindLocalInstall()
-
-  env.AppendENVPath('INCLUDE', env.Dir('$ATLMFC_VC80_DIR/include').abspath)
-  env.AppendENVPath('LIB', env.Dir('$ATLMFC_VC80_DIR/lib').abspath)
+  
+  env.Append(
+      LIBPATH=['$ATLMFC_VC80_DIR/lib'],
+      RCFLAGS=['/I"$ATLMFC_VC80_DIR/include"'],
+      CCFLAGS=['/I"$ATLMFC_VC80_DIR/include"'],
+  )
 
 
 def exists(env):
   """Returns true if tool exists."""
   # NOTE: SCons requires the use of this name, which fails gpylint.
-
+  
   # If directory explicitly specified, we exist
   if env.get('ATLMFC_VC80_DIR'):
     return 1
   elif _FindLocalInstall():
     return 1
   else:
-    return 0
+    return 0