summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorTrent Nelson <trent.nelson@snakebite.org>2008-03-19 08:06:03 (GMT)
committerTrent Nelson <trent.nelson@snakebite.org>2008-03-19 08:06:03 (GMT)
commit4fbaacaa129b36f69b88245d27dd0f6b5e832335 (patch)
treebb278045339a8e664bab5e9e2b94b95ae88abf3c /Tools
parent97e863eaf85f9186bbe5e556e32a85465c8dab43 (diff)
downloadcpython-4fbaacaa129b36f69b88245d27dd0f6b5e832335.zip
cpython-4fbaacaa129b36f69b88245d27dd0f6b5e832335.tar.gz
cpython-4fbaacaa129b36f69b88245d27dd0f6b5e832335.tar.bz2
Fix the tcl-8.4.18.1 path and make sure we cd into the right directory when building tcl/tk.
Diffstat (limited to 'Tools')
-rw-r--r--Tools/buildbot/external-amd64.bat12
1 files changed, 6 insertions, 6 deletions
diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
index 7a8b169..45fb11c 100644
--- a/Tools/buildbot/external-amd64.bat
+++ b/Tools/buildbot/external-amd64.bat
@@ -22,7 +22,7 @@ if not exist openssl-0.9.8g (
)
@rem tcltk
-if not exist tcl8.4.18.1 (
+if not exist tcl-8.4.18.1 (
if exist tcltk rd /s/q tcltk
if exist tcl8.4.12 rd /s/q tcl8.4.12
if exist tk8.4.12 rd /s/q tk8.4.12
@@ -30,12 +30,12 @@ if not exist tcl8.4.18.1 (
if exist tk8.4.16 rd /s/q tk8.4.16
svn export http://svn.python.org/projects/external/tcl-8.4.18.1
svn export http://svn.python.org/projects/external/tk-8.4.18.1
- cd tcl-8.4.18.1
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=../../tcltk64 clean all install
- cd ..\..
- cd tk-8.4.18.1
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=../../tcltk64 TCLDIR=../../tcl-8.4.18.1 clean all install
)
+cd tcl-8.4.18.1\win
+nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=../../tcltk64 clean all install
+cd ..\..
+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.1 clean all install
@rem sqlite
if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4