diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-09-13 08:37:17 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-09-13 08:37:17 (GMT) |
| commit | e40a21376a015c16a05940f3d1afc61f5c319502 (patch) | |
| tree | 71fab997e5cefb7cd7f4bec38e1e575c8c25e027 /Tools | |
| parent | f27f8a139d92ab2b930f875815c9b7755cfc191f (diff) | |
| download | cpython-e40a21376a015c16a05940f3d1afc61f5c319502.zip cpython-e40a21376a015c16a05940f3d1afc61f5c319502.tar.gz cpython-e40a21376a015c16a05940f3d1afc61f5c319502.tar.bz2 | |
Merged revisions 66441 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66441 | martin.v.loewis | 2008-09-13 10:36:22 +0200 (Sa, 13 Sep 2008) | 1 line
Change product code of Win64 installer to allow simultaneous installation on Win32 and Win64; also change product name to be able to distinguish the two in ARP.
........
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/msi.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 8fd24b0..0557bd3 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -172,6 +172,10 @@ if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"): raise SystemError("msisupport.dll for incorrect architecture") if msilib.Win64: upgrade_code = upgrade_code_64 + # Bump the last digit of the code by one, so that 32-bit and 64-bit + # releases get separate product codes + digit = hex((int(product_code[-2],16)+1)%16)[-1] + product_code = product_code[:-2] + digit + '}' if testpackage: ext = 'px' @@ -201,11 +205,15 @@ def build_database(): uc = upgrade_code_snapshot else: uc = upgrade_code + if msilib.Win64: + productsuffix = " (64-bit)" + else: + productsuffix = "" # schema represents the installer 2.0 database schema. # sequence is the set of standard sequences # (ui/execute, admin/advt/install) db = msilib.init_database("python-%s%s.msi" % (full_current_version, msilib.arch_ext), - schema, ProductName="Python "+full_current_version, + schema, ProductName="Python "+full_current_version+productsuffix, ProductCode=product_code, ProductVersion=current_version, Manufacturer=u"Python Software Foundation") |