summaryrefslogtreecommitdiffstats
path: root/Tools/msi/msi.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-09-13 08:14:01 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-09-13 08:14:01 (GMT)
commitf27f8a139d92ab2b930f875815c9b7755cfc191f (patch)
tree9d46155b68cef6578ea68e134a5c7ed8aa68333a /Tools/msi/msi.py
parent4ab674a90d54ad876316434d0cd0a87720580797 (diff)
downloadcpython-f27f8a139d92ab2b930f875815c9b7755cfc191f.zip
cpython-f27f8a139d92ab2b930f875815c9b7755cfc191f.tar.gz
cpython-f27f8a139d92ab2b930f875815c9b7755cfc191f.tar.bz2
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. ........
Diffstat (limited to 'Tools/msi/msi.py')
-rw-r--r--Tools/msi/msi.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index fa80dfb..8fd24b0 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -64,8 +64,11 @@ current_version = "%s.%d" % (short_version, FIELD3)
# 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 @@ dll_path = os.path.join(srcdir, PCBUILD, dll_file)
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'