]> granicus.if.org Git - python/commitdiff
Issue #27647: Update Windows build to Tcl/Tk 8.6.6
authorZachary Ware <zachary.ware@gmail.com>
Thu, 28 Jul 2016 23:39:11 +0000 (18:39 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Thu, 28 Jul 2016 23:39:11 +0000 (18:39 -0500)
Misc/NEWS
PCbuild/get_externals.bat
PCbuild/readme.txt
PCbuild/tcltk.props

index 0872384b3ee999ab04d31973eae84c907a68497f..5e75997c8ce42f5ac4bf384182af3e23b5a884fe 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -70,6 +70,8 @@ Tests
 Windows
 -------
 
+- Issue #27647: Update bundled Tcl/Tk to 8.6.6.
+
 - Issue #27610: Adds PEP 514 metadata to Windows installer
 
 - Issue #27469: Adds a shell extension to the launcher so that drag and drop
index 9b2a084bc2f8d9bfef44cbef07e74df6a72d62fb..ff50af5d53abd07864dff396d4fbe3e6955b2e07 100644 (file)
@@ -56,8 +56,8 @@ set libraries=%libraries%                                    bzip2-1.0.6
 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06\r
 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2h\r
 set libraries=%libraries%                                    sqlite-3.8.11.0\r
-if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2\r
-if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2\r
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0\r
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6\r
 set libraries=%libraries%                                    xz-5.0.5\r
 \r
index 2046af9d3c93a8b4367f0d112ca0670b8782c0b5..7f488ae676258feeeff979b114b58fa656d769b2 100644 (file)
@@ -208,7 +208,7 @@ _sqlite3
     Homepage:\r
         http://www.sqlite.org/\r
 _tkinter\r
-    Wraps version 8.6.4 of the Tk windowing system.\r
+    Wraps version 8.6.6 of the Tk windowing system.\r
     Homepage:\r
         http://www.tcl.tk/\r
 \r
index 11dbffbdbfa32acc9cdb479db6a6799c536d2c93..57bb98aeebede41d6b6e539a1b1b54f7bbee86bd 100644 (file)
@@ -4,8 +4,8 @@
   <PropertyGroup>
     <TclMajorVersion>8</TclMajorVersion>
     <TclMinorVersion>6</TclMinorVersion>
-    <TclPatchLevel>4</TclPatchLevel>
-    <TclRevision>2</TclRevision>
+    <TclPatchLevel>6</TclPatchLevel>
+    <TclRevision>0</TclRevision>
     <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
     <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>
     <TkPatchLevel>$(TclPatchLevel)</TkPatchLevel>
@@ -42,4 +42,4 @@
     <BuildDirTop Condition="$(PlatformToolset) == 'v110'">$(BuildDirTop)_VC11</BuildDirTop>
     <BuildDirTop Condition="$(PlatformToolset) == 'v100'">$(BuildDirTop)_VC10</BuildDirTop>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>