From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 13 Sep 2008 08:37:17 +0000 (+0000)
Subject: Merged revisions 66441 via svnmerge from
X-Git-Tag: v3.0rc1~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e40a21376a015c16a05940f3d1afc61f5c319502;p=python

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.
........
---

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 8fd24b0788..0557bd3f8b 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")