diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-06-13 09:07:01 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-06-13 09:07:01 (GMT) |
| commit | 1cfa3926f9067ed486bf46af44dcc83c64084a57 (patch) | |
| tree | 810d978caa2f9bc19c89aea0c0ef8d371d6a64f7 /Lib/distutils/command | |
| parent | dd0b90a367f4c04a0d2b210f59a29a2eb2200fec (diff) | |
| download | cpython-1cfa3926f9067ed486bf46af44dcc83c64084a57.zip cpython-1cfa3926f9067ed486bf46af44dcc83c64084a57.tar.gz cpython-1cfa3926f9067ed486bf46af44dcc83c64084a57.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/distutils/command')
| -rw-r--r-- | Lib/distutils/command/bdist_msi.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py index f94d957..da0b30d 100644 --- a/Lib/distutils/command/bdist_msi.py +++ b/Lib/distutils/command/bdist_msi.py @@ -282,9 +282,14 @@ class bdist_msi (Command): PYTHON.USER if defined, else from PYTHON.MACHINE. PYTHON is PYTHONDIR\python.exe""" install_path = r"SOFTWARE\Python\PythonCore\%s\InstallPath" % self.target_version + if msilib.Win64: + # type: msidbLocatorTypeRawValue + msidbLocatorType64bit + Type = 2+16 + else: + Type = 2 add_data(self.db, "RegLocator", - [("python.machine", 2, install_path, None, 2), - ("python.user", 1, install_path, None, 2)]) + [("python.machine", 2, install_path, None, Type), + ("python.user", 1, install_path, None, Type)]) add_data(self.db, "AppSearch", [("PYTHON.MACHINE", "python.machine"), ("PYTHON.USER", "python.user")]) |