Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8d0d369

Browse files
loewisloewis
committed
Update Tcl/Tk to 8.6.1.
1 parent 67986f9 commit 8d0d369

7 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎Misc/NEWS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ Documentation
402402
Build
403403
-----
404404

405-
- Update SQLite to 3.8.1 and xz to 5.0.5 on Windows.
405+
- Update SQLite to 3.8.1, xz to 5.0.5, and Tcl/Tk to 8.6.1 on Windows.
406406

407407
- Issue #16632: Enable DEP and ASLR on Windows.
408408

‎PCbuild/build_tkinter.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
here = os.path.abspath(os.path.dirname(__file__))
1212
par = os.path.pardir
1313

14-
TCL = "tcl8.5.11"
15-
TK = "tk8.5.11"
16-
TIX = "tix-8.4.3.x"
14+
TCL = "tcl8.6.1"
15+
TK = "tk8.6.1"
16+
TIX = "tix-8.4.3.3"
1717

1818
ROOT = os.path.abspath(os.path.join(here, par, par))
1919
NMAKE = ('nmake /nologo /f %s %s %s')

‎PCbuild/pyproject.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
<opensslDir>$(externalsDir)\openssl-1.0.1e</opensslDir>
2424
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
2525
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
26-
<tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib>
27-
<tcltkLibDebug>$(tcltkDir)\lib\tcl85g.lib;$(tcltkDir)\lib\tk85g.lib</tcltkLibDebug>
28-
<tcltk64Lib>$(tcltk64Dir)\lib\tcl85.lib;$(tcltk64Dir)\lib\tk85.lib</tcltk64Lib>
29-
<tcltk64LibDebug>$(tcltk64Dir)\lib\tcl85g.lib;$(tcltk64Dir)\lib\tk85g.lib</tcltk64LibDebug>
26+
<tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>
27+
<tcltkLibDebug>$(tcltkDir)\lib\tcl86tg.lib;$(tcltkDir)\lib\tk86tg.lib</tcltkLibDebug>
28+
<tcltk64Lib>$(tcltk64Dir)\lib\tcl86t.lib;$(tcltk64Dir)\lib\tk86t.lib</tcltk64Lib>
29+
<tcltk64LibDebug>$(tcltk64Dir)\lib\tcl86tg.lib;$(tcltk64Dir)\lib\tk86tg.lib</tcltk64LibDebug>
3030
</PropertyGroup>
3131
<ItemDefinitionGroup>
3232
<ClCompile>

‎PCbuild/readme.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ _sqlite3
211211
Homepage:
212212
http://www.sqlite.org/
213213
_tkinter
214-
Wraps version 8.5.11 of the Tk windowing system.
214+
Wraps version 8.6.1 of the Tk windowing system.
215215
Homepage:
216216
http://www.tcl.tk/
217217

@@ -261,7 +261,7 @@ The external-amd64.bat file contains this for tcl:
261261
So for a release build, you'd call it as:
262262
nmake -f makefile.vc MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install
263263

264-
Note that the above command is called from within ..\..\tcl-8.5.11.0\win
264+
Note that the above command is called from within ..\..\tcl-8.6.1.0\win
265265
(relative to this directory); don't forget to build Tk as well as Tcl!
266266

267267
This will be cleaned up in the future; http://bugs.python.org/issue15968

‎Tools/buildbot/external-amd64.bat‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
call "Tools\buildbot\external-common.bat"
55
call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
66

7-
if not exist tcltk64\bin\tcl85g.dll (
8-
cd tcl-8.5.11.0\win
7+
if not exist tcltk64\bin\tcl86tg.dll (
8+
cd tcl-8.6.1.0\win
99
nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all
1010
nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install
1111
cd ..\..
1212
)
1313

14-
if not exist tcltk64\bin\tk85g.dll (
15-
cd tk-8.5.11.0\win
16-
nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.11.0 clean
17-
nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.11.0 all
18-
nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.11.0 install
14+
if not exist tcltk64\bin\tk86tg.dll (
15+
cd tk-8.6.1.0\win
16+
nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 clean
17+
nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 all
18+
nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 install
1919
cd ..\..
2020
)
2121

‎Tools/buildbot/external-common.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ if not exist openssl-1.0.1e (
3030
)
3131

3232
@rem tcl/tk
33-
if not exist tcl-8.5.11.0 (
34-
rd /s/q tcltk tcltk64
35-
svn export http://svn.python.org/projects/external/tcl-8.5.11.0
33+
if not exist tcl-8.6.1.0 (
34+
rd /s/q tcltk tcltk64 tcl-8.5.11.0 tk-8.5.11.0
35+
svn export http://svn.python.org/projects/external/tcl-8.6.1.0
3636
)
37-
if not exist tk-8.5.11.0 svn export http://svn.python.org/projects/external/tk-8.5.11.0
37+
if not exist tk-8.6.1.0 svn export http://svn.python.org/projects/external/tk-8.6.1.0
3838

3939
@rem sqlite3
4040
if not exist sqlite-3.8.1 (

‎Tools/buildbot/external.bat‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
call "Tools\buildbot\external-common.bat"
55
call "%VS100COMNTOOLS%\vsvars32.bat"
66

7-
if not exist tcltk\bin\tcl85g.dll (
7+
if not exist tcltk\bin\tcl86tg.dll (
88
@rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
9-
cd tcl-8.5.11.0\win
9+
cd tcl-8.6.1.0\win
1010
nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk clean all
1111
nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install
1212
cd ..\..
1313
)
1414

15-
if not exist tcltk\bin\tk85g.dll (
16-
cd tk-8.5.11.0\win
17-
nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.11.0 clean
18-
nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.11.0 all
19-
nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.11.0 install
15+
if not exist tcltk\bin\tk86tg.dll (
16+
cd tk-8.6.1.0\win
17+
nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 clean
18+
nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 all
19+
nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 install
2020
cd ..\..
2121
)

0 commit comments

Comments
 (0)