[TeamTalk 178]: [714] TeamTalk: 1) Bug fixing and java support in TeamTalkBuild. bat and TeamTalkRebuild.bat

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

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20070821/e0db2b5a/attachment.html
-------------- next part --------------
Modified: TeamTalk/TeamTalkBuild.bat
===================================================================
--- TeamTalk/TeamTalkBuild.bat	2007-08-21 21:30:26 UTC (rev 713)
+++ TeamTalk/TeamTalkBuild.bat	2007-08-22 03:16:18 UTC (rev 714)
@@ -18,7 +18,7 @@
 cd ..
 
 :Path should be set to include Visual Studio and JDK's binary directory
-TeamTalk-Tools\regTool\reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.6" /v JAVAHOME > temp\tempPath.txt
+::TeamTalk-Tools\regTool\reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.6" /v JAVAHOME > temp\tempPath.txt
 
 :Build the Visual Studio solutions
 
@@ -53,16 +53,12 @@
 
 IF NOT VSDrive == "Non-Existent" echo Building TeamTalk Agents -- This may take 3-9 Minutes, Please Wait...
 IF NOT VSDrive == "Non-Existent" cd Agents
-IF NOT VSDrive == "Non-Existent" @echo on
-IF NOT VSDrive == "Non-Existent" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.exe" Agents.sln /Build Release
-IF NOT VSDrive == "Non-Existent" @echo off
+IF NOT VSDrive == "Non-Existent" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Agents.sln /Build Release
 IF NOT VSDrive == "Non-Existent" cd ..
 
 IF NOT VSDrive == "Non-Existent" echo Building TeamTalk Tools -- This may take 1-3 Minutes, Please Wait..
 IF NOT VSDrive == "Non-Existent" cd Tools
-IF NOT VSDrive == "Non-Existent" @echo on
-IF NOT VSDrive == "Non-Existent" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.exe" Tools.sln /Build Release
-IF NOT VSDrive == "Non-Existent" @echo off
+IF NOT VSDrive == "Non-Existent" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Tools.sln /Build Release
 IF NOT VSDrive == "Non-Existent" cd ..
 
 IF VSDrive == "Non-Existent" echo TeamTalk Tools and Agents can not be built because the location of Microsoft Visual Studio 2005 can not be determined
@@ -101,10 +97,10 @@
 IF NOT JavaDrive == "Non-Existent" echo Building Java Pen Decoder
 
 IF NOT JavaDrive == "Non-Existent" cd Agents\PenDecoder\src\tk\utils
-IF NOT JavaDrive == "Non-Existent" "%JavaDrive%:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" *.java
+IF NOT JavaDrive == "Non-Existent" "%JavaDrive%:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" *.java -classpath ..\..\..\bsh-core-2.0b4.jar;..\..\..\bsh-util-2.0b4.jar;../../../../../Libraries/galaxy/contrib/MITRE/bindings/java/lib/galaxy.jar
 
 IF NOT JavaDrive == "Non-Existent" cd ..\..\edu\cmu\ravenclaw\pendecoder
-IF NOT JavaDrive == "Non-Existent" "%JavaDrive%:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" *.java
+IF NOT JavaDrive == "Non-Existent" "%JavaDrive%:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" *.java -classpath ..\..\..\..\..\bsh-core-2.0b4.jar;..\..\..\..\..\bsh-util-2.0b4.jar;../../../../../../../Libraries/galaxy/contrib/MITRE/bindings/java/lib/galaxy.jar;..\..\..\..\..\build\classes\;
 
 IF NOT JavaDrive == "Non-Existent" cd ..\..\..\..\..\..\..
 
@@ -122,7 +118,7 @@
 :: Remove the Temporary Path Storage File
 :: Return the path to its original state
 
-del temp\tempPath.txt
+IF EXIST temp\tempPath.txt del temp\tempPath.txt
 rmdir temp
 
 set PATH = %PATH%

Modified: TeamTalk/TeamTalkRebuild.bat
===================================================================
--- TeamTalk/TeamTalkRebuild.bat	2007-08-21 21:30:26 UTC (rev 713)
+++ TeamTalk/TeamTalkRebuild.bat	2007-08-22 03:16:18 UTC (rev 714)
@@ -53,16 +53,12 @@
 
 IF NOT VSDrive == "Non-Existent" echo Building TeamTalk Agents -- This may take 3-9 Minutes, Please Wait...
 IF NOT VSDrive == "Non-Existent" cd Agents
-IF NOT VSDrive == "Non-Existent" @echo on
-IF NOT VSDrive == "Non-Existent" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.exe" Agents.sln /Rebuild Release
-IF NOT VSDrive == "Non-Existent" @echo off
+IF NOT VSDrive == "Non-Existent" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Agents.sln /Rebuild Release
 IF NOT VSDrive == "Non-Existent" cd ..
 
 IF NOT VSDrive == "Non-Existent" echo Building TeamTalk Tools -- This may take 1-3 Minutes, Please Wait..
 IF NOT VSDrive == "Non-Existent" cd Tools
-IF NOT VSDrive == "Non-Existent" @echo on
-IF NOT VSDrive == "Non-Existent" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.exe" Tools.sln /Rebuild Release
-IF NOT VSDrive == "Non-Existent" @echo off
+IF NOT VSDrive == "Non-Existent" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Tools.sln /Rebuild Release
 IF NOT VSDrive == "Non-Existent" cd ..
 
 IF VSDrive == "Non-Existent" echo TeamTalk Tools and Agents can not be built because the location of Microsoft Visual Studio 2005 can not be determined