[TeamTalk 192]: [728] 1) Now the build scripts build the PenDecoder as well, via the setting in the NetBeans project.
bfrisch@edam.speech.cs.cmu.edu
bfrisch at edam.speech.cs.cmu.edu
Sun Sep 2 20:08:00 EDT 2007
An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20070902/2c86aeb1/attachment-0001.html
-------------- next part --------------
Modified: tags/BTH-0.2/TeamTalk/TeamTalkBuild.bat
===================================================================
--- tags/BTH-0.2/TeamTalk/TeamTalkBuild.bat 2007-08-30 20:24:27 UTC (rev 727)
+++ tags/BTH-0.2/TeamTalk/TeamTalkBuild.bat 2007-09-03 00:07:58 UTC (rev 728)
@@ -1,34 +1,28 @@
@echo off
-:: If Netbeans is updated change the NetBeans version to the current version of NetBeans as the default folder name will likely change.
-set NetBeansVer = 5.5.1
+:: If Netbeans and/or Java is updated change the NetBeans and/or version to the current version of NetBeans as the default folder name will likely change.
+set NetBeansVer=5.5.1
+set JDKVer=1.6.0_02
:Check to make sure the file is not running with a wrong working directory
title TeamTalk Code Build - Win32
IF NOT EXIST TeamTalkBuild.bat goto Error
IF NOT EXIST Agents\Agents.sln goto Error
IF NOT EXIST Tools\Tools.sln goto Error
-::Commented out as the tool is not used any more
-::IF NOT EXIST TeamTalk-Tools\regTool\reg.exe goto Error
IF NOT EXIST Tools\MakeLM\makelm.pl goto Error
:Make directories for logs, temp files, and builds if they do not exist already
echo Creating Working Directories
If NOT EXIST logs\nul mkdir logs > nul
-::Commented out as the temp directory is not used
-::IF NOT EXIST temp\nul mkdir temp > nul
IF NOT EXIST bin\nul mkdir bin > nul
cd bin
IF NOT EXIST x86-nt\nul mkdir x86-nt > nul
cd ..
+goto Java
-:Path should be set to include Visual Studio and JDK's binary directory
-::Commented out as the tool is not used any more
-::TeamTalk-Tools\regTool\reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.6" /v JAVAHOME > temp\tempPath.txt
-
:Build the Visual Studio solutions
-set VSDrive = Non-Existent
+set VSDrive=Non-Existent
IF EXIST "A:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com" set VSDrive=A
IF EXIST "B:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com" set VSDrive=B
@@ -62,53 +56,81 @@
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" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Tools.sln /Build Release
-IF NOT VSDrive == "Non-Existent" cd ..
+:: Do Not build TeamTalk Tools as there is nothing to build.
+::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" "%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
:Java Files Compilation
-set NetBeansDrive = Non-Existent
+set NetBeansDrive=Non-Existent
+set JavaDrive=Non-Existent
-IF EXIST "A:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=A
-IF EXIST "B:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=B
-IF EXIST "C:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=C
-IF EXIST "D:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansrive=D
-IF EXIST "E:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=E
-IF EXIST "F:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=F
-IF EXIST "G:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=G
-IF EXIST "H:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=H
-IF EXIST "I:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=I
-IF EXIST "J:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=J
-IF EXIST "K:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=K
-IF EXIST "L:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=L
-IF EXIST "M:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=M
-IF EXIST "N:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=N
-IF EXIST "O:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=O
-IF EXIST "P:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=P
-IF EXIST "Q:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Q
-IF EXIST "R:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=R
-IF EXIST "S:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=S
-IF EXIST "T:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=T
-IF EXIST "U:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=U
-IF EXIST "V:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=V
-IF EXIST "W:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=W
-IF EXIST "X:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=X
-IF EXIST "Y:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Y
-IF EXIST "Z:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Z
+IF EXIST "A:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=A
+IF EXIST "B:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=B
+IF EXIST "C:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=C
+IF EXIST "D:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=D
+IF EXIST "E:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=E
+IF EXIST "F:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=F
+IF EXIST "G:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=G
+IF EXIST "H:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=H
+IF EXIST "I:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=I
+IF EXIST "J:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=J
+IF EXIST "K:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=K
+IF EXIST "L:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=L
+IF EXIST "M:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=M
+IF EXIST "N:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=N
+IF EXIST "O:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=O
+IF EXIST "P:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=P
+IF EXIST "Q:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Q
+IF EXIST "R:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=R
+IF EXIST "S:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=S
+IF EXIST "T:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=T
+IF EXIST "U:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=U
+IF EXIST "V:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=V
+IF EXIST "W:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=W
+IF EXIST "X:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=X
+IF EXIST "Y:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Y
+IF EXIST "Z:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Z
-IF NOT NetBeansDrive == "Non-Existent" echo Building Java Pen Decoder
+IF NOT %JavaDrive% == "Non-Existent" set JAVA_HOME=%JavaDrive%:\Program Files\Java\jdk%JDKVer%
-IF NOT NetBeansDrive == "Non-Existent" cd Agents\PenDecoder\src\tk\utils
-IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\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 EXIST "A:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=A
+IF EXIST "B:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=B
+IF EXIST "C:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=C
+IF EXIST "D:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansrive=D
+IF EXIST "E:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=E
+IF EXIST "F:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=F
+IF EXIST "G:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=G
+IF EXIST "H:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=H
+IF EXIST "I:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=I
+IF EXIST "J:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=J
+IF EXIST "K:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=K
+IF EXIST "L:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=L
+IF EXIST "M:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=M
+IF EXIST "N:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=N
+IF EXIST "O:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=O
+IF EXIST "P:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=P
+IF EXIST "Q:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Q
+IF EXIST "R:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=R
+IF EXIST "S:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=S
+IF EXIST "T:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=T
+IF EXIST "U:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=U
+IF EXIST "V:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=V
+IF EXIST "W:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=W
+IF EXIST "X:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=X
+IF EXIST "Y:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Y
+IF EXIST "Z:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Z
-IF NOT NetBeansDrive == "Non-Existent" cd ..\..\edu\cmu\ravenclaw\pendecoder
-IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\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 NetBeansDrive == "Non-Existent" echo Building Java Pen Decoder
-IF NOT NetBeansDrive == "Non-Existent" cd ..\..\..\..\..\..\..
+IF NOT NetBeansDrive == "Non-Existent" cd Agents\PenDecoder
+IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat"
+IF NOT NetBeansDrive == "Non-Existent" cd ..\..
IF NetBeansDrive == "Non-Existent" echo The Pen Decoder can not be built because the location of NetBeans %NetBeansVer% can not be determined.
@@ -121,18 +143,15 @@
:Clean Up Changes
:: ---------------------
-:: Remove the Temporary Path Storage File
-:: Return the path to its original state
+:: Remove the environment variables
-:: Commented out as the Temp directory is not used.
-::IF EXIST temp\tempPath.txt del temp\tempPath.txt
-::If EXIST temp\nul rmdir temp
-::set PATH = %PATH%
+set VSDrive=
+set JavaDrive=
+set JAVA_HOME=
+set NetBeansDrive=
+set JDKVer=
+set NetBeansVer=
-set VSDrive =
-set NetBeansDrive =
-set NetBeansVer =
-
:: Don't display the message that the script was run in the wrong working directory as that was not the case
goto Pause
Modified: tags/BTH-0.2/TeamTalk/TeamTalkDebugBuild.bat
===================================================================
--- tags/BTH-0.2/TeamTalk/TeamTalkDebugBuild.bat 2007-08-30 20:24:27 UTC (rev 727)
+++ tags/BTH-0.2/TeamTalk/TeamTalkDebugBuild.bat 2007-09-03 00:07:58 UTC (rev 728)
@@ -1,34 +1,28 @@
@echo off
-:: If Netbeans is updated change the NetBeans version to the current version of NetBeans as the default folder name will likely change.
-set NetBeansVer = 5.5.1
+:: If Netbeans and/or Java is updated change the NetBeans and/or version to the current version of NetBeans as the default folder name will likely change.
+set NetBeansVer=5.5.1
+set JDKVer=1.6.0_02
:Check to make sure the file is not running with a wrong working directory
title TeamTalk Code Debug Build - Win32
IF NOT EXIST TeamTalkDebugBuild.bat goto Error
IF NOT EXIST Agents\Agents.sln goto Error
IF NOT EXIST Tools\Tools.sln goto Error
-::Commented out as the tool is not used any more
-::IF NOT EXIST TeamTalk-Tools\regTool\reg.exe goto Error
IF NOT EXIST Tools\MakeLM\makelm.pl goto Error
:Make directories for logs, temp files, and builds if they do not exist already
echo Creating Working Directories
If NOT EXIST logs\nul mkdir logs > nul
-::Commented out as the temp directory is not used
-::IF NOT EXIST temp\nul mkdir temp > nul
IF NOT EXIST bin\nul mkdir bin > nul
cd bin
IF NOT EXIST x86-nt\nul mkdir x86-nt > nul
cd ..
+goto Java
-:Path should be set to include Visual Studio and JDK's binary directory
-::Commented out as the tool is not used any more
-::TeamTalk-Tools\regTool\reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.6" /v JAVAHOME > temp\tempPath.txt
-
:Build the Visual Studio solutions
-set VSDrive = Non-Existent
+set VSDrive=Non-Existent
IF EXIST "A:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com" set VSDrive=A
IF EXIST "B:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com" set VSDrive=B
@@ -62,53 +56,81 @@
IF NOT VSDrive == "Non-Existent" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Agents.sln /Build Debug
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" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Tools.sln /Build Debug
-IF NOT VSDrive == "Non-Existent" cd ..
+:: Do Not build TeamTalk Tools as there is nothing to build.
+::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" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Tools.sln /Build Debug
+::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
:Java Files Compilation
-set NetBeansDrive = Non-Existent
+set NetBeansDrive=Non-Existent
+set JavaDrive=Non-Existent
-IF EXIST "A:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=A
-IF EXIST "B:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=B
-IF EXIST "C:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=C
-IF EXIST "D:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansrive=D
-IF EXIST "E:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=E
-IF EXIST "F:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=F
-IF EXIST "G:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=G
-IF EXIST "H:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=H
-IF EXIST "I:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=I
-IF EXIST "J:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=J
-IF EXIST "K:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=K
-IF EXIST "L:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=L
-IF EXIST "M:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=M
-IF EXIST "N:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=N
-IF EXIST "O:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=O
-IF EXIST "P:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=P
-IF EXIST "Q:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Q
-IF EXIST "R:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=R
-IF EXIST "S:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=S
-IF EXIST "T:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=T
-IF EXIST "U:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=U
-IF EXIST "V:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=V
-IF EXIST "W:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=W
-IF EXIST "X:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=X
-IF EXIST "Y:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Y
-IF EXIST "Z:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Z
+IF EXIST "A:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=A
+IF EXIST "B:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=B
+IF EXIST "C:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=C
+IF EXIST "D:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=D
+IF EXIST "E:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=E
+IF EXIST "F:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=F
+IF EXIST "G:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=G
+IF EXIST "H:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=H
+IF EXIST "I:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=I
+IF EXIST "J:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=J
+IF EXIST "K:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=K
+IF EXIST "L:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=L
+IF EXIST "M:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=M
+IF EXIST "N:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=N
+IF EXIST "O:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=O
+IF EXIST "P:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=P
+IF EXIST "Q:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Q
+IF EXIST "R:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=R
+IF EXIST "S:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=S
+IF EXIST "T:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=T
+IF EXIST "U:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=U
+IF EXIST "V:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=V
+IF EXIST "W:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=W
+IF EXIST "X:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=X
+IF EXIST "Y:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Y
+IF EXIST "Z:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Z
-IF NOT NetBeansDrive == "Non-Existent" echo Building Java Pen Decoder
+IF NOT %JavaDrive% == "Non-Existent" set JAVA_HOME=%JavaDrive%:\Program Files\Java\jdk%JDKVer%
-IF NOT NetBeansDrive == "Non-Existent" cd Agents\PenDecoder\src\tk\utils
-IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\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 EXIST "A:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=A
+IF EXIST "B:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=B
+IF EXIST "C:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=C
+IF EXIST "D:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansrive=D
+IF EXIST "E:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=E
+IF EXIST "F:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=F
+IF EXIST "G:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=G
+IF EXIST "H:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=H
+IF EXIST "I:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=I
+IF EXIST "J:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=J
+IF EXIST "K:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=K
+IF EXIST "L:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=L
+IF EXIST "M:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=M
+IF EXIST "N:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=N
+IF EXIST "O:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=O
+IF EXIST "P:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=P
+IF EXIST "Q:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Q
+IF EXIST "R:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=R
+IF EXIST "S:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=S
+IF EXIST "T:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=T
+IF EXIST "U:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=U
+IF EXIST "V:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=V
+IF EXIST "W:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=W
+IF EXIST "X:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=X
+IF EXIST "Y:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Y
+IF EXIST "Z:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Z
-IF NOT NetBeansDrive == "Non-Existent" cd ..\..\edu\cmu\ravenclaw\pendecoder
-IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\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 NetBeansDrive == "Non-Existent" echo Building Java Pen Decoder
-IF NOT NetBeansDrive == "Non-Existent" cd ..\..\..\..\..\..\..
+IF NOT NetBeansDrive == "Non-Existent" cd Agents\PenDecoder
+IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat"
+IF NOT NetBeansDrive == "Non-Existent" cd ..\..
IF NetBeansDrive == "Non-Existent" echo The Pen Decoder can not be built because the location of NetBeans %NetBeansVer% can not be determined.
@@ -121,18 +143,15 @@
:Clean Up Changes
:: ---------------------
-:: Remove the Temporary Path Storage File
-:: Return the path to its original state
+:: Remove the environment variables
-:: Commented out as the Temp directory is not used.
-::IF EXIST temp\tempPath.txt del temp\tempPath.txt
-::If EXIST temp\nul rmdir temp
-::set PATH = %PATH%
+set VSDrive=
+set JavaDrive=
+set JAVA_HOME=
+set NetBeansDrive=
+set JDKVer=
+set NetBeansVer=
-set VSDrive =
-set NetBeansDrive =
-set NetBeansVer =
-
:: Don't display the message that the script was run in the wrong working directory as that was not the case
goto Pause
Modified: tags/BTH-0.2/TeamTalk/TeamTalkRebuild.bat
===================================================================
--- tags/BTH-0.2/TeamTalk/TeamTalkRebuild.bat 2007-08-30 20:24:27 UTC (rev 727)
+++ tags/BTH-0.2/TeamTalk/TeamTalkRebuild.bat 2007-09-03 00:07:58 UTC (rev 728)
@@ -1,34 +1,28 @@
@echo off
-:: If Netbeans is updated change the NetBeans version to the current version of NetBeans as the default folder name will likely change.
-set NetBeansVer = 5.5.1
+:: If Netbeans and/or Java is updated change the NetBeans and/or version to the current version of NetBeans as the default folder name will likely change.
+set NetBeansVer=5.5.1
+set JDKVer=1.6.0_02
:Check to make sure the file is not running with a wrong working directory
title TeamTalk Code Rebuild - Win32
IF NOT EXIST TeamTalkRebuild.bat goto Error
IF NOT EXIST Agents\Agents.sln goto Error
IF NOT EXIST Tools\Tools.sln goto Error
-::Commented out as the tool is not used any more
-::IF NOT EXIST TeamTalk-Tools\regTool\reg.exe goto Error
IF NOT EXIST Tools\MakeLM\makelm.pl goto Error
:Make directories for logs, temp files, and builds if they do not exist already
echo Creating Working Directories
If NOT EXIST logs\nul mkdir logs > nul
-::Commented out as the temp directory is not used
-::IF NOT EXIST temp\nul mkdir temp > nul
IF NOT EXIST bin\nul mkdir bin > nul
cd bin
IF NOT EXIST x86-nt\nul mkdir x86-nt > nul
cd ..
+goto Java
-:Path should be set to include Visual Studio and JDK's binary directory
-::Commented out as the tool is not used any more
-::TeamTalk-Tools\regTool\reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.6" /v JAVAHOME > temp\tempPath.txt
-
:Build the Visual Studio solutions
-set VSDrive = Non-Existent
+set VSDrive=Non-Existent
IF EXIST "A:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com" set VSDrive=A
IF EXIST "B:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com" set VSDrive=B
@@ -62,53 +56,81 @@
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" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Tools.sln /Rebuild Release
-IF NOT VSDrive == "Non-Existent" cd ..
+:: Do Not build TeamTalk Tools as there is nothing to build.
+::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" "%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
:Java Files Compilation
-set NetBeansDrive = Non-Existent
+set NetBeansDrive=Non-Existent
+set JavaDrive=Non-Existent
-IF EXIST "A:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=A
-IF EXIST "B:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=B
-IF EXIST "C:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=C
-IF EXIST "D:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansrive=D
-IF EXIST "E:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=E
-IF EXIST "F:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=F
-IF EXIST "G:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=G
-IF EXIST "H:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=H
-IF EXIST "I:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=I
-IF EXIST "J:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=J
-IF EXIST "K:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=K
-IF EXIST "L:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=L
-IF EXIST "M:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=M
-IF EXIST "N:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=N
-IF EXIST "O:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=O
-IF EXIST "P:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=P
-IF EXIST "Q:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Q
-IF EXIST "R:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=R
-IF EXIST "S:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=S
-IF EXIST "T:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=T
-IF EXIST "U:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=U
-IF EXIST "V:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=V
-IF EXIST "W:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=W
-IF EXIST "X:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=X
-IF EXIST "Y:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Y
-IF EXIST "Z:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Z
+IF EXIST "A:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=A
+IF EXIST "B:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=B
+IF EXIST "C:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=C
+IF EXIST "D:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=D
+IF EXIST "E:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=E
+IF EXIST "F:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=F
+IF EXIST "G:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=G
+IF EXIST "H:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=H
+IF EXIST "I:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=I
+IF EXIST "J:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=J
+IF EXIST "K:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=K
+IF EXIST "L:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=L
+IF EXIST "M:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=M
+IF EXIST "N:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=N
+IF EXIST "O:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=O
+IF EXIST "P:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=P
+IF EXIST "Q:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Q
+IF EXIST "R:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=R
+IF EXIST "S:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=S
+IF EXIST "T:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=T
+IF EXIST "U:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=U
+IF EXIST "V:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=V
+IF EXIST "W:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=W
+IF EXIST "X:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=X
+IF EXIST "Y:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Y
+IF EXIST "Z:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Z
-IF NOT NetBeansDrive == "Non-Existent" echo Building Java Pen Decoder
+IF NOT %JavaDrive% == "Non-Existent" set JAVA_HOME=%JavaDrive%:\Program Files\Java\jdk%JDKVer%
-IF NOT NetBeansDrive == "Non-Existent" cd Agents\PenDecoder\src\tk\utils
-IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\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 EXIST "A:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=A
+IF EXIST "B:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=B
+IF EXIST "C:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=C
+IF EXIST "D:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansrive=D
+IF EXIST "E:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=E
+IF EXIST "F:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=F
+IF EXIST "G:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=G
+IF EXIST "H:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=H
+IF EXIST "I:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=I
+IF EXIST "J:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=J
+IF EXIST "K:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=K
+IF EXIST "L:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=L
+IF EXIST "M:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=M
+IF EXIST "N:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=N
+IF EXIST "O:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=O
+IF EXIST "P:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=P
+IF EXIST "Q:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Q
+IF EXIST "R:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=R
+IF EXIST "S:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=S
+IF EXIST "T:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=T
+IF EXIST "U:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=U
+IF EXIST "V:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=V
+IF EXIST "W:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=W
+IF EXIST "X:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=X
+IF EXIST "Y:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Y
+IF EXIST "Z:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Z
-IF NOT NetBeansDrive == "Non-Existent" cd ..\..\edu\cmu\ravenclaw\pendecoder
-IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\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 NetBeansDrive == "Non-Existent" echo Building Java Pen Decoder
-IF NOT NetBeansDrive == "Non-Existent" cd ..\..\..\..\..\..\..
+IF NOT NetBeansDrive == "Non-Existent" cd Agents\PenDecoder
+IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat"
+IF NOT NetBeansDrive == "Non-Existent" cd ..\..
IF NetBeansDrive == "Non-Existent" echo The Pen Decoder can not be built because the location of NetBeans %NetBeansVer% can not be determined.
@@ -121,18 +143,15 @@
:Clean Up Changes
:: ---------------------
-:: Remove the Temporary Path Storage File
-:: Return the path to its original state
+:: Remove the environment variables
-:: Commented out as the Temp directory is not used.
-::IF EXIST temp\tempPath.txt del temp\tempPath.txt
-::If EXIST temp\nul rmdir temp
-::set PATH = %PATH%
+set VSDrive=
+set JavaDrive=
+set JAVA_HOME=
+set NetBeansDrive=
+set JDKVer=
+set NetBeansVer=
-set VSDrive =
-set NetBeansDrive =
-set NetBeansVer =
-
:: Don't display the message that the script was run in the wrong working directory as that was not the case
goto Pause
Modified: trunk/TeamTalk/TeamTalkBuild.bat
===================================================================
--- trunk/TeamTalk/TeamTalkBuild.bat 2007-08-30 20:24:27 UTC (rev 727)
+++ trunk/TeamTalk/TeamTalkBuild.bat 2007-09-03 00:07:58 UTC (rev 728)
@@ -1,34 +1,28 @@
@echo off
-:: If Netbeans is updated change the NetBeans version to the current version of NetBeans as the default folder name will likely change.
-set NetBeansVer = 5.5.1
+:: If Netbeans and/or Java is updated change the NetBeans and/or version to the current version of NetBeans as the default folder name will likely change.
+set NetBeansVer=5.5.1
+set JDKVer=1.6.0_02
:Check to make sure the file is not running with a wrong working directory
title TeamTalk Code Build - Win32
IF NOT EXIST TeamTalkBuild.bat goto Error
IF NOT EXIST Agents\Agents.sln goto Error
IF NOT EXIST Tools\Tools.sln goto Error
-::Commented out as the tool is not used any more
-::IF NOT EXIST TeamTalk-Tools\regTool\reg.exe goto Error
IF NOT EXIST Tools\MakeLM\makelm.pl goto Error
:Make directories for logs, temp files, and builds if they do not exist already
echo Creating Working Directories
If NOT EXIST logs\nul mkdir logs > nul
-::Commented out as the temp directory is not used
-::IF NOT EXIST temp\nul mkdir temp > nul
IF NOT EXIST bin\nul mkdir bin > nul
cd bin
IF NOT EXIST x86-nt\nul mkdir x86-nt > nul
cd ..
+goto Java
-:Path should be set to include Visual Studio and JDK's binary directory
-::Commented out as the tool is not used any more
-::TeamTalk-Tools\regTool\reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.6" /v JAVAHOME > temp\tempPath.txt
-
:Build the Visual Studio solutions
-set VSDrive = Non-Existent
+set VSDrive=Non-Existent
IF EXIST "A:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com" set VSDrive=A
IF EXIST "B:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com" set VSDrive=B
@@ -62,53 +56,81 @@
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" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Tools.sln /Build Release
-IF NOT VSDrive == "Non-Existent" cd ..
+:: Do Not build TeamTalk Tools as there is nothing to build.
+::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" "%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
:Java Files Compilation
-set NetBeansDrive = Non-Existent
+set NetBeansDrive=Non-Existent
+set JavaDrive=Non-Existent
-IF EXIST "A:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=A
-IF EXIST "B:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=B
-IF EXIST "C:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=C
-IF EXIST "D:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansrive=D
-IF EXIST "E:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=E
-IF EXIST "F:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=F
-IF EXIST "G:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=G
-IF EXIST "H:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=H
-IF EXIST "I:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=I
-IF EXIST "J:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=J
-IF EXIST "K:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=K
-IF EXIST "L:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=L
-IF EXIST "M:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=M
-IF EXIST "N:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=N
-IF EXIST "O:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=O
-IF EXIST "P:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=P
-IF EXIST "Q:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Q
-IF EXIST "R:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=R
-IF EXIST "S:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=S
-IF EXIST "T:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=T
-IF EXIST "U:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=U
-IF EXIST "V:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=V
-IF EXIST "W:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=W
-IF EXIST "X:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=X
-IF EXIST "Y:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Y
-IF EXIST "Z:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Z
+IF EXIST "A:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=A
+IF EXIST "B:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=B
+IF EXIST "C:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=C
+IF EXIST "D:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=D
+IF EXIST "E:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=E
+IF EXIST "F:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=F
+IF EXIST "G:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=G
+IF EXIST "H:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=H
+IF EXIST "I:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=I
+IF EXIST "J:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=J
+IF EXIST "K:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=K
+IF EXIST "L:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=L
+IF EXIST "M:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=M
+IF EXIST "N:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=N
+IF EXIST "O:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=O
+IF EXIST "P:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=P
+IF EXIST "Q:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Q
+IF EXIST "R:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=R
+IF EXIST "S:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=S
+IF EXIST "T:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=T
+IF EXIST "U:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=U
+IF EXIST "V:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=V
+IF EXIST "W:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=W
+IF EXIST "X:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=X
+IF EXIST "Y:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Y
+IF EXIST "Z:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Z
-IF NOT NetBeansDrive == "Non-Existent" echo Building Java Pen Decoder
+IF NOT %JavaDrive% == "Non-Existent" set JAVA_HOME=%JavaDrive%:\Program Files\Java\jdk%JDKVer%
-IF NOT NetBeansDrive == "Non-Existent" cd Agents\PenDecoder\src\tk\utils
-IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\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 EXIST "A:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=A
+IF EXIST "B:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=B
+IF EXIST "C:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=C
+IF EXIST "D:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansrive=D
+IF EXIST "E:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=E
+IF EXIST "F:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=F
+IF EXIST "G:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=G
+IF EXIST "H:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=H
+IF EXIST "I:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=I
+IF EXIST "J:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=J
+IF EXIST "K:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=K
+IF EXIST "L:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=L
+IF EXIST "M:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=M
+IF EXIST "N:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=N
+IF EXIST "O:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=O
+IF EXIST "P:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=P
+IF EXIST "Q:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Q
+IF EXIST "R:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=R
+IF EXIST "S:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=S
+IF EXIST "T:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=T
+IF EXIST "U:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=U
+IF EXIST "V:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=V
+IF EXIST "W:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=W
+IF EXIST "X:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=X
+IF EXIST "Y:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Y
+IF EXIST "Z:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Z
-IF NOT NetBeansDrive == "Non-Existent" cd ..\..\edu\cmu\ravenclaw\pendecoder
-IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\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 NetBeansDrive == "Non-Existent" echo Building Java Pen Decoder
-IF NOT NetBeansDrive == "Non-Existent" cd ..\..\..\..\..\..\..
+IF NOT NetBeansDrive == "Non-Existent" cd Agents\PenDecoder
+IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat"
+IF NOT NetBeansDrive == "Non-Existent" cd ..\..
IF NetBeansDrive == "Non-Existent" echo The Pen Decoder can not be built because the location of NetBeans %NetBeansVer% can not be determined.
@@ -121,18 +143,15 @@
:Clean Up Changes
:: ---------------------
-:: Remove the Temporary Path Storage File
-:: Return the path to its original state
+:: Remove the environment variables
-:: Commented out as the Temp directory is not used.
-::IF EXIST temp\tempPath.txt del temp\tempPath.txt
-::If EXIST temp\nul rmdir temp
-::set PATH = %PATH%
+set VSDrive=
+set JavaDrive=
+set JAVA_HOME=
+set NetBeansDrive=
+set JDKVer=
+set NetBeansVer=
-set VSDrive =
-set NetBeansDrive =
-set NetBeansVer =
-
:: Don't display the message that the script was run in the wrong working directory as that was not the case
goto Pause
Modified: trunk/TeamTalk/TeamTalkDebugBuild.bat
===================================================================
--- trunk/TeamTalk/TeamTalkDebugBuild.bat 2007-08-30 20:24:27 UTC (rev 727)
+++ trunk/TeamTalk/TeamTalkDebugBuild.bat 2007-09-03 00:07:58 UTC (rev 728)
@@ -1,34 +1,28 @@
@echo off
-:: If Netbeans is updated change the NetBeans version to the current version of NetBeans as the default folder name will likely change.
-set NetBeansVer = 5.5.1
+:: If Netbeans and/or Java is updated change the NetBeans and/or version to the current version of NetBeans as the default folder name will likely change.
+set NetBeansVer=5.5.1
+set JDKVer=1.6.0_02
:Check to make sure the file is not running with a wrong working directory
title TeamTalk Code Debug Build - Win32
IF NOT EXIST TeamTalkDebugBuild.bat goto Error
IF NOT EXIST Agents\Agents.sln goto Error
IF NOT EXIST Tools\Tools.sln goto Error
-::Commented out as the tool is not used any more
-::IF NOT EXIST TeamTalk-Tools\regTool\reg.exe goto Error
IF NOT EXIST Tools\MakeLM\makelm.pl goto Error
:Make directories for logs, temp files, and builds if they do not exist already
echo Creating Working Directories
If NOT EXIST logs\nul mkdir logs > nul
-::Commented out as the temp directory is not used
-::IF NOT EXIST temp\nul mkdir temp > nul
IF NOT EXIST bin\nul mkdir bin > nul
cd bin
IF NOT EXIST x86-nt\nul mkdir x86-nt > nul
cd ..
+goto Java
-:Path should be set to include Visual Studio and JDK's binary directory
-::Commented out as the tool is not used any more
-::TeamTalk-Tools\regTool\reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.6" /v JAVAHOME > temp\tempPath.txt
-
:Build the Visual Studio solutions
-set VSDrive = Non-Existent
+set VSDrive=Non-Existent
IF EXIST "A:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com" set VSDrive=A
IF EXIST "B:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com" set VSDrive=B
@@ -62,53 +56,81 @@
IF NOT VSDrive == "Non-Existent" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Agents.sln /Build Debug
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" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Tools.sln /Build Debug
-IF NOT VSDrive == "Non-Existent" cd ..
+:: Do Not build TeamTalk Tools as there is nothing to build.
+::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" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Tools.sln /Build Debug
+::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
:Java Files Compilation
-set NetBeansDrive = Non-Existent
+set NetBeansDrive=Non-Existent
+set JavaDrive=Non-Existent
-IF EXIST "A:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=A
-IF EXIST "B:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=B
-IF EXIST "C:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=C
-IF EXIST "D:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansrive=D
-IF EXIST "E:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=E
-IF EXIST "F:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=F
-IF EXIST "G:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=G
-IF EXIST "H:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=H
-IF EXIST "I:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=I
-IF EXIST "J:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=J
-IF EXIST "K:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=K
-IF EXIST "L:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=L
-IF EXIST "M:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=M
-IF EXIST "N:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=N
-IF EXIST "O:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=O
-IF EXIST "P:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=P
-IF EXIST "Q:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Q
-IF EXIST "R:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=R
-IF EXIST "S:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=S
-IF EXIST "T:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=T
-IF EXIST "U:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=U
-IF EXIST "V:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=V
-IF EXIST "W:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=W
-IF EXIST "X:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=X
-IF EXIST "Y:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Y
-IF EXIST "Z:\Program Files\Java\jdk1.6.0_02\bin\javac.exe" set NetBeansDrive=Z
+IF EXIST "A:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=A
+IF EXIST "B:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=B
+IF EXIST "C:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=C
+IF EXIST "D:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=D
+IF EXIST "E:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=E
+IF EXIST "F:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=F
+IF EXIST "G:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=G
+IF EXIST "H:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=H
+IF EXIST "I:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=I
+IF EXIST "J:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=J
+IF EXIST "K:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=K
+IF EXIST "L:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=L
+IF EXIST "M:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=M
+IF EXIST "N:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=N
+IF EXIST "O:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=O
+IF EXIST "P:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=P
+IF EXIST "Q:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Q
+IF EXIST "R:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=R
+IF EXIST "S:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=S
+IF EXIST "T:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=T
+IF EXIST "U:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=U
+IF EXIST "V:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=V
+IF EXIST "W:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=W
+IF EXIST "X:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=X
+IF EXIST "Y:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Y
+IF EXIST "Z:\Program Files\Java\jdk%JDKVer%\bin\javac.exe" set JavaDrive=Z
-IF NOT NetBeansDrive == "Non-Existent" echo Building Java Pen Decoder
+IF NOT %JavaDrive% == "Non-Existent" set JAVA_HOME=%JavaDrive%:\Program Files\Java\jdk%JDKVer%
-IF NOT NetBeansDrive == "Non-Existent" cd Agents\PenDecoder\src\tk\utils
-IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\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 EXIST "A:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=A
+IF EXIST "B:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=B
+IF EXIST "C:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=C
+IF EXIST "D:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansrive=D
+IF EXIST "E:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=E
+IF EXIST "F:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=F
+IF EXIST "G:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=G
+IF EXIST "H:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=H
+IF EXIST "I:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=I
+IF EXIST "J:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=J
+IF EXIST "K:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=K
+IF EXIST "L:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=L
+IF EXIST "M:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=M
+IF EXIST "N:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=N
+IF EXIST "O:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=O
+IF EXIST "P:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=P
+IF EXIST "Q:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Q
+IF EXIST "R:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=R
+IF EXIST "S:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=S
+IF EXIST "T:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=T
+IF EXIST "U:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=U
+IF EXIST "V:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=V
+IF EXIST "W:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=W
+IF EXIST "X:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=X
+IF EXIST "Y:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Y
+IF EXIST "Z:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat" set NetBeansDrive=Z
-IF NOT NetBeansDrive == "Non-Existent" cd ..\..\edu\cmu\ravenclaw\pendecoder
-IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\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 NetBeansDrive == "Non-Existent" echo Building Java Pen Decoder
-IF NOT NetBeansDrive == "Non-Existent" cd ..\..\..\..\..\..\..
+IF NOT NetBeansDrive == "Non-Existent" cd Agents\PenDecoder
+IF NOT NetBeansDrive == "Non-Existent" "%NetBeansDrive%:\Program Files\netbeans-%NetBeansVer%\ide7\ant\bin\ant.bat"
+IF NOT NetBeansDrive == "Non-Existent" cd ..\..
IF NetBeansDrive == "Non-Existent" echo The Pen Decoder can not be built because the location of NetBeans %NetBeansVer% can not be determined.
@@ -121,18 +143,15 @@
:Clean Up Changes
:: ---------------------
-:: Remove the Temporary Path Storage File
-:: Return the path to its original state
+:: Remove the environment variables
-:: Commented out as the Temp directory is not used.
-::IF EXIST temp\tempPath.txt del temp\tempPath.txt
-::If EXIST temp\nul rmdir temp
-::set PATH = %PATH%
+set VSDrive=
+set JavaDrive=
+set JAVA_HOME=
+set NetBeansDrive=
+set JDKVer=
+set NetBeansVer=
-set VSDrive =
-set NetBeansDrive =
-set NetBeansVer =
-
:: Don't display the message that the script was run in the wrong working directory as that was not the case
goto Pause
Modified: trunk/TeamTalk/TeamTalkRebuild.bat
===================================================================
--- trunk/TeamTalk/TeamTalkRebuild.bat 2007-08-30 20:24:27 UTC (rev 727)
+++ trunk/TeamTalk/TeamTalkRebuild.bat 2007-09-03 00:07:58 UTC (rev 728)
@@ -1,34 +1,28 @@
@echo off
-:: If Netbeans is updated change the NetBeans version to the current version of NetBeans as the default folder name will likely change.
-set NetBeansVer = 5.5.1
+:: If Netbeans and/or Java is updated change the NetBeans and/or version to the current version of NetBeans as the default folder name will likely change.
+set NetBeansVer=5.5.1
+set JDKVer=1.6.0_02
:Check to make sure the file is not running with a wrong working directory
title TeamTalk Code Rebuild - Win32
IF NOT EXIST TeamTalkRebuild.bat goto Error
IF NOT EXIST Agents\Agents.sln goto Error
IF NOT EXIST Tools\Tools.sln goto Error
-::Commented out as the tool is not used any more
-::IF NOT EXIST TeamTalk-Tools\regTool\reg.exe goto Error
IF NOT EXIST Tools\MakeLM\makelm.pl goto Error
:Make directories for logs, temp files, and builds if they do not exist already
echo Creating Working Directories
If NOT EXIST logs\nul mkdir logs > nul
-::Commented out as the temp directory is not used
-::IF NOT EXIST temp\nul mkdir temp > nul
IF NOT EXIST bin\nul mkdir bin > nul
cd bin
IF NOT EXIST x86-nt\nul mkdir x86-nt > nul
cd ..
+goto Java
-:Path should be set to include Visual Studio and JDK's binary directory
-::Commented out as the tool is not used any more
-::TeamTalk-Tools\regTool\reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.6" /v JAVAHOME > temp\tempPath.txt
-
:Build the Visual Studio solutions
-set VSDrive = Non-Existent
+set VSDrive=Non-Existent
IF EXIST "A:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com" set VSDrive=A
IF EXIST "B:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com" set VSDrive=B
@@ -62,53 +56,81 @@
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" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Tools.sln /Rebuild Release
-IF NOT VSDrive == "Non-Existent" cd ..
+:: Do Not build TeamTalk Tools as there is nothing to build.
+::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" "%VSDrive%:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv" Tools.sln /Rebuild Release
@@ Diff output truncated at 60000 characters. @@
More information about the TeamTalk-developers
mailing list