[Python-3000-checkins] r66517 - in python/branches/py3k: Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Sep 19 21:21:20 2008
New Revision: 66517

Log:
Merged revisions 66516 via svnmerge from
svn+ssh://pythondev at svn.python.org/python/trunk

........
r66516 | martin.v.loewis | 2008-09-19 21:20:03 +0200 (Fr, 19 Sep 2008) | 1 line

Use AMD64 version of CRT in just-for-me installations for Win64 installers.
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Tools/msi/msi.py

Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py (original)
+++ python/branches/py3k/Tools/msi/msi.py Fri Sep 19 21:21:20 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()