Kaydet (Commit) a6b46357 authored tarafından Martin v. Löwis's avatar Martin v. Löwis

Revert modifications to extract_msvcr71 in 59040,

as they didn't actually work.
üst 8a48c4c9
......@@ -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), \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment