commit 329d7383802ef9e0b144fbc5349ad42a50dfeea7
author Martin v. Löwis <martin@v.loewis.de> Thu Jun 12 19:51:59 2008 +0000
committer Martin v. Löwis <martin@v.loewis.de> Thu Jun 12 19:51:59 2008 +0000
tree 9fd892dcdbbb9fee9921a66256be26aaf3050454
parent a41be1d1d2a7f77a5271ac95402ff162b3017348

Split Tcl make targets into separate ones.

Tools/buildbot/external.bat

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
index 3b0a5e6..592c585 100644
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -4,14 +4,18 @@
 call "Tools\buildbot\external-common.bat"

 call "%VS90COMNTOOLS%\vsvars32.bat"

 

-if not exist tcltk\bin\tcl85g.dll (

+if not exist tcltk\bin\tcl85.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 install

+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all 

+    nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install

     cd ..\..

 )

 

-if not exist tcltk\bin\tk85g.dll (

+if not exist tcltk\bin\tk85.dll (

     cd tk-8.5.2.0\win    

-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean all install

+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 clean

+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 all

+    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.2.1 install

     cd ..\..

 )