Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
........
This commit is contained in:
Martin v. Löwis 2008-09-13 08:37:17 +00:00
parent f27f8a139d
commit e40a21376a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/msi/msi.py
View File

@ -172,6 +172,10 @@ if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"):
raise SystemError("msisupport.dll for incorrect architecture") raise SystemError("msisupport.dll for incorrect architecture")
if msilib.Win64: if msilib.Win64:
upgrade_code = upgrade_code_64 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: if testpackage:
ext = 'px' ext = 'px'
@ -201,11 +205,15 @@ def build_database():
uc = upgrade_code_snapshot uc = upgrade_code_snapshot
else: else:
uc = upgrade_code uc = upgrade_code
if msilib.Win64:
productsuffix = " (64-bit)"
else:
productsuffix = ""
# schema represents the installer 2.0 database schema. # schema represents the installer 2.0 database schema.
# sequence is the set of standard sequences # sequence is the set of standard sequences
# (ui/execute, admin/advt/install) # (ui/execute, admin/advt/install)
db = msilib.init_database("python-%s%s.msi" % (full_current_version, msilib.arch_ext), 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, ProductCode=product_code,
ProductVersion=current_version, ProductVersion=current_version,
Manufacturer=u"Python Software Foundation") Manufacturer=u"Python Software Foundation")