[Python-checkins] r73391 - in python/branches/py3k: Lib/distutils/command/bdist_msi.py Lib/msilib/__init__.py Misc/NEWS

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Jun 12 19:31:41 2009
New Revision: 73391

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

........
  r73390 | martin.v.loewis | 2009-06-12 19:28:31 +0200 (Fr, 12 Jun 2009) | 3 lines
  
  Support AMD64 in msilib. Set Win64 on reglocator.
  Fixes #6258.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/distutils/command/bdist_msi.py
   python/branches/py3k/Lib/msilib/__init__.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/distutils/command/bdist_msi.py
==============================================================================
--- python/branches/py3k/Lib/distutils/command/bdist_msi.py	(original)
+++ python/branches/py3k/Lib/distutils/command/bdist_msi.py	Fri Jun 12 19:31:41 2009
@@ -341,9 +341,14 @@
             exe_action = "PythonExe" + ver
             target_dir_prop = "TARGETDIR" + ver
             exe_prop = "PYTHON" + ver
+            if msilib.Win64:
+                # type: msidbLocatorTypeRawValue + msidbLocatorType64bit
+                Type = 2+16
+            else:
+                Type = 2
             add_data(self.db, "RegLocator",
-                    [(machine_reg, 2, install_path, None, 2),
-                     (user_reg, 1, install_path, None, 2)])
+                    [(machine_reg, 2, install_path, None, Type),
+                     (user_reg, 1, install_path, None, Type)])
             add_data(self.db, "AppSearch",
                     [(machine_prop, machine_reg),
                      (user_prop, user_reg)])

Modified: python/branches/py3k/Lib/msilib/__init__.py
==============================================================================
--- python/branches/py3k/Lib/msilib/__init__.py	(original)
+++ python/branches/py3k/Lib/msilib/__init__.py	Fri Jun 12 19:31:41 2009
@@ -2,9 +2,11 @@
 # Copyright (C) 2005 Martin v. Löwis
 # Licensed to PSF under a Contributor Agreement.
 from _msi import *
-import os, string, re
+import os, string, re, sys
 
-Win64=0
+AMD64 = "AMD64" in sys.version
+Itanium = "Itanium" in sys.version
+Win64 = AMD64 or Itanium
 
 # Partially taken from Wine
 datasizemask=      0x00ff
@@ -145,8 +147,10 @@
     si.SetProperty(PID_TITLE, "Installation Database")
     si.SetProperty(PID_SUBJECT, ProductName)
     si.SetProperty(PID_AUTHOR, Manufacturer)
-    if Win64:
+    if Itanium:
         si.SetProperty(PID_TEMPLATE, "Intel64;1033")
+    elif AMD64:
+        si.SetProperty(PID_TEMPLATE, "x64;1033")
     else:
         si.SetProperty(PID_TEMPLATE, "Intel;1033")
     si.SetProperty(PID_REVNUMBER, gen_uuid())

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Fri Jun 12 19:31:41 2009
@@ -24,6 +24,8 @@
 Library
 -------
 
+- Issue #6258: Support AMD64 in bdist_msi.
+
 - Issue #6195: fixed doctest to no longer try to read 'source' data from
   binary files.