diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2016-07-28 23:39:11 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2016-07-28 23:39:11 (GMT) |
| commit | 28c3184d8d45c9d59ee7b7e67570354847ba4539 (patch) | |
| tree | 8a95df0f69c3ba2a416224df879c19034dec6cee | |
| parent | 6276b47fd5bb6ad7abec686070be816484888efe (diff) | |
| download | cpython-28c3184d8d45c9d59ee7b7e67570354847ba4539.zip cpython-28c3184d8d45c9d59ee7b7e67570354847ba4539.tar.gz cpython-28c3184d8d45c9d59ee7b7e67570354847ba4539.tar.bz2 | |
Issue #27647: Update Windows build to Tcl/Tk 8.6.6
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 4 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 | ||||
| -rw-r--r-- | PCbuild/tcltk.props | 6 |
4 files changed, 8 insertions, 6 deletions
@@ -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 diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 9b2a084..ff50af5 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -56,8 +56,8 @@ set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h
set libraries=%libraries% sqlite-3.8.11.0
-if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2
-if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6
set libraries=%libraries% xz-5.0.5
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 2046af9..7f488ae 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -208,7 +208,7 @@ _sqlite3 Homepage:
http://www.sqlite.org/
_tkinter
- Wraps version 8.6.4 of the Tk windowing system.
+ Wraps version 8.6.6 of the Tk windowing system.
Homepage:
http://www.tcl.tk/
diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props index 11dbffb..57bb98a 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -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> |