Avoid rebuilding tcl/tk.

Merge x86 changes into AMD64.

diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
index d82f54b8ae7019aeeb3148d05c55ace085338da6..d43681d3af6559212c7e27f9726b795211600163 100644 (file)
--- a/Tools/buildbot/external-amd64.bat
+++ b/Tools/buildbot/external-amd64.bat
@@ -6,12 +6,15 @@ call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
 
 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 ..\..
 )

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index a849526ff451734d99d968689952ecbb31a0b6ab..d6b18ae78f8b129b5a2c54631ff74d56f403d89f 100644 (file)
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -4,7 +4,7 @@
 call "Tools\buildbot\external-common.bat"\r
 call "%VS90COMNTOOLS%\vsvars32.bat"\r
 \r
-if not exist tcltk\bin\tcl85.dll (\r
+if not exist tcltk\bin\tcl85g.dll (\r
     @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install\r
     cd tcl-8.5.2.1\win\r
     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all \r
@@ -12,7 +12,7 @@ if not exist tcltk\bin\tcl85.dll (
     cd ..\..\r
 )\r
 \r
-if not exist tcltk\bin\tk85.dll (\r
+if not exist tcltk\bin\tk85g.dll (\r
     cd tk-8.5.2.0\win    \r
     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean\r
     nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all\r