diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2013-11-23 22:05:27 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2013-11-23 22:05:27 (GMT) |
| commit | 8d0d369067462080f5ea9d50416a12bee0ef3a6a (patch) | |
| tree | 4bf748526445fdadbc29c0ca78d71e661098b256 /Tools/buildbot | |
| parent | 67986f94311ffb46fe5b3efce74d749029041b73 (diff) | |
| download | cpython-8d0d369067462080f5ea9d50416a12bee0ef3a6a.zip cpython-8d0d369067462080f5ea9d50416a12bee0ef3a6a.tar.gz cpython-8d0d369067462080f5ea9d50416a12bee0ef3a6a.tar.bz2 | |
Update Tcl/Tk to 8.6.1.
Diffstat (limited to 'Tools/buildbot')
| -rw-r--r-- | Tools/buildbot/external-amd64.bat | 14 | ||||
| -rw-r--r-- | Tools/buildbot/external-common.bat | 8 | ||||
| -rw-r--r-- | Tools/buildbot/external.bat | 14 |
3 files changed, 18 insertions, 18 deletions
diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat index a44c662..4c3b67b 100644 --- a/Tools/buildbot/external-amd64.bat +++ b/Tools/buildbot/external-amd64.bat @@ -4,18 +4,18 @@ call "Tools\buildbot\external-common.bat" call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 -if not exist tcltk64\bin\tcl85g.dll ( - cd tcl-8.5.11.0\win +if not exist tcltk64\bin\tcl86tg.dll ( + cd tcl-8.6.1.0\win nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install cd ..\.. ) -if not exist tcltk64\bin\tk85g.dll ( - cd tk-8.5.11.0\win - nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.11.0 clean - nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.11.0 all - nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.11.0 install +if not exist tcltk64\bin\tk86tg.dll ( + cd tk-8.6.1.0\win + nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 clean + nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 all + nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 install cd ..\.. ) diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index e8ee936..244abd2 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -30,11 +30,11 @@ if not exist openssl-1.0.1e ( ) @rem tcl/tk -if not exist tcl-8.5.11.0 ( - rd /s/q tcltk tcltk64 - svn export http://svn.python.org/projects/external/tcl-8.5.11.0 +if not exist tcl-8.6.1.0 ( + rd /s/q tcltk tcltk64 tcl-8.5.11.0 tk-8.5.11.0 + svn export http://svn.python.org/projects/external/tcl-8.6.1.0 ) -if not exist tk-8.5.11.0 svn export http://svn.python.org/projects/external/tk-8.5.11.0 +if not exist tk-8.6.1.0 svn export http://svn.python.org/projects/external/tk-8.6.1.0 @rem sqlite3 if not exist sqlite-3.8.1 ( diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat index 83b3861..c580a14 100644 --- a/Tools/buildbot/external.bat +++ b/Tools/buildbot/external.bat @@ -4,18 +4,18 @@ call "Tools\buildbot\external-common.bat" call "%VS100COMNTOOLS%\vsvars32.bat" -if not exist tcltk\bin\tcl85g.dll ( +if not exist tcltk\bin\tcl86tg.dll ( @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install - cd tcl-8.5.11.0\win + cd tcl-8.6.1.0\win nmake -f makefile.vc 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.11.0\win - nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.11.0 clean - nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.11.0 all - nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.11.0 install +if not exist tcltk\bin\tk86tg.dll ( + cd tk-8.6.1.0\win + nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 clean + nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 all + nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 install cd ..\.. ) |