[Python-checkins] r59768 - python/trunk/Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Sun Jan  6 12:13:16 2008
New Revision: 59768

Modified:
   python/trunk/Tools/msi/msi.py
Log:
Don't try to package msvcr90 for the moment.


Modified: python/trunk/Tools/msi/msi.py
==============================================================================
--- python/trunk/Tools/msi/msi.py	(original)
+++ python/trunk/Tools/msi/msi.py	Sun Jan  6 12:13:16 2008
@@ -902,12 +902,15 @@
                     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",