Merged revisions 66516 via svnmerge from

svn+ssh://pythondev@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.
........

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 8a8189e528b3300174aabbc51e06a2cacc826dd2..f9aa30a3d723e227890d5d32e2adcad451e8fa4a 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -843,7 +843,11 @@ def add_features(db):
 
 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()