[TeamTalk 350]: [886] trunk/TeamTalk/TeamTalkBuild.bat: 1) Bug fixes in TeamTalkBuild. bat to make the program execution calls and registry searches successfully.

[bfrisch@edam.speech.cs.cmu.edu]

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071225/d4db8b18/attachment.html
-------------- next part --------------
Modified: trunk/TeamTalk/TeamTalkBuild.bat
===================================================================
--- trunk/TeamTalk/TeamTalkBuild.bat	2007-12-24 23:50:57 UTC (rev 885)
+++ trunk/TeamTalk/TeamTalkBuild.bat	2007-12-25 20:57:38 UTC (rev 886)
@@ -1,12 +1,12 @@
 @echo off
 
-title TeamTalk Code Build - Win32
-
 IF "%BUILD_TYPE%"=="" SET BUILD_TYPE=Build
 IF "%BUILD_CONF%"=="" SET BUILD_CONF=Release
 
 IF "%CYGWIN_DIR%"=="" SET CYGWIN_DIR=C:\cygwin
 
+title TeamTalk Code %BUILD_TYPE% - Win32 %BUILD_CONF%
+
 :: Check to make sure the file is not running with a wrong working directory
 IF NOT EXIST TeamTalkBuild.bat goto Error
 IF NOT EXIST TeamTalk.sln goto Error
@@ -38,7 +38,7 @@
   if "%VSTemp%"=="" goto VSWEND
   if not "%VSHome%"=="" set VSHome=%VSHome%\
   for /f "delims=\" %%x in ("%VSTemp%") do set VSHome=%VSHome%%%x
-  for /f "tokens=1,* delims=\" %%y in ("%VSTemp%") do set VSTemp=%%y
+  for /f "tokens=1,* delims=\" %%x in ("%VSTemp%") do set VSTemp=%%y
   goto VSWHILE
 :VSWEND
 set VSTemp=
@@ -76,19 +76,18 @@
 if errorlevel 1 goto JAVAERROR
 del reg1.txt
 del reg2.txt
-
+echo %JavaTemp% = Java Temp
 :: Convert double backslashes to single backslashes
 set JAVA_HOME=
-:WHILE
-  if "%JavaTemp%"=="" goto WEND
+:JAVA_WHILE
+  if "%JavaTemp%"=="" goto JAVA_WEND
   if not "%JAVA_HOME%"=="" set JAVA_HOME=%JAVA_HOME%\
   for /f "delims=\" %%x in ("%JavaTemp%") do set JAVA_HOME=%JAVA_HOME%%%x
-  for /f "tokens=1,* delims=\" %%y in ("%JavaTemp%") do set JavaTemp=%%y
-  goto WHILE
-:WEND
+  for /f "tokens=1,* delims=\" %%x in ("%JavaTemp%") do set JavaTemp=%%y
+  goto JAVA_WHILE
+:JAVA_WEND
 set JavaTemp=
 echo Java home path (per registy) = %JAVA_HOME%
-
 :: Test the java path to see if there really is a javac.exe
 IF NOT EXIST "%JAVA_HOME%\bin\javac.exe" goto JAVAERROR
 
@@ -99,29 +98,24 @@
 type reg1.txt | %windir%\system32\find.exe "InstallLocation" > reg2.txt
 if errorlevel 1 goto NETBEANSERROR
 for /f "tokens=2 delims==" %%x in (reg2.txt) do set NBPathTemp=%%~x
+echo NBPathTemp = %NBPathTemp%
 if errorlevel 1 goto NETBEANSERROR
 
 del reg1.txt
 del reg2.txt
 
-
-
 :: Convert double backslashes to single backslashes
-set JAVA_HOME=
-:WHILE
-  if "%NBPathTemp%"=="" goto WEND
-  if not "%NetBeansPath%"=="" set JAVA_HOME=%NetBeansPath%\
-  for /f "delims=\" %%x in ("%NBPathTemp%") do set JAVA_HOME=%NetBeansPath%%%x
-  for /f "tokens=1,* delims=\" %%y in ("%NBPathTemp%") do set NBPathTemp=%%y
-  goto WHILE
-:WEND
+set NetBeansPath=
+:NBWHILE
+  if "%NBPathTemp%"=="" goto NBWEND
+  if not "%NetBeansPath%"=="" set NetBeansPath=%NetBeansPath%\
+  for /f "delims=\" %%x in ("%NBPathTemp%") do set NetBeansPath=%NetBeansPath%%%x
+  for /f "tokens=1,* delims=\" %%x in ("%NBPathTemp%") do set NBPathTemp=%%y
+  goto NBWHILE
+:NBWEND
 set NBPathTemp=
 echo NetBeans Path (per registy) = %NetBeansPath%
 
-:: Test the java path to see if there really is a javac.exe
-IF NOT EXIST "%JAVA_HOME%\bin\javac.exe" goto JAVAERROR
-
-
 :Ant Compilation of PenDecoder using NetBeans 6.0
 CALL "%NetBeansPath%\java1\ant\bin\ant.bat" -buildfile Agents\PenDecoder\build.xml
 pause
@@ -133,7 +127,7 @@
 
 :MakeLM
 echo Now Executing MakeLM
-set TeamTalkRoot="%CD%"
+set TeamTalkRoot=%CD%
 cd "%OLYMPUS_ROOT%\Tools\MakeLM"
 echo perl makelm.pl --resourcesdir "%TeamTalkRoot%\Resources" --projectname TeamTalk
 perl makelm.pl --resourcesdir "%TeamTalkRoot%\Resources" --projectname TeamTalk
@@ -142,7 +136,7 @@
 GOTO Pause
 
 :VSERROR
-echo Can't find Visual Studio 8.0. Is it installed?
+echo Can't find Visual Studio 8.0 (2005). Is it installed?
 goto Pause
 
 :CYGERROR
@@ -161,6 +155,9 @@
 :ErrorNoOlympus
 echo Please set the OLYMPUS_ROOT environment variable to your Olympus installation root.
 echo You can do this by running the OlympusBuild.bat script in your Olympus directory.
+echo
+echo If you have already run OlympusBuild.bat, you may need to restart your computer
+echo and run this script again.
 goto Pause
 
 :Error message that says that the script was run outside of the TeamTalk directory.