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

Skip to content

Commit 910a4ed

Browse files
loewisloewis
committed
Upgrade Tcl/Tk to 8.5.9.
1 parent 09f4414 commit 910a4ed

5 files changed

Lines changed: 20 additions & 15 deletions

File tree

‎Misc/NEWS‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ Tools/Demos
7676
- Issue #10706: Remove outdated script runtests.sh. Either ``make test``
7777
or ``python -m test`` should be used instead.
7878

79+
Build
80+
-----
81+
82+
- The Windows build now uses Tcl/Tk 8.5.9.
83+
7984

8085
What's New in Python 3.2 Beta 1?
8186
================================

‎PCbuild/build_tkinter.py‎

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

14-
TCL = "tcl8.5.2"
15-
TK = "tk8.5.2"
14+
TCL = "tcl8.5.9"
15+
TK = "tk8.5.9"
1616
TIX = "tix-8.4.3.x"
1717

1818
ROOT = os.path.abspath(os.path.join(here, par, par))

‎Tools/buildbot/external-amd64.bat‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ call "Tools\buildbot\external-common.bat"
55
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
66

77
if not exist tcltk64\bin\tcl85g.dll (
8-
cd tcl-8.5.2.1\win
8+
cd tcl-8.5.9.0\win
99
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all
1010
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install
1111
cd ..\..
1212
)
1313

1414
if not exist tcltk64\bin\tk85g.dll (
15-
cd tk-8.5.2.0\win
16-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean
17-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 all
18-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 install
15+
cd tk-8.5.9.0\win
16+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 clean
17+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 all
18+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 install
1919
cd ..\..
2020
)
2121

‎Tools/buildbot/external-common.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4
3030
if not exist openssl-1.0.0a svn export http://svn.python.org/projects/external/openssl-1.0.0a
3131

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

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

‎Tools/buildbot/external.bat‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ call "%VS90COMNTOOLS%\vsvars32.bat"
66

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

1515
if not exist tcltk\bin\tk85g.dll (
16-
cd tk-8.5.2.0\win
17-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean
18-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all
19-
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 install
16+
cd tk-8.5.9.0\win
17+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 clean
18+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 all
19+
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 install
2020
cd ..\..
2121
)

0 commit comments

Comments
 (0)