diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-09-19 19:21:20 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-09-19 19:21:20 (GMT) |
| commit | 8a2e90e5e7375dd777769295d03624c0006f69a6 (patch) | |
| tree | 1ca9162fc8fc4d7959619201b66a4e1b214b0f37 | |
| parent | df014bf604406e4ee75869f285a17443bcae0650 (diff) | |
| download | cpython-8a2e90e5e7375dd777769295d03624c0006f69a6.zip cpython-8a2e90e5e7375dd777769295d03624c0006f69a6.tar.gz cpython-8a2e90e5e7375dd777769295d03624c0006f69a6.tar.bz2 | |
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.
........
| -rw-r--r-- | Tools/msi/msi.py | 6 |
1 files changed, 5 insertions, 1 deletions
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() |