[Python-3000-checkins] r59045 - python/branches/py3k/Tools/msi/msi.py
martin.v.loewis
python-3000-checkins at python.org
Mon Nov 19 07:46:56 CET 2007
Author: martin.v.loewis
Date: Mon Nov 19 07:46:55 2007
New Revision: 59045
Modified:
python/branches/py3k/Tools/msi/msi.py
Log:
Revert modifications to extract_msvcr71 in 59040,
as they didn't actually work.
Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py (original)
+++ python/branches/py3k/Tools/msi/msi.py Mon Nov 19 07:46:55 2007
@@ -823,15 +823,13 @@
r"Software\Microsoft\VisualStudio\7.1\Setup\VS")
dir = _winreg.QueryValueEx(k, "MSMDir")[0]
_winreg.CloseKey(k)
- files = glob.glob1(dir, "*VCR71*.dll")
+ files = glob.glob1(dir, "*CRT71*")
assert len(files) > 0, (dir, files)
# Extract msvcr71.dll
- #m = msilib.MakeMerge2()
- #m.OpenModule(file, 0)
- #m.ExtractFiles(".")
- #m.CloseModule()
- for file in files:
- shutil.copy(os.path.join(dir, file), '.')
+ m = msilib.MakeMerge2()
+ m.OpenModule(file, 0)
+ m.ExtractFiles(".")
+ m.CloseModule()
# Find the version/language of msvcr71.dll
installer = msilib.MakeInstaller()
return installer.FileVersion("msvcr71.dll", 0), \
More information about the Python-3000-checkins
mailing list