Switch to Tcl/Tk 8.5.

diff --git a/Misc/NEWS b/Misc/NEWS
index 4a93ba7b5e34a5fdcfabf40b21759ead0d5595f4..5bd09deea6026d047dc5ce597b4e766539b02d04 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -302,6 +302,8 @@ Library
 Build
 -----
 
+- The Windows installer now includes Tk 8.5.
+
 - Patch #1722225: Support QNX 6.
 
 - ``Lib/lib-old`` is now added to sys.path.

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 66b417f772ffef8a5c16e6a981716dff64e25515..bc9cc9d263c34449e19dc7f8fe47697eb4f12d52 100644 (file)
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -94,18 +94,18 @@
        />
        <UserMacro
                Name="tcltkLib"
-               Value="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib"
+               Value="$(tcltkDir)\lib\tcl85.lib $(tcltkDir)\lib\tk85.lib"
        />
        <UserMacro
                Name="tcltkLibDebug"
-               Value="$(tcltkDir)\lib\tcl84g.lib $(tcltkDir)\lib\tk84g.lib"
+               Value="$(tcltkDir)\lib\tcl85g.lib $(tcltkDir)\lib\tk85g.lib"
        />
        <UserMacro
                Name="tcltk64Lib"
-               Value="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib"
+               Value="$(tcltk64Dir)\lib\tcl85.lib $(tcltk64Dir)\lib\tk85.lib"
        />
        <UserMacro
                Name="tcltk64LibDebug"
-               Value="$(tcltk64Dir)\lib\tcl84g.lib $(tcltk64Dir)\lib\tk84g.lib"
+               Value="$(tcltk64Dir)\lib\tcl85g.lib $(tcltk64Dir)\lib\tk85g.lib"
        />
 </VisualStudioPropertySheet>

diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
index fdd695af63c8da1d0ec6a007201f709e515cb1cc..d82f54b8ae7019aeeb3148d05c55ace085338da6 100644 (file)
--- a/Tools/buildbot/external-amd64.bat
+++ b/Tools/buildbot/external-amd64.bat
@@ -4,14 +4,14 @@
 call "Tools\buildbot\external-common.bat"
 call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
 
-if not exist tcltk64\bin\tcl84g.dll (
-    cd tcl-8.4.18.2\win
+if not exist tcltk64\bin\tcl85g.dll (
+    cd tcl-8.5.2.1\win
     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install
     cd ..\..
 )
 
-if not exist tcltk64\bin\tk84g.dll (
-    cd tk-8.4.18.1\win    
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.4.18.2 clean all install
+if not exist tcltk64\bin\tk85g.dll (
+    cd tk-8.5.2.1\win    
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean all install
     cd ..\..
 )

diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index ecf9901ccc70454fd6a6c5570837d1722b36f896..d14ff520d1141210e35e026faf59e672a1385da2 100644 (file)
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -27,8 +27,11 @@ if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4
 if not exist openssl-0.9.8g svn export http://svn.python.org/projects/external/openssl-0.9.8g\r
 \r
 @rem tcl/tk\r
-if not exist tcl-8.4.18.2 svn export http://svn.python.org/projects/external/tcl-8.4.18.2\r
-if not exist tk-8.4.18.1 svn export http://svn.python.org/projects/external/tk-8.4.18.1\r
+if not exist tcl-8.5.2.1 (\r
+   rd /s/q tcltk tcltk64\r
+   svn export http://svn.python.org/projects/external/tcl-8.5.2.1\r
+)\r
+if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0\r
 \r
 @rem sqlite3\r
 if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4\r

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 411360560011a43d39d18223127f4e1fec77d6a3..3b0a5e6f881df77e9a612d081bcc5bf19be45d03 100644 (file)
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -4,14 +4,14 @@
 call "Tools\buildbot\external-common.bat"\r
 call "%VS90COMNTOOLS%\vsvars32.bat"\r
 \r
-if not exist tcltk\bin\tcl84g.dll (\r
-    cd tcl-8.4.18.2\win\r
+if not exist tcltk\bin\tcl85g.dll (\r
+    cd tcl-8.5.2.1\win\r
     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all install\r
     cd ..\..\r
 )\r
 \r
-if not exist tcltk\bin\tk84g.dll (\r
-    cd tk-8.4.18.1\win    \r
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.4.18.2 clean all install\r
+if not exist tcltk\bin\tk85g.dll (\r
+    cd tk-8.5.2.0\win    \r
+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean all install\r
     cd ..\..\r
 )\r