diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-02-28 22:20:50 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-02-28 22:20:50 (GMT) |
| commit | 03dc56cd171b116b22d2f1f44de6d77f6ff6850e (patch) | |
| tree | 24ee7a595b1cdd47cae9dc2048d614373471f506 /Tools | |
| parent | acfd8ed0cd6c88375f1b27ba8ffd072e7a588473 (diff) | |
| download | cpython-03dc56cd171b116b22d2f1f44de6d77f6ff6850e.zip cpython-03dc56cd171b116b22d2f1f44de6d77f6ff6850e.tar.gz cpython-03dc56cd171b116b22d2f1f44de6d77f6ff6850e.tar.bz2 | |
Locate VS installation dir from environment, so that it works with the express edition.
Diffstat (limited to 'Tools')
| -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 6ac0250..f3e2e7f 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -836,17 +836,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: |