Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 61116 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r61116 | martin.v.loewis | 2008-02-28 23:20:50 +0100 (Do, 28 Feb 2008) | 1 line

  Locate VS installation dir from environment, so that it works with the express edition.
........
This commit is contained in:
Martin v. Löwis 2008-02-28 23:01:33 +00:00
parent 36d1f8ec46
commit ee7498e2c1
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/msi/msi.py
View File

@ -837,17 +837,11 @@ def extract_msvcr71():
installer.FileVersion("msvcr71.dll", 1)
def extract_msvcr90():
import _winreg
# Find the location of the merge modules
k = _winreg.OpenKey(
_winreg.HKEY_LOCAL_MACHINE,
r"Software\Microsoft\VisualStudio\9.0\Setup\VS")
prod_dir = _winreg.QueryValueEx(k, "ProductDir")[0]
_winreg.CloseKey(k)
# Find the redistributable files
dir = os.path.join(os.environ['VS90COMNTOOLS'], r"..\..\VC\redist\x86\Microsoft.VC90.CRT")
result = []
installer = msilib.MakeInstaller()
dir = os.path.join(prod_dir, r'VC\redist\x86\Microsoft.VC90.CRT')
# omit msvcm90 and msvcp90, as they aren't really needed
files = ["Microsoft.VC90.CRT.manifest", "msvcr90.dll"]
for f in files: