diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-11-19 06:46:55 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-11-19 06:46:55 (GMT) |
| commit | a6b46357f652e620a4072ced75abd664be632210 (patch) | |
| tree | 535c8581b91be9830b9c4cc3a4a22bcaa3a08fe8 /Tools/msi | |
| parent | 8a48c4c915ce6b2889f0d2926389f49ed22be987 (diff) | |
| download | cpython-a6b46357f652e620a4072ced75abd664be632210.zip cpython-a6b46357f652e620a4072ced75abd664be632210.tar.gz cpython-a6b46357f652e620a4072ced75abd664be632210.tar.bz2 | |
Revert modifications to extract_msvcr71 in 59040,
as they didn't actually work.
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/msi.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 42cb3fd..dffd02e 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -823,15 +823,13 @@ def extract_msvcr71(): 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), \ |