From 94da1d6a21ad2205e70186c1ce0b46849305f755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 6 Jan 2008 11:13:16 +0000 Subject: [PATCH] Don't try to package msvcr90 for the moment. --- Tools/msi/msi.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 5d966938e43..88e8b7c36d2 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -902,12 +902,15 @@ def add_files(db): language=installer.FileVersion(pydllsrc, 1)) # XXX determine dependencies if MSVCR == "90": - version, lang = extract_msvcr90() - dlldir.start_component("msvcr90", flags=8, keyfile="msvcr90.dll", - uuid=msvcr90_uuid) - dlldir.add_file("msvcr90.dll", src=os.path.abspath("msvcr90.dll"), - version=version, language=lang) - tmpfiles.append("msvcr90.dll") + # XXX don't package the CRT for the moment; + # this should probably use the merge module in the long run. + pass + #version, lang = extract_msvcr90() + #dlldir.start_component("msvcr90", flags=8, keyfile="msvcr90.dll", + # uuid=msvcr90_uuid) + #dlldir.add_file("msvcr90.dll", src=os.path.abspath("msvcr90.dll"), + # version=version, language=lang) + #tmpfiles.append("msvcr90.dll") else: version, lang = extract_msvcr71() dlldir.start_component("msvcr71", flags=8, keyfile="msvcr71.dll",