Revision: 18754
          http://sourceforge.net/p/gate/code/18754
Author:   ian_roberts
Date:     2015-06-04 18:33:59 +0000 (Thu, 04 Jun 2015)
Log Message:
-----------
Modify gcp-direct.sh so it will work from an installed distro as well as from 
an SVN checkout

Modified Paths:
--------------
    gcp/trunk/gcp-direct.sh

Modified: gcp/trunk/gcp-direct.sh
===================================================================
--- gcp/trunk/gcp-direct.sh     2015-06-04 13:20:25 UTC (rev 18753)
+++ gcp/trunk/gcp-direct.sh     2015-06-04 18:33:59 UTC (rev 18754)
@@ -16,12 +16,6 @@
   exit 1
 fi
 
-if [ "${GATE_HOME}" == "" ] 
-then
-  echo environment variable GATE_HOME not set, cannot proceed
-  exit 1
-fi
-
 PRG="$0"
 CURDIR="`pwd`"
 # need this for relative symlinks
@@ -42,6 +36,26 @@
 gcpparams=()
 jvmparams=()
 
+# Build classpath
+GCP_CLASSPATH=.:"${SCRIPTDIR}"/conf
+if [ -f "${SCRIPTDIR}/gcp.jar" ]; then
+  # Running from an SVN checkout, we need a GATE_HOME and to include GATE_HOME 
libs
+  if [ "${GATE_HOME}" == "" ] 
+  then
+    echo environment variable GATE_HOME not set, cannot proceed
+    exit 1
+  fi
+  
GCP_CLASSPATH="${GCP_CLASSPATH}":"${SCRIPTDIR}"/gcp.jar:"${SCRIPTDIR}"/'lib/*':"$GATE_HOME"/bin/gate.jar:"$GATE_HOME"/'lib/*'
+else
+  # Running from a distro, so all the GATE libs are in our lib
+  GCP_CLASSPATH="${GCP_CLASSPATH}":"${SCRIPTDIR}"/'lib/*'
+fi
+
+# Pass on GATE_HOME if set
+if [ "${GATE_HOME}" == "" ]; then
+  jvmparams=( -Dgate.home="${GATE_HOME}" )
+fi
+
 while test "$1" != "";
 do
 if [ "$1" == "-h" ]
@@ -68,4 +82,4 @@
 shift
 done
 
-"$JAVA_HOME/bin/java" -Dgate.home="${GATE_HOME}" -Dgcp.home="${SCRIPTDIR}" 
-Djava.protocol.handler.pkgs=gate.cloud.util.protocols -cp 
.:"${SCRIPTDIR}"/conf:"${SCRIPTDIR}"/gcp.jar:"${SCRIPTDIR}"/'lib/*':"$GATE_HOME"/bin/gate.jar:"$GATE_HOME"/'lib/*'
 "${jvmparams[@]}"  gate.cloud.batch.BatchRunner "${gcpparams[@]}"
+"$JAVA_HOME/bin/java" -Dgcp.home="${SCRIPTDIR}" 
-Djava.protocol.handler.pkgs=gate.cloud.util.protocols -cp "${GCP_CLASSPATH}" 
"${jvmparams[@]}" gate.cloud.batch.BatchRunner "${gcpparams[@]}"

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs

Reply via email to