From 03dc56cd171b116b22d2f1f44de6d77f6ff6850e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Thu, 28 Feb 2008 22:20:50 +0000 Subject: [PATCH] Locate VS installation dir from environment, so that it works with the express edition. --- Tools/msi/msi.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 6ac02502ba..f3e2e7fcb0 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: -- 2.40.0