Issue #27647: Update Windows build to Tcl/Tk 8.6.6

This commit is contained in:
Zachary Ware 2016-07-28 18:39:11 -05:00
parent 6276b47fd5
commit 28c3184d8d
4 changed files with 8 additions and 6 deletions

View File

@ -70,6 +70,8 @@ Tests
Windows Windows
------- -------
- Issue #27647: Update bundled Tcl/Tk to 8.6.6.
- Issue #27610: Adds PEP 514 metadata to Windows installer - Issue #27610: Adds PEP 514 metadata to Windows installer
- Issue #27469: Adds a shell extension to the launcher so that drag and drop - Issue #27469: Adds a shell extension to the launcher so that drag and drop

View File

@ -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% nasm-2.11.06
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h
set libraries=%libraries% sqlite-3.8.11.0 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% tcl-core-8.6.6.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6
set libraries=%libraries% xz-5.0.5 set libraries=%libraries% xz-5.0.5

View File

@ -208,7 +208,7 @@ _sqlite3
Homepage: Homepage:
http://www.sqlite.org/ http://www.sqlite.org/
_tkinter _tkinter
Wraps version 8.6.4 of the Tk windowing system. Wraps version 8.6.6 of the Tk windowing system.
Homepage: Homepage:
http://www.tcl.tk/ http://www.tcl.tk/

View File

@ -4,8 +4,8 @@
<PropertyGroup> <PropertyGroup>
<TclMajorVersion>8</TclMajorVersion> <TclMajorVersion>8</TclMajorVersion>
<TclMinorVersion>6</TclMinorVersion> <TclMinorVersion>6</TclMinorVersion>
<TclPatchLevel>4</TclPatchLevel> <TclPatchLevel>6</TclPatchLevel>
<TclRevision>2</TclRevision> <TclRevision>0</TclRevision>
<TkMajorVersion>$(TclMajorVersion)</TkMajorVersion> <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
<TkMinorVersion>$(TclMinorVersion)</TkMinorVersion> <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>
<TkPatchLevel>$(TclPatchLevel)</TkPatchLevel> <TkPatchLevel>$(TclPatchLevel)</TkPatchLevel>
@ -42,4 +42,4 @@
<BuildDirTop Condition="$(PlatformToolset) == 'v110'">$(BuildDirTop)_VC11</BuildDirTop> <BuildDirTop Condition="$(PlatformToolset) == 'v110'">$(BuildDirTop)_VC11</BuildDirTop>
<BuildDirTop Condition="$(PlatformToolset) == 'v100'">$(BuildDirTop)_VC10</BuildDirTop> <BuildDirTop Condition="$(PlatformToolset) == 'v100'">$(BuildDirTop)_VC10</BuildDirTop>
</PropertyGroup> </PropertyGroup>
</Project> </Project>