diff options
| author | Steve Dower <steve.dower@python.org> | 2022-03-30 20:20:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 20:20:38 (GMT) |
| commit | 2ab609dd614045f3b112ede0b0883339de784f2a (patch) | |
| tree | 308945814e7f66702ebe1e2dde57dec84b0b2314 /Tools/msi | |
| parent | 581c4434de62d9d36392f10e65866c081fb18d71 (diff) | |
| download | cpython-2ab609dd614045f3b112ede0b0883339de784f2a.zip cpython-2ab609dd614045f3b112ede0b0883339de784f2a.tar.gz cpython-2ab609dd614045f3b112ede0b0883339de784f2a.tar.bz2 | |
bpo-47171: Enable installing the py.exe launcher on Windows ARM64 (GH-32203)
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/bundle/Default.ARM64.xsl | 5 | ||||
| -rw-r--r-- | Tools/msi/bundle/bundle.wxs | 11 | ||||
| -rw-r--r-- | Tools/msi/exe/exe.wixproj | 15 |
3 files changed, 9 insertions, 22 deletions
diff --git a/Tools/msi/bundle/Default.ARM64.xsl b/Tools/msi/bundle/Default.ARM64.xsl index f63da4e..b28b3f2 100644 --- a/Tools/msi/bundle/Default.ARM64.xsl +++ b/Tools/msi/bundle/Default.ARM64.xsl @@ -10,6 +10,10 @@ </xsl:copy> </xsl:template> + <!-- + ** No longer need this change, but I'm leaving the snippets here as an example + ** in case we need to add another override in the future. + <xsl:template match="*[local-name()='String' and @Id='InstallButtonNote']"> <String Id="InstallButtonNote">[TargetDir] @@ -20,4 +24,5 @@ Creates shortcuts but no file associations</String> <xsl:template match="*[local-name()='String' and @Id='Include_launcherHelp']"> <String Id="Include_launcherHelp">(The 'py' launcher is currently unavailable on ARM64.)</String> </xsl:template> + --> </xsl:stylesheet>
\ No newline at end of file diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs index ac4b7a6..19e67fa 100644 --- a/Tools/msi/bundle/bundle.wxs +++ b/Tools/msi/bundle/bundle.wxs @@ -56,9 +56,7 @@ <Variable Name="DefaultCustomTargetDir" Value="" bal:Overridable="yes" /> <Variable Name="InstallAllUsersState" Value="enabled" bal:Overridable="yes" /> - <?if "$(var.Platform)"~="ARM64" ?> - <Variable Name="InstallLauncherAllUsersState" Value="hide" bal:Overridable="yes" /> - <?elseif "$(var.PyTestExt)"="" ?> + <?if "$(var.PyTestExt)"="" ?> <Variable Name="InstallLauncherAllUsersState" Value="enabled" bal:Overridable="yes" /> <?else ?> <Variable Name="InstallLauncherAllUsersState" Value="disable" bal:Overridable="yes" /> @@ -76,17 +74,12 @@ <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" /> - <?if $(var.Platform)~="ARM64" ?> - <Variable Name="Include_launcher" Value="0" bal:Overridable="yes" /> - <Variable Name="Include_launcherState" Value="disable" /> - <?else ?> <Variable Name="Include_launcher" Value="-1" bal:Overridable="yes" /> <?if "$(var.PyTestExt)"="" ?> <Variable Name="Include_launcherState" Value="enabled" bal:Overridable="yes" /> <?else ?> <Variable Name="Include_launcherState" Value="disable" /> <?endif ?> - <?endif ?> <Variable Name="Include_symbols" Value="0" bal:Overridable="yes" /> <Variable Name="Include_debug" Value="0" bal:Overridable="yes" /> @@ -115,9 +108,7 @@ <PackageGroupRef Id="doc" /> <PackageGroupRef Id="tools" /> <PackageGroupRef Id="tcltk" /> - <?if $(var.Platform)!="ARM64" ?> <PackageGroupRef Id="launcher" /> - <?endif ?> <PackageGroupRef Id="pip" /> <PackageGroupRef Id="packageinstall" /> <PackageGroupRef Id="postinstall" /> diff --git a/Tools/msi/exe/exe.wixproj b/Tools/msi/exe/exe.wixproj index be44f44..592c8d2 100644 --- a/Tools/msi/exe/exe.wixproj +++ b/Tools/msi/exe/exe.wixproj @@ -32,18 +32,9 @@ <Exec Command="$(Blurb) merge -f "$(BuildPath)NEWS.txt"" WorkingDirectory="$(PCbuild)" /> </Target> - <Target Name="_MergeMiscNewsWithPython" AfterTargets="PrepareForBuild" Condition="$(Blurb) == '' and !Exists('$(PySourcePath)Misc\NEWS')"> - <ItemGroup> - <HostPython Include="$(ExternalsDir)python*\tools\python.exe" /> - <HostPython Include="@(HostPython)" Condition="Exists(%(FullPath))" /> - <HostPython Include="py" Condition="@(HostPython) == ''" /> - </ItemGroup> - <PropertyGroup> - <HostPython>@(HostPython)</HostPython> - <HostPython Condition="$(HostPython.Contains(';'))">$(HostPython.Remove($(HostPython.IndexOf(';'))))</HostPython> - </PropertyGroup> - <Exec Command=""$(HostPython)" -m pip install -U blurb" WorkingDirectory="$(PCbuild)" /> - <Exec Command=""$(HostPython)" -m blurb merge -f "$(BuildPath)NEWS.txt"" WorkingDirectory="$(PCbuild)" /> + <Target Name="_MergeMiscNewsWithPython" AfterTargets="PrepareForBuild" Condition="$(Blurb) == '' and !Exists('$(PySourcePath)Misc\NEWS')" DependsOnTargets="FindPythonForBuild"> + <Exec Command="$(PythonForBuild) -m pip install -U blurb" WorkingDirectory="$(PCbuild)" /> + <Exec Command="$(PythonForBuild) -m blurb merge -f "$(BuildPath)NEWS.txt"" WorkingDirectory="$(PCbuild)" /> </Target> <Import Project="..\msi.targets" /> |