diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-06-12 17:28:31 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-06-12 17:28:31 +0000 |
| commit | d20568924793318b87b30d715c9a05bff4ca0229 (patch) | |
| tree | 91f3aa97fd560693a813f3c7b83264b390d528b6 /Lib/msilib | |
| parent | a9a09a99c0364e4215a6404f86d0997e55d40665 (diff) | |
| download | cpython-d20568924793318b87b30d715c9a05bff4ca0229.tar.gz | |
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 b13d0306f1..71cced251a 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()) |