diff options
| author | vangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-10 02:44:14 +0000 |
|---|---|---|
| committer | vangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-10 02:44:14 +0000 |
| commit | 310c592ed4184750b131bbdfa248677c0df0cf60 (patch) | |
| tree | feccd528049823f4dad5f3cc8ee1909ce91e341f | |
| parent | 7c9a9cb4c16ffa5599eb8cba63109adbfac9b2d0 (diff) | |
| download | chromium_src-310c592ed4184750b131bbdfa248677c0df0cf60.zip chromium_src-310c592ed4184750b131bbdfa248677c0df0cf60.tar.gz chromium_src-310c592ed4184750b131bbdfa248677c0df0cf60.tar.bz2 | |
Making it possible to run scons on vista using VS2008 without having to install an additional MS SDK. VS2008 does come with SDK version 6.0, it's just that the registry entries for it are slightly different than in XP. This change takes care of Vista but I'm not sure what the registry looks like in Windows XP when you install VS 2008.
Review URL: http://codereview.chromium.org/155326
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20356 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | o3d/build/build_nacl.py | 9 | ||||
| -rw-r--r-- | o3d/svn_paths.scons | 11 |
2 files changed, 15 insertions, 5 deletions
diff --git a/o3d/build/build_nacl.py b/o3d/build/build_nacl.py index 044e9a3..af4c5cf 100644 --- a/o3d/build/build_nacl.py +++ b/o3d/build/build_nacl.py @@ -92,8 +92,13 @@ def FindPlatformSDK(): _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') diff --git a/o3d/svn_paths.scons b/o3d/svn_paths.scons index 4741f6a..318ea72 100644 --- a/o3d/svn_paths.scons +++ b/o3d/svn_paths.scons @@ -102,10 +102,15 @@ if env.Bit('host_windows'): 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') |