diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2012-06-21 16:24:32 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2012-06-21 16:24:32 (GMT) |
| commit | 8559b3cecf1ecc142ef82c50308672b06b19b931 (patch) | |
| tree | fb1e2c736423f95107ba75f10a63ad51baeeaae1 /Tools/msi | |
| parent | af21ebb4249ab09feaa03560cebc85226438b8c8 (diff) | |
| download | cpython-8559b3cecf1ecc142ef82c50308672b06b19b931.zip cpython-8559b3cecf1ecc142ef82c50308672b06b19b931.tar.gz cpython-8559b3cecf1ecc142ef82c50308672b06b19b931.tar.bz2 | |
Build and bundle the 32-bit launcher in all configurations.
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/msi.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 1e9e2e8..889649a 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -973,12 +973,13 @@ def add_files(db): # to allow setting the SharedDLLs key in the 64-bit portion even for a # 32-bit installer. # XXX does this still allow to install the component on a 32-bit system? - launcher = os.path.join(srcdir, PCBUILD, "py.exe") + # Pick up 32-bit binary always + launcher = os.path.join(srcdir, "PCBuild", "py.exe") launcherdir.start_component("launcher", flags = 8+256, keyfile="py.exe") launcherdir.add_file("%s/py.exe" % PCBUILD, version=installer.FileVersion(launcher, 0), language=installer.FileVersion(launcher, 1)) - launcherw = os.path.join(srcdir, PCBUILD, "pyw.exe") + launcherw = os.path.join(srcdir, "PCBuild", "pyw.exe") launcherdir.start_component("launcherw", flags = 8+256, keyfile="pyw.exe") launcherdir.add_file("%s/pyw.exe" % PCBUILD, version=installer.FileVersion(launcherw, 0), |