[Python-checkins] cpython: Pick up 32-bit launcher from PGO directory on 64-bit PGO build.
martin.v.loewis
python-checkins at python.org
Fri Aug 24 16:06:32 CEST 2012
http://hg.python.org/cpython/rev/a56c4178f65c
changeset: 78729:a56c4178f65c
user: Martin v. Löwis <martin at v.loewis.de>
date: Fri Aug 24 16:06:10 2012 +0200
summary:
Pick up 32-bit launcher from PGO directory on 64-bit PGO build.
files:
Misc/NEWS | 2 ++
Tools/msi/msi.py | 11 +++++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -115,6 +115,8 @@
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.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -974,14 +974,17 @@
# 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))
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list