diff options
| author | Steve Dower <steve.dower@python.org> | 2022-02-28 12:06:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-28 12:06:43 (GMT) |
| commit | da7d99a4de72aac8d436cecedf16ab2676f9b785 (patch) | |
| tree | 4cd872e18c9b1053147d9e50bed6cbe8cfe6a1b6 /Tools/msi | |
| parent | 424ecab494d538650ba34937cdd710094ccb2275 (diff) | |
| download | cpython-da7d99a4de72aac8d436cecedf16ab2676f9b785.zip cpython-da7d99a4de72aac8d436cecedf16ab2676f9b785.tar.gz cpython-da7d99a4de72aac8d436cecedf16ab2676f9b785.tar.bz2 | |
bpo-46567: Add Tcl/Tk build for Windows ARM64 (GH-31574)
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/bundle/Default.ARM64.xsl | 5 | ||||
| -rw-r--r-- | Tools/msi/bundle/bundle.targets | 2 | ||||
| -rw-r--r-- | Tools/msi/bundle/bundle.wxs | 7 |
3 files changed, 3 insertions, 11 deletions
diff --git a/Tools/msi/bundle/Default.ARM64.xsl b/Tools/msi/bundle/Default.ARM64.xsl index 0dd1c9e..f63da4e 100644 --- a/Tools/msi/bundle/Default.ARM64.xsl +++ b/Tools/msi/bundle/Default.ARM64.xsl @@ -13,14 +13,11 @@ <xsl:template match="*[local-name()='String' and @Id='InstallButtonNote']"> <String Id="InstallButtonNote">[TargetDir] -Includes pip and documentation +Includes IDLE, pip and documentation Creates shortcuts but no file associations</String> </xsl:template> <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:template match="*[local-name()='String' and @Id='Include_tcltkHelpLabel']"> - <String Id="Include_tcltkHelpLabel">(tcl/tk and IDLE are currently unavailable on ARM64.)</String> - </xsl:template> </xsl:stylesheet>
\ No newline at end of file diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets index 4f4306f..89a5960 100644 --- a/Tools/msi/bundle/bundle.targets +++ b/Tools/msi/bundle/bundle.targets @@ -69,7 +69,7 @@ <Package Include="..\path\path*.wixproj" /> <Package Include="..\appendpath\appendpath*.wixproj" /> <Package Include="..\pip\pip*.wixproj" /> - <Package Include="..\tcltk\tcltk*.wixproj" Condition="$(Platform) != 'ARM64'" /> + <Package Include="..\tcltk\tcltk*.wixproj" /> <Package Include="..\test\test*.wixproj" /> <Package Include="..\tools\tools*.wixproj" /> <Package Include="..\ucrt\ucrt*.wixproj" Condition="$(Platform) != 'ARM64'" /> diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs index 5c9fd6d..340c72a 100644 --- a/Tools/msi/bundle/bundle.wxs +++ b/Tools/msi/bundle/bundle.wxs @@ -77,12 +77,7 @@ <Variable Name="Include_test" Value="1" bal:Overridable="yes" /> <Variable Name="Include_doc" Value="1" bal:Overridable="yes" /> <Variable Name="Include_tools" Value="1" bal:Overridable="yes" /> - <?if $(var.Platform)~="ARM64" ?> - <Variable Name="Include_tcltk" Value="0" /> - <Variable Name="Include_tcltkState" Value="disable" /> - <?else ?> <Variable Name="Include_tcltk" Value="1" bal:Overridable="yes" /> - <?endif ?> <Variable Name="Include_pip" Value="1" bal:Overridable="yes" /> <?if $(var.Platform)~="ARM64" ?> <Variable Name="Include_launcher" Value="0" bal:Overridable="yes" /> @@ -122,8 +117,8 @@ <PackageGroupRef Id="test" /> <PackageGroupRef Id="doc" /> <PackageGroupRef Id="tools" /> - <?if $(var.Platform)!="ARM64" ?> <PackageGroupRef Id="tcltk" /> + <?if $(var.Platform)!="ARM64" ?> <PackageGroupRef Id="launcher" /> <?endif ?> <PackageGroupRef Id="pip" /> |