diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-02-28 23:01:33 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-02-28 23:01:33 (GMT) |
| commit | ee7498e2c1acb9cfc30a332cd81c33afcb462a4a (patch) | |
| tree | a44fc1e848b72aa636c0ebe1a4e1b96dbb5cb99d /Tools/msi | |
| parent | 36d1f8ec46b3f7982578381fb5378673c0456e43 (diff) | |
| download | cpython-ee7498e2c1acb9cfc30a332cd81c33afcb462a4a.zip cpython-ee7498e2c1acb9cfc30a332cd81c33afcb462a4a.tar.gz cpython-ee7498e2c1acb9cfc30a332cd81c33afcb462a4a.tar.bz2 | |
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.
........
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/msi.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 6760d02..219a2dd 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -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: |