summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-11-07 18:07:04 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-11-07 18:07:04 (GMT)
commitba270147e4f9330cc9275bd0164f239374e3ad41 (patch)
treedc20e27e860bebf5dd373a712e2b9ade7d003855
parent411dfd871c25355def5599319a45c906f9121282 (diff)
downloadcpython-ba270147e4f9330cc9275bd0164f239374e3ad41.zip
cpython-ba270147e4f9330cc9275bd0164f239374e3ad41.tar.gz
cpython-ba270147e4f9330cc9275bd0164f239374e3ad41.tar.bz2
Issue #24306: Sets component ID for launcher to match 3.5 and later to avoid downgrading.
-rw-r--r--Misc/NEWS3
-rw-r--r--Tools/msi/msi.py6
2 files changed, 7 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index a0c1a6d..eee7d73 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -708,6 +708,9 @@ Tools/Demos
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.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index d50056a..d7453a5 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -998,12 +998,14 @@ def add_files(db):
if launchersrc.lower() == 'pcbuild\\amd64':
launchersrc = 'PCBuild'
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,
version=installer.FileVersion(launcher, 0),
language=installer.FileVersion(launcher, 1))
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,
version=installer.FileVersion(launcherw, 0),
language=installer.FileVersion(launcherw, 1))