Switch to Tcl/Tk 8.5.

5 files changed, 21 insertions, 16 deletions

diff --git a/Misc/NEWS b/Misc/NEWS
index 4a93ba7..5bd09de 100644
--- 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 66b417f..bc9cc9d 100644
--- 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 fdd695a..d82f54b 100644
--- 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 ecf9901..d14ff52 100644
--- 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

 

 @rem tcl/tk

-if not exist tcl-8.4.18.2 svn export http://svn.python.org/projects/external/tcl-8.4.18.2

-if not exist tk-8.4.18.1 svn export http://svn.python.org/projects/external/tk-8.4.18.1

+if not exist tcl-8.5.2.1 (

+   rd /s/q tcltk tcltk64

+   svn export http://svn.python.org/projects/external/tcl-8.5.2.1

+)

+if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0

 

 @rem sqlite3

 if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 4113605..3b0a5e6 100644
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -4,14 +4,14 @@
 call "Tools\buildbot\external-common.bat"

 call "%VS90COMNTOOLS%\vsvars32.bat"

 

-if not exist tcltk\bin\tcl84g.dll (

-    cd tcl-8.4.18.2\win

+if not exist tcltk\bin\tcl85g.dll (

+    cd tcl-8.5.2.1\win

     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all install

     cd ..\..

 )

 

-if not exist tcltk\bin\tk84g.dll (

-    cd tk-8.4.18.1\win    

-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.4.18.2 clean all install

+if not exist tcltk\bin\tk85g.dll (

+    cd tk-8.5.2.0\win    

+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean all install

     cd ..\..

 )