diff options
| author | Steve Dower <steve.dower@python.org> | 2020-10-19 16:55:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-19 16:55:10 +0100 |
| commit | 985f0ab3ad5e8e9a8d7fc53026c38390b1f2b466 (patch) | |
| tree | 6b53006edd64209e68d2519eddcea8e918385f36 | |
| parent | ebc8c3828779374b9be4fae5c8ffc0059d36ac8c (diff) | |
| download | cpython-git-985f0ab3ad5e8e9a8d7fc53026c38390b1f2b466.tar.gz | |
bpo-39107: Updated Tcl and Tk to 8.6.10 in Windows installer (GH-22405)
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2020-09-24-23-09-40.bpo-39107.GbUZvD.rst | 1 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 6 | ||||
| -rw-r--r-- | PCbuild/tcltk.props | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Misc/NEWS.d/next/Windows/2020-09-24-23-09-40.bpo-39107.GbUZvD.rst b/Misc/NEWS.d/next/Windows/2020-09-24-23-09-40.bpo-39107.GbUZvD.rst new file mode 100644 index 0000000000..889ad48140 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2020-09-24-23-09-40.bpo-39107.GbUZvD.rst @@ -0,0 +1 @@ +Update Tcl and Tk to 8.6.10 in Windows installer. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 3bb281904f..799c46641f 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -55,8 +55,8 @@ set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1g set libraries=%libraries% sqlite-3.33.0.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% tcl-core-8.6.10.0 +if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.10.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 @@ -78,7 +78,7 @@ echo.Fetching external binaries... set binaries= if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1g -if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0 +if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.10.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 7fcd3e1c61..fb61bee514 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -4,7 +4,7 @@ <PropertyGroup> <TclMajorVersion>8</TclMajorVersion> <TclMinorVersion>6</TclMinorVersion> - <TclPatchLevel>9</TclPatchLevel> + <TclPatchLevel>10</TclPatchLevel> <TclRevision>0</TclRevision> <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion> <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion> @@ -36,8 +36,7 @@ <BuildDirTop>Release</BuildDirTop> <BuildDirTop Condition="$(Configuration) == 'Debug'">Debug</BuildDirTop> <BuildDirTop Condition="$(TclMachine) != 'IX86'">$(BuildDirTop)_$(TclMachine)</BuildDirTop> - <BuildDirTop Condition="$(PlatformToolset) == 'v141'">$(BuildDirTop)_VC13</BuildDirTop> - <BuildDirTop Condition="$(PlatformToolset) == 'v140'">$(BuildDirTop)_VC13</BuildDirTop> + <BuildDirTop Condition="$(PlatformToolset.StartsWith('v14'))">$(BuildDirTop)_VC13</BuildDirTop> <BuildDirTop Condition="$(PlatformToolset) == 'v120'">$(BuildDirTop)_VC12</BuildDirTop> <BuildDirTop Condition="$(PlatformToolset) == 'v110'">$(BuildDirTop)_VC11</BuildDirTop> <BuildDirTop Condition="$(PlatformToolset) == 'v100'">$(BuildDirTop)_VC10</BuildDirTop> |