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

Fri Sep 19 21:20:03 CEST 2008

Author: martin.v.loewis
Date: Fri Sep 19 21:20:03 2008
New Revision: 66516
Log:
Use AMD64 version of CRT in just-for-me installations for Win64 installers.
Modified:
 python/trunk/Tools/msi/msi.py
Modified: python/trunk/Tools/msi/msi.py
==============================================================================

--- python/trunk/Tools/msi/msi.py	(original)
+++ python/trunk/Tools/msi/msi.py	Fri Sep 19 21:20:03 2008
@@ -843,7 +843,11 @@
 
 def extract_msvcr90():
 # Find the redistributable files
- dir = os.path.join(os.environ['VS90COMNTOOLS'], r"..\..\VC\redist\x86\Microsoft.VC90.CRT")
+ if msilib.Win64:
+ arch = "amd64"
+ else:
+ arch = "x86"
+ dir = os.path.join(os.environ['VS90COMNTOOLS'], r"..\..\VC\redist\%s\Microsoft.VC90.CRT" % arch)
 
 result = []
 installer = msilib.MakeInstaller()
