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

Issue #24306: Sets component ID for launcher to match 3.5 and later to avoid downgrading.

This commit is contained in:
Steve Dower 2015-11-07 10:07:04 -08:00
parent 411dfd871c
commit ba270147e4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -708,6 +708,9 @@ Tools/Demos
Windows Windows
------- -------
- Issue #24306: Sets component ID for launcher to match 3.5 and later
to avoid downgrading.
- Issue #25022: Removed very outdated PC/example_nt/ directory. - Issue #25022: Removed very outdated PC/example_nt/ directory.

6
Tools/msi/msi.py
View File

@ -998,12 +998,14 @@ def add_files(db):
if launchersrc.lower() == 'pcbuild\\amd64': if launchersrc.lower() == 'pcbuild\\amd64':
launchersrc = 'PCBuild' launchersrc = 'PCBuild'
launcher = os.path.join(srcdir, launchersrc, "py.exe") launcher = os.path.join(srcdir, launchersrc, "py.exe")
launcherdir.start_component("launcher", flags = 8+256, keyfile="py.exe") launcherdir.start_component("launcher", flags = 8+256, keyfile="py.exe",
uuid="{B5107402-6958-461B-8B0A-4037D3327160}")
launcherdir.add_file(launcher, launcherdir.add_file(launcher,
version=installer.FileVersion(launcher, 0), version=installer.FileVersion(launcher, 0),
language=installer.FileVersion(launcher, 1)) language=installer.FileVersion(launcher, 1))
launcherw = os.path.join(srcdir, launchersrc, "pyw.exe") launcherw = os.path.join(srcdir, launchersrc, "pyw.exe")
launcherdir.start_component("launcherw", flags = 8+256, keyfile="pyw.exe") launcherdir.start_component("launcherw", flags = 8+256, keyfile="pyw.exe",
uuid="{8E52B8CD-48BB-4D74-84CD-6238BCD11F20}")
launcherdir.add_file(launcherw, launcherdir.add_file(launcherw,
version=installer.FileVersion(launcherw, 0), version=installer.FileVersion(launcherw, 0),
language=installer.FileVersion(launcherw, 1)) language=installer.FileVersion(launcherw, 1))