[Python-checkins] r61618 - python/trunk/Tools/buildbot/external-amd64.bat

Wed Mar 19 09:06:03 CET 2008

Author: trent.nelson
Date: Wed Mar 19 09:06:03 2008
New Revision: 61618
Modified:
 python/trunk/Tools/buildbot/external-amd64.bat
Log:
Fix the tcl-8.4.18.1 path and make sure we cd into the right directory when building tcl/tk.
Modified: python/trunk/Tools/buildbot/external-amd64.bat
==============================================================================

--- python/trunk/Tools/buildbot/external-amd64.bat	(original)
+++ python/trunk/Tools/buildbot/external-amd64.bat	Wed Mar 19 09:06:03 2008
@@ -22,7 +22,7 @@
 )
 
 @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 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
