* win/build.vc.bat: Improved tools detection and error message.

	* win/makefile.vc: Reorganized the $(TCLOBJ) file list into seperate
	parts for easier maintenance.  Matched all source built using -GL to
	both $(lib) and $(link) to use -LTCG and avoid a warning message.
	* win/nmakehlp.c: Removed -g option and GrepForDefine() func
	as it isn't being used anymore.  The -V option method is much
	better.

1 files changed, 20 insertions, 13 deletions

diff --git a/win/buildall.vc.bat b/win/buildall.vc.bat
index aff1bc6..6552ccd 100755
--- a/win/buildall.vc.bat
+++ b/win/buildall.vc.bat
@@ -3,7 +3,7 @@
 ::  edit this (or make your own) for your needs and wants using
 ::  the instructions for calling makefile.vc found in makefile.vc
 ::
-::  RCS: @(#) $Id: buildall.vc.bat,v 1.10 2008/10/02 19:01:30 mistachkin Exp $
+::  RCS: @(#) $Id: buildall.vc.bat,v 1.11 2009/01/19 19:54:19 davygrvy Exp $
 
 set SYMBOLS=
 
@@ -24,17 +24,24 @@ goto OPTIONS_DONE
 :: reset errorlevel
 cd > nul
 
+:: You might have installed your developer studio to add itself to the
+:: path or have already run vcvars32.bat.  Testing these envars proves
+:: cl.exe and friends are in your path.
+::
+if defined VCINSTALLDIR (goto :startBuilding)
+if defined MSDRVDIR     (goto :startBuilding)
+if defined MSVCDIR      (goto :startBuilding)
+if defined MSSDK        (goto :startBuilding)
+
 :: We need to run the development environment batch script that comes
-:: with developer studio (v4,5,6,7,etc...)  All have it.  These paths
-:: might not be correct.  You may need to edit these.
+:: with developer studio (v4,5,6,7,etc...)  All have it.  This path
+:: might not be correct.  You should call it yourself prior to running
+:: this batchfile.
 ::
-if not defined MSDevDir (
-    call "C:\Program Files\Microsoft Developer Studio\vc98\bin\vcvars32.bat"
-    ::call "C:\Program Files\Microsoft Developer Studio\vc\bin\vcvars32.bat"
-    ::call c:\dev\devstudio60\vc98\bin\vcvars32.bat
-    if errorlevel 1 goto no_vcvars
-)
+call "C:\Program Files\Microsoft Developer Studio\vc98\bin\vcvars32.bat"
+if errorlevel 1 (goto no_vcvars)
 
+:startBuilding
 
 echo.
 echo Sit back and have a cup of coffee while this grinds through ;)
@@ -102,15 +109,15 @@ echo *** BOOM! ***
 goto end
 
 :no_vcvars
-echo vcvars32.bat not found.  You'll need to edit this batch script.
+echo vcvars32.bat was not run prior to this batchfile, nor are the MS tools in your path.
 goto out
 
 :help
 title buildall.vc.bat help message
 echo usage:
-echo   %0           : builds Tcl for all build types (do this first)
-echo   %0 install   : installs all the release builds (do this second)
-echo   %0 symbols   : builds Tcl for all debugging build types
+echo   %0                 : builds Tcl for all build types (do this first)
+echo   %0 install         : installs all the release builds (do this second)
+echo   %0 symbols         : builds Tcl for all debugging build types
 echo   %0 symbols install : install all the debug builds.
 echo.
 goto out