[Python-checkins] cpython (3.5): Fixes installer not allowing launcher to be selected.
steve.dower
python-checkins at python.org
Mon Nov 9 07:31:38 EST 2015
https://hg.python.org/cpython/rev/0c704864b917
changeset: 99014:0c704864b917
branch: 3.5
parent: 99011:a13d9656f954
user: Steve Dower <steve.dower at microsoft.com>
date: Mon Nov 09 07:31:05 2015 -0500
summary:
Fixes installer not allowing launcher to be selected.
files:
Tools/msi/bundle/bundle.wxs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs
--- a/Tools/msi/bundle/bundle.wxs
+++ b/Tools/msi/bundle/bundle.wxs
@@ -26,7 +26,7 @@
<Variable Name="WinVerNoDot" Value="$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)" />
<Variable Name="InstallAllUsers" Value="0" bal:Overridable="yes" />
- <?ifndef PyTestExt ?>
+ <?if "$(var.PyTestExt)"="" ?>
<Variable Name="InstallLauncherAllUsers" Value="1" bal:Overridable="yes" />
<?else ?>
<Variable Name="InstallLauncherAllUsers" Value="0" />
@@ -52,7 +52,7 @@
<Variable Name="DefaultCustomTargetDir" Value="" bal:Overridable="yes" />
<Variable Name="InstallAllUsersState" Value="enabled" />
- <?ifndef PyTestExt ?>
+ <?if "$(var.PyTestExt)"="" ?>
<Variable Name="InstallLauncherAllUsersState" Value="enabled" bal:Overridable="yes" />
<?else ?>
<Variable Name="InstallLauncherAllUsersState" Value="disable" bal:Overridable="yes" />
@@ -70,7 +70,7 @@
<Variable Name="Include_tools" Value="1" bal:Overridable="yes" />
<Variable Name="Include_tcltk" Value="1" bal:Overridable="yes" />
<Variable Name="Include_pip" Value="1" bal:Overridable="yes" />
- <?ifndef PyTestExt ?>
+ <?if "$(var.PyTestExt)"="" ?>
<Variable Name="Include_launcher" Value="1" bal:Overridable="yes" />
<?else ?>
<Variable Name="Include_launcher" Value="0" />
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list