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

build/build_nacl.py

 #!/usr/bin/python2.4
 # Copyright 2009 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
@@ skipping 74 matching lines @@
   try:
     winsdk_key = _winreg.OpenKey(
         _winreg.HKEY_LOCAL_MACHINE,
         'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.1\\WinSDKBuild')
   except WindowsError:
     try:
       winsdk_key = _winreg.OpenKey(
           _winreg.HKEY_LOCAL_MACHINE,
           'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0A\\WinSDKBuild')
     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.0A\\VistaClientHeadersLibs')
+      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('\\/')
@@ skipping 53 matching lines @@
       file_path = file_path + '.a'
     outputs.append(file_path)
 
   if status == 0 and not CopyIfNewer(outputs, FLAGS.output):
     sys.exit(-1)
   else:
     sys.exit(status)
 
 if __name__ == '__main__':
   main(sys.argv)