gh-125729: Makes the installation of the turtle module dependent on the Tcl/Tk install option (GH-126176)

This commit is contained in:
CoderTCY 2024-11-20 01:19:33 +08:00 committed by GitHub
parent 29cbcbd73b
commit 88dc84bcf9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 5 deletions

View File

@ -0,0 +1 @@
Makes the presence of the :mod:`turtle` module dependent on the Tcl/Tk installer option. Previously, the module was always installed but would be unusable without Tcl/Tk.

View File

@ -70,8 +70,8 @@ Select Customize to review current options.</String>
<String Id="Include_docHelpLabel">Installs the Python documentation files.</String>
<String Id="Include_pipLabel">&amp;pip</String>
<String Id="Include_pipHelpLabel">Installs pip, which can download and install other Python packages.</String>
<String Id="Include_tcltkLabel">tcl/tk and &amp;IDLE</String>
<String Id="Include_tcltkHelpLabel">Installs tkinter and the IDLE development environment.</String>
<String Id="Include_tcltkLabel">Tcl/Tk, turtle and &amp;IDLE</String>
<String Id="Include_tcltkHelpLabel">Installs tkinter, turtle and the IDLE development environment.</String>
<String Id="Include_testLabel">Python &amp;test suite</String>
<String Id="Include_testHelpLabel">Installs the standard library test suite.</String>
<String Id="Include_launcherLabel">py &amp;launcher</String>

View File

@ -19,6 +19,7 @@
<InstallFiles Include="$(PySourcePath)Lib\**\*"
Exclude="$(PySourcePath)Lib\**\*.pyc;
$(PySourcePath)Lib\**\*.pyo;
$(PySourcePath)Lib\turtle.py;
$(PySourcePath)Lib\site-packages\README;
@(ExcludeFolders->'$(PySourcePath)%(Identity)\*');
@(ExcludeFolders->'$(PySourcePath)%(Identity)\**\*')">
@ -32,4 +33,4 @@
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
</Project>

View File

@ -28,7 +28,7 @@
<Group>tcltk_lib</Group>
</InstallFiles>
<InstallFiles Include="$(PySourcePath)Lib\tkinter\**\*;$(PySourcePath)Lib\idlelib\**\*;$(PySourcePath)Lib\turtledemo\**\*"
<InstallFiles Include="$(PySourcePath)Lib\tkinter\**\*;$(PySourcePath)Lib\idlelib\**\*;$(PySourcePath)Lib\turtledemo\**\*;$(PySourcePath)Lib\turtle.py"
Exclude="$(PySourcePath)Lib\**\*.pyc;$(PySourcePath)Lib\**\*.pyo">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
@ -39,4 +39,4 @@
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>
</Project>