[Python-checkins] r66514 - in python/trunk: Misc/NEWS Tools/msi/merge.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Sep 19 17:21:07 2008
New Revision: 66514

Log:
Bug #3887: Package x64 version of CRT for AMD64 
Windows binaries.

Modified:
   python/trunk/Misc/NEWS
   python/trunk/Tools/msi/merge.py

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Fri Sep 19 17:21:07 2008
@@ -15,6 +15,11 @@
 Library
 -------
 
+Build
+-----
+
+- Bug #3887: Package x64 version of CRT for AMD64 Windows binaries.
+
 
 What's New in Python 2.6 release candidate 2?
 =============================================

Modified: python/trunk/Tools/msi/merge.py
==============================================================================
--- python/trunk/Tools/msi/merge.py	(original)
+++ python/trunk/Tools/msi/merge.py	Fri Sep 19 17:21:07 2008
@@ -9,7 +9,7 @@
 if len(sys.argv)==2:
     msi = sys.argv[1]
 if Win64:
-    modules = ["Microsoft_VC90_CRT_x86.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]
+    modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]
     if not msi: msi = "python-%s.amd64.msi" % full_current_version
 else:
     modules = ["Microsoft_VC90_CRT_x86.msm","policy_8_0_Microsoft_VC80_CRT_x86.msm"]