[TeamTalk 352]: [888] trunk/TeamTalk: 1) Removing now useless echos from TeamTalkBuild.bat

Tue Dec 25 18:42:40 EST 2007

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071225/fc4c69bf/attachment-0001.html
-------------- next part --------------
Modified: trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config
===================================================================

--- trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config	2007-12-25 21:59:47 UTC (rev 887)
+++ trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-desktop.config	2007-12-25 23:42:38 UTC (rev 888)
@@ -34,7 +34,7 @@
 
 ############### Olympus Generic Processes #######################
 
-PROCESS: $OLYMPUS_BIN\KalliopeSwift -maxconns 6 -config swift.cfg
+PROCESS: $OLYMPUS_BIN\KalliopeSAPI -maxconns 6 -config swift.cfg
 PROCESS_MONITOR_ARGS: --start
 PROCESS_TITLE: Kalliope
 

Modified: trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-virtual.config
===================================================================
--- trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-virtual.config	2007-12-25 21:59:47 UTC (rev 887)
+++ trunk/TeamTalk/Configurations/DesktopConfiguration/startlist-virtual.config	2007-12-25 23:42:38 UTC (rev 888)
@@ -1,6 +1,7 @@
-#directories
-EXPAND: $GC_HOME ..\..\Libraries\Galaxy
-EXPAND: $MITRE_ROOT $GC_HOME\contrib\MITRE
+EXPAND: $OLYMPUS_ROOT %OLYMPUS_ROOT
+EXPAND: $OLYMPUS_BIN $OLYMPUS_ROOT/Bin/x86-nt
+EXPAND: $UT2004 %UT2K4_ROOT%
+
 EXPAND: $TEAMTALK ..\..
 EXPAND: $CONFIGURATION $TEAMTALK\Configurations\DesktopConfiguration
 EXPAND: $AGENTS $TEAMTALK\Agents
@@ -10,28 +11,21 @@
 EXPAND: $RESOURCES $TEAMTALK\Resources
 EXPAND: $GRAMMAR $RESOURCES\Grammar
 EXPAND: $DECODER $RESOURCES\DecoderConfig
-EXPAND: $UT2004 C:\UT2004
 
-#programs
 EXPAND: $JAVAEXE java
 EXPAND: $PERL perl
 
-#other config
-EXPAND: $BTHSIM_SERVER rampsold.speech.cs.cmu.edu
+TITLE: TeamTalk Virtual System
 
-TITLE: TeamTalk
+############### TeamTalk Specific Processes ######################
 
-PROCESS: $JAVAEXE -classpath bsh-core-2.0b4.jar;bsh-util-2.0b4.jar;jiu.jar;dist/PenDecoder.jar;$MITRE_ROOT/bindings/java/lib/galaxy.jar edu.cmu.ravenclaw.pendecoder.PenDecoderServer -port 11002 -peerfile $CONFIGURATION\peerfile.txt
+PROCESS: $JAVAEXE -classpath dist/lib/bsh-core-2.0b4.jar;dist/lib/bsh-util-2.0b4.jar;dist/PenDecoder.jar;dist/lib/galaxy.jar edu.cmu.ravenclaw.pendecoder.PenDecoderServer -port 11002 -peerfile $CONFIGURATION\peerfile.txt
 PROCESS_WORKDIR: $PENDECODER
 PROCESS_MONITOR_ARGS: --start
 PROCESS_TITLE: PenDecoder
 
-PROCESS: $BIN\KalliopeSwift.exe -maxconns 6 -config swift.cfg
+PROCESS: $BIN\TeamTalkBackend -verbosity 1 -maxconns 6
 PROCESS_MONITOR_ARGS: --start
-PROCESS_TITLE: Kalliope
-
-PROCESS: $BIN\TeamTalkBackend.exe -verbosity 1 -maxconns 6
-PROCESS_MONITOR_ARGS: --start
 PROCESS_TITLE: TeamTalkBackend
 
 PROCESS: $PERL -I../Rosetta bin/TeamTalk
@@ -39,28 +33,40 @@
 PROCESS_MONITOR_ARGS: --start
 PROCESS_TITLE: Rosetta
 
-PROCESS: $BIN\NlgServer2.exe -maxconns 6 -nlghost localhost
+############### Olympus Generic Processes #######################
+
+PROCESS: $OLYMPUS_BIN\KalliopeSAPI -maxconns 6 -config swift.cfg
 PROCESS_MONITOR_ARGS: --start
+PROCESS_TITLE: Kalliope
+
+PROCESS: $OLYMPUS_BIN\NlgServer -maxconns 6 -nlghost localhost
+PROCESS_MONITOR_ARGS: --start
 PROCESS_TITLE: NLGServer
 
-PROCESS: $BIN\phoenix2.exe -maxconns 6 -grammardir $GRAMMAR -grammarfn $GRAMMAR\TeamTalk.net
+PROCESS: $OLYMPUS_BIN\phoenix -maxconns 6 -grammardir $GRAMMAR -grammarfn $GRAMMAR\TeamTalk.net
 PROCESS_MONITOR_ARGS: --start
 PROCESS_TITLE: Phoenix
 
-PROCESS: $BIN\Audio_Server-DEBUG.exe -maxconns 6 -sps 16000 -engine_list sphinx_engines.txt
+PROCESS: $OLYMPUS_BIN\AudioServer -maxconns 6 -config AudioServer.cfg
 PROCESS_MONITOR_ARGS: --start
-PROCESS_TITLE: Audio_Server
+PROCESS_TITLE: AudioServer
 
-PROCESS: $BIN\Sphinx_Engine -name male -argfn male-16khz.arg -port 9990
+PROCESS: $OLYMPUS_BIN\PocketSphinxEngine -name desktop -argfn desktop.arg -port 9990
 PROCESS_WORKDIR: $DECODER
 PROCESS_MONITOR_ARGS: --start
-PROCESS_TITLE: Sphinx_Male
+PROCESS_TITLE: PocketSphinx
 
-PROCESS: $GC_HOME\bin\x86-nt\HUB.exe -verbosity 3 -pgm_file TeamTalk-hub-desktop-skeleton.pgm
+PROCESS: $OLYMPUS_BIN\HUB -verbosity 3 -pgm_file TeamTalk-hub-desktop-skeleton.pgm
 PROCESS_MONITOR_ARGS: --start
 PROCESS_TITLE: Hub
 
+PROCESS: $OLYMPUS_BIN\Apollo -maxconns 6 -config Apollo.cfg
+PROCESS_MONITOR_ARGS: --start
+PROCESS_TITLE: Apollo
+
+############### Virtual System Process #######################
 PROCESS: $UT2004\System\UT2004 $BTHSIM_SERVER?quickstart=true
 PROCESS_WORKDIR: $UT2004\System
 PROCESS_MONITOR_ARGS: --start
-PROCESS_TITLE: BTH Sim Client
\ No newline at end of file
+PROCESS_TITLE: BTH Sim Client
+

Modified: trunk/TeamTalk/TeamTalkBuild.bat
===================================================================
--- trunk/TeamTalk/TeamTalkBuild.bat	2007-12-25 21:59:47 UTC (rev 887)
+++ trunk/TeamTalk/TeamTalkBuild.bat	2007-12-25 23:42:38 UTC (rev 888)
@@ -76,7 +76,7 @@
 if errorlevel 1 goto JAVAERROR
 del reg1.txt
 del reg2.txt
-echo %JavaTemp% = Java Temp
+
 :: Convert double backslashes to single backslashes
 set JAVA_HOME=
 :JAVA_WHILE
@@ -98,7 +98,6 @@
 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

Modified: trunk/TeamTalk/TeamTalkRun.bat
===================================================================
--- trunk/TeamTalk/TeamTalkRun.bat	2007-12-25 21:59:47 UTC (rev 887)
+++ trunk/TeamTalk/TeamTalkRun.bat	2007-12-25 23:42:38 UTC (rev 888)
@@ -1,6 +1,6 @@
 @echo off
 
-TITLE TeamTalk Lanucher for Win32
+TITLE TeamTalk %Launcher_Type% Lanucher for Win32
 
 REM Which configuration
 IF "%RunTimeConfig%"=="" SET RunTimeConfig=startlist-desktop

Modified: trunk/TeamTalk/TeamTalkVirtRun.bat
===================================================================
--- trunk/TeamTalk/TeamTalkVirtRun.bat	2007-12-25 21:59:47 UTC (rev 887)
+++ trunk/TeamTalk/TeamTalkVirtRun.bat	2007-12-25 23:42:38 UTC (rev 888)
@@ -1,13 +1,47 @@
 @echo off
 
-SET RunTimeConfig=startlist-virtual
+TITLE TeamTalk Virtual System Lanucher for Win32
 
-REM Check to make sure the file is not running with a wrong working directory
 IF NOT EXIST Configurations\DesktopConfiguration\startlist-virtual.config goto ErrorWrongWorkingDirectory
 
+echo Looking for Unreal Tournament 2004...
+:: Find the location of Unreal Tournament 2004
+start /w regedit /e reg1.txt "HKEY_LOCAL_MACHINE\SOFTWARE\Unreal Technology\Installed Apps\UT2004"
+type reg1.txt | %windir%\system32\find.exe "Folder" > reg2.txt
+if errorlevel 1 goto UT2K4ERROR
+for /f "tokens=2 delims==" %%x in (reg2.txt) do set UTPathTemp=%%~x
+if errorlevel 1 goto UT2K4ERROR
+del reg1.txt
+del reg2.txt
+
+:: Convert double backslashes to single backslashes
+set UTPath=
+:UTWHILE
+  if "%UTPathTemp%"=="" goto UTWEND
+  if not "%UTPath%"=="" set UTPath=%UTPath%\
+  for /f "delims=\" %%x in ("%UTPathTemp%") do set UTPath=%UTPath%%%x
+  for /f "tokens=1,* delims=\" %%x in ("%UTPathTemp%") do set UTPathTemp=%%y
+  goto UTWHILE
+:UTWEND
+set UTPathTemp=
+echo Unreal Tournament 2004 Path (per registy) = %UTPath%
+
+reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" /v UT2K4_ROOT /d "%UTPath%" /f
+
+REM Check to make sure the file is not running with a wrong working directory
+SET RunTimeConfig=startlist-virtual
+SET LauncherType=Virtual System
+
+CALL TeamTalkRun.bat
+
 START Tools\AlwaysOnTop Unreal 0
-TeamTalkRun.bat
 
+:UT2K4ERROR (Unreal Tournament 2004 was not found on the computer)
+echo Unreal Tournament 2004 was not found on the computer.
+echo Running non-virtual TeamTalk.
+
+TeamTalkrun.bat
+
 :ErrorWrongWorkingDirectory
 echo. 
 echo This script must be run with the current directory being that of the script.  
@@ -16,3 +50,6 @@
 echo.  
 echo If this is not the case, please contact bfrisch at gmail.com.
 echo.  
+
+:pause script exectution before exiting
+pause
\ No newline at end of file
