Making it possible to run scons on vista using VS2008 without having to insta...

svn_paths.scons

 # Copyright 2009, 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.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 84 matching lines @@
     print 'variable must point to the installation directory.'
     sys.exit(1)
   try:
     winsdk_key = _winreg.OpenKey(
         _winreg.HKEY_LOCAL_MACHINE,
         'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0\\WinSDKBuild')
   except WindowsError:
     try:
       winsdk_key = _winreg.OpenKey(
           _winreg.HKEY_LOCAL_MACHINE,
-          'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.1\\WinSDKBuild')
+          'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0A\\VistaClientHeadersLibs')
     except WindowsError:
-      print 'The Windows SDK version 6.0 or later needs to be installed'
-      sys.exit(1)
+      try:
+        winsdk_key = _winreg.OpenKey(
+            _winreg.HKEY_LOCAL_MACHINE,
+            'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.1\\WinSDKBuild')
+      except WindowsError:
+        print 'The Windows SDK version 6.0 or later needs to be installed'
+        sys.exit(1)
   try:
     winsdk_dir, value_type = _winreg.QueryValueEx(winsdk_key,
                                                   'InstallationFolder')
   except WindowsError:
     print 'The Windows SDK version 6.0 or later needs to be installed'
     sys.exit(1)
   _winreg.CloseKey(winsdk_key)
   # Strip off trailing slashes
   winsdk_dir = winsdk_dir.rstrip('\\/')
   dxsdk_dir = dxsdk_dir.rstrip('\\/')
   env.Replace(JAVA_EXE = '%SystemRoot%\\system32\\java.exe',
               PLATFORM_SDK_VISTA_6_0_DIR = winsdk_dir,
               DIRECTX9_18_944_0_PARTIAL_DIR = dxsdk_dir,
               DOXYGEN = '$DOXYGEN_DIR/win/doxygen.exe')
   try:
     env['ENV']['PATH'] = "%s%s%s" % (env['ENV']['PATH'], os.pathsep,
                                      os.path.join(winsdk_dir, 'Bin'))
   except KeyError:
     env['ENV']['PATH'] = os.path.join(winsdk_dir, 'Bin')
 else:
   env.Replace(JAVA_EXE = 'java')
   if env.Bit('host_linux'):
     env.Replace(DOXYGEN = '$DOXYGEN_DIR/linux/doxygen')
   else:
     env.Replace(DOXYGEN = '$DOXYGEN_DIR/osx/doxygen')