FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-99834: Update bundled copy of Tcl/Tk to 8.6.13.0 on Windows (GH-10… · python/cpython@8d18d1f · GitHub

/ cpython Public

Commit 8d18d1f

Browse files
zooba
authored
gh-99834: Update bundled copy of Tcl/Tk to 8.6.13.0 on Windows (GH-101307)
1 parent 9f2c479 commit 8d18d1f

6 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎Misc/NEWS.d/next/Windows/2023-01-25-00-23-31.gh-issue-99834.WN41lc.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updates bundled copy of Tcl/Tk to 8.6.13.0

‎PC/layout/main.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
IDLE_DIRS_ONLY = FileNameSet("idlelib")
3737

38-
TCLTK_PYDS_ONLY = FileStemSet("tcl*", "tk*", "_tkinter")
38+
TCLTK_PYDS_ONLY = FileStemSet("tcl*", "tk*", "_tkinter", "zlib1")
3939
TCLTK_DIRS_ONLY = FileNameSet("tkinter", "turtledemo")
4040
TCLTK_FILES_ONLY = FileNameSet("turtle.py")
4141

‎PCbuild/_tkinter.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
<ItemGroup>
112112
<_TclTkDLL Include="$(tcltkdir)\bin\$(tclDllName)" />
113113
<_TclTkDLL Include="$(tcltkdir)\bin\$(tkDllName)" />
114+
<_TclTkDLL Include="$(tcltkdir)\bin\$(tclZlibDllName)" />
114115
</ItemGroup>
115116
<ItemGroup>
116117
<ProjectReference Include="pythoncore.vcxproj">

‎PCbuild/get_externals.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ set libraries=%libraries% bzip2-1.0.8
5555
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.3
5656
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1s
5757
set libraries=%libraries% sqlite-3.39.4.0
58-
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.1
59-
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1
58+
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.13.0
59+
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.13.0
6060
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
6161
set libraries=%libraries% xz-5.2.5
6262
set libraries=%libraries% zlib-1.2.13
@@ -78,7 +78,7 @@ echo.Fetching external binaries...
7878
set binaries=
7979
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.3
8080
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1s
81-
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.12.1
81+
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.13.0
8282
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
8383

8484
for %%b in (%binaries%) do (

‎PCbuild/tcltk.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<PropertyGroup>
55
<TclMajorVersion>8</TclMajorVersion>
66
<TclMinorVersion>6</TclMinorVersion>
7-
<TclPatchLevel>12</TclPatchLevel>
8-
<TclRevision>1</TclRevision>
7+
<TclPatchLevel>13</TclPatchLevel>
8+
<TclRevision>0</TclRevision>
99
<TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
1010
<TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>
1111
<TkPatchLevel>$(TclPatchLevel)</TkPatchLevel>
@@ -27,6 +27,7 @@
2727
<tclShExeName>tclsh$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).exe</tclShExeName>
2828
<tkDLLName>tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).dll</tkDLLName>
2929
<tkLibName>tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).lib</tkLibName>
30+
<tclZlibDLLName>zlib1.dll</tclZlibDLLName>
3031
<tixDLLName>tix$(TixMajorVersion)$(TixMinorVersion)$(TclDebugExt).dll</tixDLLName>
3132
<tixDLLPath>$(tcltkDir)lib\tix$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel)\$(tixDLLName)</tixDLLPath>
3233
<tcltkLib>$(tcltkDir)lib\tcl$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).lib;$(tcltkDir)lib\tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).lib</tcltkLib>

‎Tools/msi/tcltk/tcltk_files.wxs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<Component Id="tk86t.dll" Directory="DLLs" Guid="*">
1717
<File Name="tk86t.dll" KeyPath="yes" />
1818
</Component>
19+
<Component Id="zlib1.dll" Directory="DLLs" Guid="*">
20+
<File Name="zlib1.dll" KeyPath="yes" />
21+
</Component>
1922
</ComponentGroup>
2023
</Fragment>
2124

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL