[Python-checkins] bpo-46948: Fix launcher installer build failure due to first part of fix (GH-31920) (GH-31925)
ned-deily
webhook-mailer at python.org
Tue Mar 15 22:00:39 EDT 2022
https://github.com/python/cpython/commit/4a1d65fe8528c3a6e0cf2f4f9d4b58249164589d
commit: 4a1d65fe8528c3a6e0cf2f4f9d4b58249164589d
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ned-deily <nad at python.org>
date: 2022-03-15T22:00:23-04:00
summary:
bpo-46948: Fix launcher installer build failure due to first part of fix (GH-31920) (GH-31925)
(cherry picked from commit 708812085355c92f32e547d1f1d1f29aefbbc27e)
Co-authored-by: Steve Dower <steve.dower at python.org>
files:
M Tools/msi/common.wxs
diff --git a/Tools/msi/common.wxs b/Tools/msi/common.wxs
index d8f3cde99ab52..4554e80014a29 100644
--- a/Tools/msi/common.wxs
+++ b/Tools/msi/common.wxs
@@ -61,6 +61,7 @@
</Fragment>
<Fragment>
+ <?ifdef PythonExeComponentGuid ?>
<!-- Locate TARGETDIR automatically assuming we have executables installed -->
<Property Id="TARGETDIR">
<ComponentSearch Id="PythonExe_Directory" Guid="$(var.PythonExeComponentGuid)">
@@ -69,6 +70,7 @@
</DirectorySearch>
</ComponentSearch>
</Property>
+ <?endif ?>
<Property Id="DetectTargetDir" Value="1" />
</Fragment>
More information about the Python-checkins
mailing list