Browse Source
bpo-39107: Updated Tcl and Tk to 8.6.10 in Windows installer (GH-22405)
pull/22777/head
Steve Dower
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
6 additions and
6 deletions
-
Misc/NEWS.d/next/Windows/2020-09-24-23-09-40.bpo-39107.GbUZvD.rst
-
PCbuild/get_externals.bat
-
PCbuild/tcltk.props
|
|
|
@ -0,0 +1 @@ |
|
|
|
Update Tcl and Tk to 8.6.10 in Windows installer. |
|
|
|
@ -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 ( |
|
|
|
|
|
|
|
@ -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> |
|
|
|
|
