bpo-32901: Update Tcl and Tk versions to 8.6.8 (GH-5823)

This commit is contained in:
Steve Dower 2018-02-23 08:22:10 -08:00 committed by GitHub
parent 0febc05373
commit efa6c76226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

View File

@ -0,0 +1 @@
Update Tcl and Tk versions to 8.6.8

View File

@ -51,8 +51,8 @@ set libraries=
set libraries=%libraries% bzip2-1.0.6 set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0f if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0f
set libraries=%libraries% sqlite-3.21.0.0 set libraries=%libraries% sqlite-3.21.0.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.6.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.8.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.6.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.8.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
set libraries=%libraries% xz-5.2.2 set libraries=%libraries% xz-5.2.2
set libraries=%libraries% zlib-1.2.11 set libraries=%libraries% zlib-1.2.11
@ -73,7 +73,7 @@ echo.Fetching external binaries...
set binaries= set binaries=
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.0f if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.0f
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.6.0 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.8.0
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
for %%b in (%binaries%) do ( for %%b in (%binaries%) do (

View File

@ -4,7 +4,7 @@
<PropertyGroup> <PropertyGroup>
<TclMajorVersion>8</TclMajorVersion> <TclMajorVersion>8</TclMajorVersion>
<TclMinorVersion>6</TclMinorVersion> <TclMinorVersion>6</TclMinorVersion>
<TclPatchLevel>6</TclPatchLevel> <TclPatchLevel>8</TclPatchLevel>
<TclRevision>0</TclRevision> <TclRevision>0</TclRevision>
<TkMajorVersion>$(TclMajorVersion)</TkMajorVersion> <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
<TkMinorVersion>$(TclMinorVersion)</TkMinorVersion> <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>