diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-06-13 09:07:01 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-06-13 09:07:01 (GMT) |
| commit | 1cfa3926f9067ed486bf46af44dcc83c64084a57 (patch) | |
| tree | 810d978caa2f9bc19c89aea0c0ef8d371d6a64f7 /Lib/msilib | |
| parent | dd0b90a367f4c04a0d2b210f59a29a2eb2200fec (diff) | |
| download | cpython-1cfa3926f9067ed486bf46af44dcc83c64084a57.zip cpython-1cfa3926f9067ed486bf46af44dcc83c64084a57.tar.gz cpython-1cfa3926f9067ed486bf46af44dcc83c64084a57.tar.bz2 | |
Merged revisions 73390 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73390 | martin.v.loewis | 2009-06-12 19:28:31 +0200 (Fr, 12 Jun 2009) | 3 lines
Support AMD64 in msilib. Set Win64 on reglocator.
Fixes #6258.
........
Diffstat (limited to 'Lib/msilib')
| -rw-r--r-- | Lib/msilib/__init__.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Lib/msilib/__init__.py b/Lib/msilib/__init__.py index b13d030..71cced2 100644 --- a/Lib/msilib/__init__.py +++ b/Lib/msilib/__init__.py @@ -2,9 +2,11 @@ # Copyright (C) 2005 Martin v. Löwis # Licensed to PSF under a Contributor Agreement. from _msi import * -import os, string, re +import os, string, re, sys -Win64=0 +AMD64 = "AMD64" in sys.version +Itanium = "Itanium" in sys.version +Win64 = AMD64 or Itanium # Partially taken from Wine datasizemask= 0x00ff @@ -145,8 +147,10 @@ def init_database(name, schema, si.SetProperty(PID_TITLE, "Installation Database") si.SetProperty(PID_SUBJECT, ProductName) si.SetProperty(PID_AUTHOR, Manufacturer) - if Win64: + if Itanium: si.SetProperty(PID_TEMPLATE, "Intel64;1033") + elif AMD64: + si.SetProperty(PID_TEMPLATE, "x64;1033") else: si.SetProperty(PID_TEMPLATE, "Intel;1033") si.SetProperty(PID_REVNUMBER, gen_uuid()) |