From 8a2e90e5e7375dd777769295d03624c0006f69a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Fri, 19 Sep 2008 19:21:20 +0000 Subject: 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. ........ --- Tools/msi/msi.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 8a8189e..f9aa30a 100644 --- 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() -- cgit v0.12