mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-30 06:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Added VS 2005 and VS 2008 to the search path for cabarc.exe

Browse source
This commit is contained in:
Christian Heimes 2007-12-04 15:52:14 +00:00
parent 9acba0441e
commit 19b1aaa45d
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Tools/msi/msilib.py
View file

@ -376,14 +376,19 @@ class CAB:
except OSError: except OSError:
pass pass
for k, v in [(r"Software\Microsoft\VisualStudio\7.1\Setup\VS", "VS7CommonBinDir"), for k, v in [(r"Software\Microsoft\VisualStudio\7.1\Setup\VS", "VS7CommonBinDir"),
(r"Software\Microsoft\Win32SDK\Directories", "Install Dir")]: (r"Software\Microsoft\VisualStudio\8.0\Setup\VS", "VS7CommonBinDir"),
(r"Software\Microsoft\VisualStudio\9.0\Setup\VS", "VS7CommonBinDir"),
(r"Software\Microsoft\Win32SDK\Directories", "Install Dir"),
]:
try: try:
key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, k) key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, k)
except WindowsError: dir = _winreg.QueryValueEx(key, v)[0]
_winreg.CloseKey(key)
except (WindowsError, IndexError):
continue
cabarc = os.path.join(dir, r"Bin", "cabarc.exe")
if not os.path.exists(cabarc):
continue continue
cabarc = os.path.join(_winreg.QueryValueEx(key, v)[0], r"Bin", "cabarc.exe")
_winreg.CloseKey(key)
if not os.path.exists(cabarc):continue
break break
else: else:
print "WARNING: cabarc.exe not found in registry" print "WARNING: cabarc.exe not found in registry"