diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-12-14 17:49:10 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2018-12-14 17:49:10 (GMT) |
| commit | 77824ef6e50e8a47a0b57df2d9f3b48bffd414ac (patch) | |
| tree | 02be84ebcdc2930e532f968dfa622721171858b5 | |
| parent | 5f252e1ebc098fff7f88fbf89d203b1dd15fe7fa (diff) | |
| download | cpython-77824ef6e50e8a47a0b57df2d9f3b48bffd414ac.zip cpython-77824ef6e50e8a47a0b57df2d9f3b48bffd414ac.tar.gz cpython-77824ef6e50e8a47a0b57df2d9f3b48bffd414ac.tar.bz2 | |
bpo-35402: Update Windows build to use Tcl and Tk 8.6.9 (GH-11146)
(cherry picked from commit f8e9bd568adf85c1e4aea1dda542a96b027797e2)
Co-authored-by: Steve Dower <steve.dower@microsoft.com>
| -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 0000000..56cf17c --- /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 7a8de1e..175a051 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 0a59c08..b185cb7 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> |