Upgrade Tcl/Tk to 8.5.9.

diff --git a/Misc/NEWS b/Misc/NEWS
index 94116ce55a1a97899c06734207c1807464130a91..5323087729ddb2a8e18d56baf129c54446aadfb7 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -76,6 +76,11 @@ Tools/Demos
 - Issue #10706: Remove outdated script runtests.sh.  Either ``make test``
   or ``python -m test`` should be used instead.
 
+Build
+-----
+
+- The Windows build now uses Tcl/Tk 8.5.9.
+
 
 What's New in Python 3.2 Beta 1?
 ================================

diff --git a/PCbuild/build_tkinter.py b/PCbuild/build_tkinter.py
index 16e2997696a69f5a5cfeea8ef0babf80144d0ec9..eb1d092caa13ca8eb5502346a9fc9d8e106252ee 100644 (file)
--- a/PCbuild/build_tkinter.py
+++ b/PCbuild/build_tkinter.py
@@ -11,8 +11,8 @@ import sys
 here = os.path.abspath(os.path.dirname(__file__))
 par = os.path.pardir
 
-TCL = "tcl8.5.2"
-TK = "tk8.5.2"
+TCL = "tcl8.5.9"
+TK = "tk8.5.9"
 TIX = "tix-8.4.3.x"
 
 ROOT = os.path.abspath(os.path.join(here, par, par))

diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
index 0f46cf92ccdbbeadc80357da8dea37bf909f98f3..69b45c0f6fdb9c25403e7a2b011ec2c0216a5933 100644 (file)
--- a/Tools/buildbot/external-amd64.bat
+++ b/Tools/buildbot/external-amd64.bat
@@ -5,17 +5,17 @@ call "Tools\buildbot\external-common.bat"
 call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64\r
 \r
 if not exist tcltk64\bin\tcl85g.dll (\r
-    cd tcl-8.5.2.1\win\r
+    cd tcl-8.5.9.0\win\r
     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all\r
     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install\r
     cd ..\..\r
 )\r
 \r
 if not exist tcltk64\bin\tk85g.dll (\r
-    cd tk-8.5.2.0\win    \r
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean\r
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 all\r
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 install\r
+    cd tk-8.5.9.0\win    \r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 clean\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 all\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 install\r
     cd ..\..\r
 )\r
 \r

diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index bb274f774ad0eca23d2becdc16d884eb66e3dc9b..8f3c6d6f578a3f536058070325c350a24d68e40a 100644 (file)
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -30,11 +30,11 @@ if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4
 if not exist openssl-1.0.0a svn export http://svn.python.org/projects/external/openssl-1.0.0a\r
 \r
 @rem tcl/tk\r
-if not exist tcl-8.5.2.1 (\r
+if not exist tcl-8.5.9.0 (\r
    rd /s/q tcltk tcltk64\r
-   svn export http://svn.python.org/projects/external/tcl-8.5.2.1\r
+   svn export http://svn.python.org/projects/external/tcl-8.5.9.0\r
 )\r
-if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0\r
+if not exist tk-8.5.9.0 svn export http://svn.python.org/projects/external/tk-8.5.9.0\r
 \r
 @rem sqlite3\r
 if not exist sqlite-3.6.21 (\r

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index d6b18ae78f8b129b5a2c54631ff74d56f403d89f..9ed55926bd66c5c47db5e62dcb04f97c9b4542cf 100644 (file)
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -6,16 +6,16 @@ call "%VS90COMNTOOLS%\vsvars32.bat"
 \r
 if not exist tcltk\bin\tcl85g.dll (\r
     @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install\r
-    cd tcl-8.5.2.1\win\r
+    cd tcl-8.5.9.0\win\r
     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all \r
     nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install\r
     cd ..\..\r
 )\r
 \r
 if not exist tcltk\bin\tk85g.dll (\r
-    cd tk-8.5.2.0\win    \r
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean\r
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all\r
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 install\r
+    cd tk-8.5.9.0\win    \r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 clean\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 all\r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 install\r
     cd ..\..\r
 )\r