svn commit: r661030 - in /incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts: deployAsyncService.cmd setUimaClassPath.bat setUimaClassPath.sh

[ea...@apache.org]

Author: eae
Date: Wed May 28 10:56:52 2008
New Revision: 661030

URL: http://svn.apache.org/viewvc?rev=661030&view=rev
Log:
UIMA-1042 Allow UIMACPP_HOME in env to override default $UIMA_HOME/uimacpp

Modified:
    incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/deployAsyncService.cmd
    incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.bat
    incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.sh

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/deployAsyncService.cmd
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/deployAsyncService.cmd?rev=661030&r1=661029&r2=661030&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/deployAsyncService.cmd (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/deployAsyncService.cmd Wed May 28 10:56:52 2008
@@ -18,12 +18,12 @@
 @if .%1 == . goto usage
 @if NOT exist %1 goto usage
 
-if not defined UIMA_HOME goto USAGE_UIMA
-goto RUN
+@if not defined UIMA_HOME goto USAGE_UIMA
+@goto RUN
 
 :USAGE_UIMA
-echo UIMA_HOME environment variable is not set 
-goto end
+@echo UIMA_HOME environment variable is not set 
+@goto end
 
 :RUN
 @setlocal

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.bat
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.bat?rev=661030&r1=661029&r2=661030&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.bat (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.bat Wed May 28 10:56:52 2008
@@ -55,7 +55,8 @@
 @set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\config;%_REALLYNOQUOTES%
 
 @rem set path to support running C++ annotators
-set PATH=%UIMA_HOME%\uimacpp\bin;%UIMA_HOME%\uimacpp\examples\tutorial\src;%PATH%
+@if "%UIMACPP_HOME%"=="" set UIMACPP_HOME=%UIMA_HOME%\uimacpp
+set PATH=%UIMACPP_HOME%\bin;%UIMACPP_HOME%\examples\tutorial\src;%PATH%
 @rem Also set VNS_HOST and VNS_PORT to default values if they are not specified
 @if "%VNS_HOST%"=="" set VNS_HOST=localhost
 @if "%VNS_PORT%"=="" set VNS_PORT=9000

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.sh
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.sh?rev=661030&r1=661029&r2=661030&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.sh (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/setUimaClassPath.sh Wed May 28 10:56:52 2008
@@ -49,10 +49,15 @@
 UIMA_CLASSPATH=$UIMA_CLASSPATH:$UIMA_HOME/lib/uimaj-as-jms.jar
 UIMA_CLASSPATH=$UIMA_CLASSPATH:$UIMA_HOME/config:$CLASSPATH
 
+if [ "$UIMACPP_HOME" = "" ]
+then
+  UIMACPP_HOME=$UIMA_HOME/uimacpp
+fi
 #set LD_LIBRARY_PATH to support running C++ annotators
-LD_LIBRARY_PATH=$UIMA_HOME/uimacpp/lib:$UIMA_HOME/uimacpp/examples/tutorial/src:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$UIMACPP_HOME/lib:$UIMACPP_HOME/examples/tutorial/src:$LD_LIBRARY_PATH
 #also set DYLD_LIBRARY_PATH, used by Mac OSX
-DYLD_LIBRARY_PATH=$UIMA_HOME/uimacpp/lib:$UIMA_HOME/uimacpp/examples/tutorial/src:$DYLD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH=$UIMACPP_HOME/lib:$UIMACPP_HOME/examples/tutorial/src:$DYLD_LIBRARY_PATH
+
 #also set default values for VNS_HOST and VNS_PORT
 if [ "$VNS_HOST" = "" ];
 then