[Python-3000-checkins] r61120 - in python/branches/py3k: Tools/msi/msi.py
martin.v.loewis
python-3000-checkins at python.org
Fri Feb 29 00:01:33 CET 2008
Author: martin.v.loewis
Date: Fri Feb 29 00:01:33 2008
New Revision: 61120
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Tools/msi/msi.py
Log:
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.
........
Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py (original)
+++ python/branches/py3k/Tools/msi/msi.py Fri Feb 29 00:01:33 2008
@@ -837,17 +837,11 @@
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:
More information about the Python-3000-checkins
mailing list