[Python-checkins] r64271 - in python/trunk/Tools/buildbot: external-amd64.bat external.bat

[martin.v.loewis]

Author: martin.v.loewis
Date: Sat Jun 14 13:50:59 2008
New Revision: 64271

Log:
Avoid rebuilding tcl/tk.
Merge x86 changes into AMD64.


Modified:
   python/trunk/Tools/buildbot/external-amd64.bat
   python/trunk/Tools/buildbot/external.bat

Modified: python/trunk/Tools/buildbot/external-amd64.bat
==============================================================================
--- python/trunk/Tools/buildbot/external-amd64.bat	(original)
+++ python/trunk/Tools/buildbot/external-amd64.bat	Sat Jun 14 13:50:59 2008
@@ -6,12 +6,15 @@
 
 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
+    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.1\win    
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.2.1 clean all install
+    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 ..\..
 )

Modified: python/trunk/Tools/buildbot/external.bat
==============================================================================
--- python/trunk/Tools/buildbot/external.bat	(original)
+++ python/trunk/Tools/buildbot/external.bat	Sat Jun 14 13:50:59 2008
@@ -4,7 +4,7 @@
 call "Tools\buildbot\external-common.bat"
 call "%VS90COMNTOOLS%\vsvars32.bat"
 
-if not exist tcltk\bin\tcl85.dll (
+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 
@@ -12,7 +12,7 @@
     cd ..\..
 )
 
-if not exist tcltk\bin\tk85.dll (
+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