Revert modifications to extract_msvcr71 in 59040,

as they didn't actually work.
This commit is contained in:
Martin v. Löwis 2007-11-19 06:46:55 +00:00
parent 8a48c4c915
commit a6b46357f6

View file

@ -823,15 +823,13 @@ def extract_msvcr71():
r"Software\Microsoft\VisualStudio\7.1\Setup\VS") r"Software\Microsoft\VisualStudio\7.1\Setup\VS")
dir = _winreg.QueryValueEx(k, "MSMDir")[0] dir = _winreg.QueryValueEx(k, "MSMDir")[0]
_winreg.CloseKey(k) _winreg.CloseKey(k)
files = glob.glob1(dir, "*VCR71*.dll") files = glob.glob1(dir, "*CRT71*")
assert len(files) > 0, (dir, files) assert len(files) > 0, (dir, files)
# Extract msvcr71.dll # Extract msvcr71.dll
#m = msilib.MakeMerge2() m = msilib.MakeMerge2()
#m.OpenModule(file, 0) m.OpenModule(file, 0)
#m.ExtractFiles(".") m.ExtractFiles(".")
#m.CloseModule() m.CloseModule()
for file in files:
shutil.copy(os.path.join(dir, file), '.')
# Find the version/language of msvcr71.dll # Find the version/language of msvcr71.dll
installer = msilib.MakeInstaller() installer = msilib.MakeInstaller()
return installer.FileVersion("msvcr71.dll", 0), \ return installer.FileVersion("msvcr71.dll", 0), \