From: Zachary Ware Date: Tue, 22 Apr 2014 20:36:11 +0000 (-0500) Subject: Issue #21303, #20565: Updated the version of Tcl/Tk used on Windows X-Git-Tag: v2.7.7rc1~46 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6606edc8654a88b7925fc4b729d73e4c4da6c77;p=python Issue #21303, #20565: Updated the version of Tcl/Tk used on Windows from 8.5.2 to 8.5.15. --- diff --git a/Misc/NEWS b/Misc/NEWS index 8f424ffd62..643e2cd2bf 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -390,6 +390,12 @@ Documentation - Issue #19795: Improved markup of True/False constants. +Windows +------- + +- Issue #21303, #20565: Updated the version of Tcl/Tk included in the + installer from 8.5.2 to 8.5.15. + Whats' New in Python 2.7.6? =========================== diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat index e9c7011b51..c32726dddd 100644 --- a/Tools/buildbot/external-amd64.bat +++ b/Tools/buildbot/external-amd64.bat @@ -5,16 +5,16 @@ call "Tools\buildbot\external-common.bat" call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 if not exist tcltk64\bin\tcl85g.dll ( - cd tcl-8.5.2.1\win + cd tcl-8.5.15.0\win nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install cd ..\.. ) if not exist tcltk64\bin\tk85g.dll ( - cd tk-8.5.2.0\win - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 all - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 install + cd tk-8.5.15.0\win + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 clean + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 all + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.15.0 install cd ..\.. ) diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index 9668e2c1d3..2b4ba42bf3 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -10,13 +10,17 @@ cd .. @rem if exist tcl8.4.12 rd /s/q tcl8.4.12 @rem if exist tcl8.4.16 rd /s/q tcl8.4.16 @rem if exist tcl-8.4.18.1 rd /s/q tcl-8.4.18.1 +@rem if exist tcl-8.5.2.1 rd /s/q tcl-8.5.2.1 +@rem if exist tcl-8.5.15.0 rd /s/q tcl-8.5.15.0 @rem if exist tk8.4.12 rd /s/q tk8.4.12 @rem if exist tk8.4.16 rd /s/q tk8.4.16 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1 +@rem if exist tk-8.5.2.0 rd /s/q tk-8.5.2.0 +@rem if exist tk-8.5.15.0 rd /s/q tk-8.5.15.0 @rem if exist db-4.4.20 rd /s/q db-4.4.20 @rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0 @rem if exist openssl-0.9.8y rd /s/q openssl-0.9.8y -@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21 +@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21 @rem bzip if not exist bzip2-1.0.6 ( @@ -32,11 +36,11 @@ if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4 if not exist openssl-0.9.8y svn export http://svn.python.org/projects/external/openssl-0.9.8y @rem tcl/tk -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 tcl-8.5.15.0 ( + rd /s/q tcltk tcltk64 tcl-8.5.2.1 tk-8.5.2.0 + svn export http://svn.python.org/projects/external/tcl-8.5.15.0 ) -if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0 +if not exist tk-8.5.15.0 svn export http://svn.python.org/projects/external/tk-8.5.15.0 @rem sqlite3 if not exist sqlite-3.6.21 ( diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat index d90e8cefbb..e7fb393975 100644 --- a/Tools/buildbot/external.bat +++ b/Tools/buildbot/external.bat @@ -6,16 +6,16 @@ call "%VS90COMNTOOLS%\vsvars32.bat" if not exist tcltk\bin\tcl85g.dll ( @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install - cd tcl-8.5.2.1\win - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all + cd tcl-8.5.15.0\win + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install cd ..\.. ) if not exist tcltk\bin\tk85g.dll ( - cd tk-8.5.2.0\win - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all - nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 install + cd tk-8.5.15.0\win + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 clean + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 all + nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.15.0 install cd ..\.. )