diff options
author | Steve Dower <steve.dower@microsoft.com> | 2018-12-14 09:13:15 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-14 09:13:15 -0800 |
commit | f8e9bd568adf85c1e4aea1dda542a96b027797e2 (patch) | |
tree | 62226e97395db17ae0558e088b186b22d0c3c849 | |
parent | d7538dd5e3e04a8db22e1470cb2ed696bf3be160 (diff) | |
download | cpython-git-f8e9bd568adf85c1e4aea1dda542a96b027797e2.tar.gz |
bpo-35402: Update Windows build to use Tcl and Tk 8.6.9 (GH-11146)
-rw-r--r-- | Misc/NEWS.d/next/Windows/2018-12-13-13-30-04.bpo-35402.n_mXb2.rst | 1 | ||||
-rw-r--r-- | PCbuild/get_externals.bat | 6 | ||||
-rw-r--r-- | PCbuild/tcltk.props | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Misc/NEWS.d/next/Windows/2018-12-13-13-30-04.bpo-35402.n_mXb2.rst b/Misc/NEWS.d/next/Windows/2018-12-13-13-30-04.bpo-35402.n_mXb2.rst new file mode 100644 index 0000000000..56cf17c09d --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2018-12-13-13-30-04.bpo-35402.n_mXb2.rst @@ -0,0 +1 @@ +Update Windows build to use Tcl and Tk 8.6.9 diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 7a8de1e761..175a0513e7 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -51,8 +51,8 @@ set libraries= set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.0j set libraries=%libraries% sqlite-3.21.0.0 -if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.8.0 -if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.8.0 +if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0 +if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6 set libraries=%libraries% xz-5.2.2 set libraries=%libraries% zlib-1.2.11 @@ -73,7 +73,7 @@ echo.Fetching external binaries... set binaries= if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.0j -if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.8.0 +if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.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 0a59c0894d..b185cb7b1e 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -4,7 +4,7 @@ <PropertyGroup> <TclMajorVersion>8</TclMajorVersion> <TclMinorVersion>6</TclMinorVersion> - <TclPatchLevel>8</TclPatchLevel> + <TclPatchLevel>9</TclPatchLevel> <TclRevision>0</TclRevision> <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion> <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion> |