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.
........
This commit is contained in:
Martin v. Löwis 2009-06-12 17:31:41 +00:00
parent 58641defe4
commit 83eacca7a6
3 changed files with 16 additions and 5 deletions

View file

@ -341,9 +341,14 @@ class bdist_msi(Command):
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)])