[Python-checkins] bpo-35402: Update Windows build to use Tcl and Tk 8.6.9 (GH-11146)

Fri Dec 14 12:13:19 EST 2018

https://github.com/python/cpython/commit/f8e9bd568adf85c1e4aea1dda542a96b027797e2
commit: f8e9bd568adf85c1e4aea1dda542a96b027797e2
branch: master
author: Steve Dower <steve.dower at microsoft.com>
committer: GitHub <noreply at github.com>
date: 2018年12月14日T09:13:15-08:00
summary:
bpo-35402: Update Windows build to use Tcl and Tk 8.6.9 (GH-11146)
files:
A Misc/NEWS.d/next/Windows/2018-12-13-13-30-04.bpo-35402.n_mXb2.rst
M PCbuild/get_externals.bat
M PCbuild/tcltk.props

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 000000000000..56cf17c09dcf
--- /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 7a8de1e7612c..175a0513e77c 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 0a59c0894d74..b185cb7b1e28 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>
