]> granicus.if.org Git - python/commitdiff
bpo-35402: Update Windows build to use Tcl and Tk 8.6.9 (GH-11146)
authorSteve Dower <steve.dower@microsoft.com>
Fri, 14 Dec 2018 17:13:15 +0000 (09:13 -0800)
committerGitHub <noreply@github.com>
Fri, 14 Dec 2018 17:13:15 +0000 (09:13 -0800)
Misc/NEWS.d/next/Windows/2018-12-13-13-30-04.bpo-35402.n_mXb2.rst [new file with mode: 0644]
PCbuild/get_externals.bat
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 (file)
index 0000000..56cf17c
--- /dev/null
@@ -0,0 +1 @@
+Update Windows build to use Tcl and Tk 8.6.9
index 7a8de1e7612c544b3d7552fc5d7a887ec1b196fd..175a0513e77c25bc7595f0b7124ea751b2be0b50 100644 (file)
@@ -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 (
index 0a59c0894d7443dfbf63e23cdafd819697bfbfec..b185cb7b1e281865f9ec8c2feeceba8ffe38792b 100644 (file)
@@ -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>