Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Pick up 32-bit launcher from PGO directory on 64-bit PGO build.

This commit is contained in:
Martin v. Löwis 2012-08-24 16:06:10 +02:00
parent bddf7244f0
commit 5951ec0fdd
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -115,6 +115,8 @@ Tests
Build
-----
- Pick up 32-bit launcher from PGO directory on 64-bit PGO build.
- Drop PC\python_nt.h as it's not used. Add input dependency on custom
build step.

11
Tools/msi/msi.py
View File

@ -974,14 +974,17 @@ def add_files(db):
# 32-bit installer.
# XXX does this still allow to install the component on a 32-bit system?
# Pick up 32-bit binary always
launcher = os.path.join(srcdir, "PCBuild", "py.exe")
launchersrc = PCBUILD
if launchersrc.lower() == 'pcbuild\\x64-pgo':
launchersrc = 'PCBuild\\win32-pgo'
launcher = os.path.join(srcdir, launchersrc, "py.exe")
launcherdir.start_component("launcher", flags = 8+256, keyfile="py.exe")
launcherdir.add_file("%s/py.exe" % PCBUILD,
launcherdir.add_file(launcher,
version=installer.FileVersion(launcher, 0),
language=installer.FileVersion(launcher, 1))
launcherw = os.path.join(srcdir, "PCBuild", "pyw.exe")
launcherw = os.path.join(srcdir, launchersrc, "pyw.exe")
launcherdir.start_component("launcherw", flags = 8+256, keyfile="pyw.exe")
launcherdir.add_file("%s/pyw.exe" % PCBUILD,
launcherdir.add_file(launcherw,
version=installer.FileVersion(launcherw, 0),
language=installer.FileVersion(launcherw, 1))