Fixes for Visual Studio solution + project file generation:...

site_scons/site_tools/component_setup.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 53 matching lines @@
   return SCons.Node.FS.LinkFunc([env.Entry(target)], [env.Entry(source)], env)
 
 
 def PreEvaluateVariables(env):
   """Deferred function to pre-evaluate SCons varables for each build mode.
 
   Args:
     env: Environment for the current build mode.
   """
   # Convert directory variables to strings
-  for var in env.SubstList2('PRE_EVALUATE_DIRS'):
+  for var in env.SubstList2('$PRE_EVALUATE_DIRS'):
     env[var] = str(env.Dir('$' + var))
 
 
 #------------------------------------------------------------------------------
 
 
 def generate(env):
   # NOTE: SCons requires the use of this name, which fails gpylint.
   """SCons entry point for this tool."""
 
@@ skipping 134 matching lines @@
   # have a common location for tools outside of the current clientspec.  Need
   # to check if it's defined already, so it can be set prior to this tool
   # being included.
   tool_root = env.get('TOOL_ROOT', '$SOURCE_ROOT')
   env['TOOL_ROOT'] = env.Dir(tool_root).abspath
 
   # Defer pre-evaluating some environment variables, but do before building
   # SConscripts.
   env.Defer(PreEvaluateVariables)
   env.Defer('BuildEnvironmentSConscripts', after=PreEvaluateVariables)