diff options
| author | Steve Dower <steve.dower@python.org> | 2023-01-26 20:47:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-26 20:47:24 (GMT) |
| commit | 8d18d1ffd52eb3917c4566b09596d596116a5532 (patch) | |
| tree | 5ebc938d15837dac7759cd38d76ffd5f099167db /PCbuild | |
| parent | 9f2c479eaf7d922746ef2f3c85b5c781757686b1 (diff) | |
| download | cpython-8d18d1ffd52eb3917c4566b09596d596116a5532.zip cpython-8d18d1ffd52eb3917c4566b09596d596116a5532.tar.gz cpython-8d18d1ffd52eb3917c4566b09596d596116a5532.tar.bz2 | |
gh-99834: Update bundled copy of Tcl/Tk to 8.6.13.0 on Windows (GH-101307)
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/_tkinter.vcxproj | 1 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 6 | ||||
| -rw-r--r-- | PCbuild/tcltk.props | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj index af813b7..30cedcb 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -111,6 +111,7 @@ <ItemGroup> <_TclTkDLL Include="$(tcltkdir)\bin\$(tclDllName)" /> <_TclTkDLL Include="$(tcltkdir)\bin\$(tkDllName)" /> + <_TclTkDLL Include="$(tcltkdir)\bin\$(tclZlibDllName)" /> </ItemGroup> <ItemGroup> <ProjectReference Include="pythoncore.vcxproj"> diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 7efdeb2..0a41d13 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -55,8 +55,8 @@ set libraries=%libraries% bzip2-1.0.8 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.3 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1s set libraries=%libraries% sqlite-3.39.4.0 -if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.1 -if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1 +if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.13.0 +if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.13.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6 set libraries=%libraries% xz-5.2.5 set libraries=%libraries% zlib-1.2.13 @@ -78,7 +78,7 @@ echo.Fetching external binaries... set binaries= if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.3 if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1s -if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.12.1 +if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.13.0 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 for %%b in (%binaries%) do ( diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props index 7fd43e8..15c03e2 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -4,8 +4,8 @@ <PropertyGroup> <TclMajorVersion>8</TclMajorVersion> <TclMinorVersion>6</TclMinorVersion> - <TclPatchLevel>12</TclPatchLevel> - <TclRevision>1</TclRevision> + <TclPatchLevel>13</TclPatchLevel> + <TclRevision>0</TclRevision> <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion> <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion> <TkPatchLevel>$(TclPatchLevel)</TkPatchLevel> @@ -27,6 +27,7 @@ <tclShExeName>tclsh$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).exe</tclShExeName> <tkDLLName>tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).dll</tkDLLName> <tkLibName>tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).lib</tkLibName> + <tclZlibDLLName>zlib1.dll</tclZlibDLLName> <tixDLLName>tix$(TixMajorVersion)$(TixMinorVersion)$(TclDebugExt).dll</tixDLLName> <tixDLLPath>$(tcltkDir)lib\tix$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel)\$(tixDLLName)</tixDLLPath> <tcltkLib>$(tcltkDir)lib\tcl$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).lib;$(tcltkDir)lib\tk$(TkMajorVersion)$(TkMinorVersion)t$(TclDebugExt).lib</tcltkLib> |