diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-06-13 14:11:59 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-06-13 14:11:59 (GMT) |
| commit | f38e0d0c8ced2dd009d9afccc444a42b729dc009 (patch) | |
| tree | 6b9a776e664c120465142d76ba3bf9dee95881a6 /Tools/buildbot/external-amd64.bat | |
| parent | 59683e852906736276df6b8146064666098071b5 (diff) | |
| download | cpython-f38e0d0c8ced2dd009d9afccc444a42b729dc009.zip cpython-f38e0d0c8ced2dd009d9afccc444a42b729dc009.tar.gz cpython-f38e0d0c8ced2dd009d9afccc444a42b729dc009.tar.bz2 | |
Merged revisions 64185-64196 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64185 | martin.v.loewis | 2008-06-12 20:38:47 +0200 (Do, 12 Jun 2008) | 1 line
Switch to Tcl/Tk 8.5.2.
........
r64189 | martin.v.loewis | 2008-06-12 20:52:00 +0200 (Do, 12 Jun 2008) | 1 line
Switch to Tcl/Tk 8.5.
........
r64191 | martin.v.loewis | 2008-06-12 21:00:14 +0200 (Do, 12 Jun 2008) | 1 line
Revert bogus disabling of Tcl and Tk.
........
r64194 | martin.v.loewis | 2008-06-12 21:51:59 +0200 (Do, 12 Jun 2008) | 1 line
Split Tcl make targets into separate ones.
........
r64195 | martin.v.loewis | 2008-06-12 22:06:18 +0200 (Do, 12 Jun 2008) | 1 line
Support file names which include '+' (for Tk 8.5).
........
r64196 | martin.v.loewis | 2008-06-12 22:07:53 +0200 (Do, 12 Jun 2008) | 1 line
Fix Tcl/Tk license file in tcl8*/tk8*, include Tix license.
........
Diffstat (limited to 'Tools/buildbot/external-amd64.bat')
| -rw-r--r-- | Tools/buildbot/external-amd64.bat | 10 |
1 files changed, 5 insertions, 5 deletions
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 ..\.. ) |