[Python-3000-checkins] r66440 - in python/branches/py3k: Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Sat Sep 13 10:14:01 2008
New Revision: 66440

Log:
Merged revisions 66439 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66439 | martin.v.loewis | 2008-09-13 10:11:57 +0200 (Sa, 13 Sep 2008) | 1 line
  
  Issue #3833: Use a different upgrade code for Win64 installers.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Tools/msi/msi.py

Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py	(original)
+++ python/branches/py3k/Tools/msi/msi.py	Sat Sep 13 10:14:01 2008
@@ -64,8 +64,11 @@
 # This should never change. The UpgradeCode of this package can be
 # used in the Upgrade table of future packages to make the future
 # package replace this one. See "UpgradeCode Property".
+# upgrade_code gets set to upgrade_code_64 when we have determined
+# that the target is Win64.
 upgrade_code_snapshot='{92A24481-3ECB-40FC-8836-04B7966EC0D5}'
 upgrade_code='{65E6DE48-A358-434D-AA4F-4AF72DB4718F}'
+upgrade_code_64='{6A965A0C-6EE6-4E3A-9983-3263F56311EC}'
 
 if snapshot:
     current_version = "%s.%s.%s" % (major, minor, int(time.time()/3600/24))
@@ -167,6 +170,8 @@
 msilib.set_arch_from_file(dll_path)
 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
 
 if testpackage:
     ext = 'px'