Print

Print


Commit in hps-et-java/scripts on MAIN
et_evio_producer_test.sh+2-51.4 -> 1.5
et_monitor_gui_test.sh+2-31.3 -> 1.4
et_monitor_test.sh+1-111.2 -> 1.3
et_producer_test.sh+3-11.2 -> 1.3
et_server_start.sh+1-71.3 -> 1.4
et_server_test.sh+4-41.8 -> 1.9
et_start_c_server.sh+3-21.4 -> 1.5
et_start_c_server_defaults.sh+3-11.1 -> 1.2
ldpath.sh+11-21.1 -> 1.2
+30-36
9 modified files
script cleanup; use one script for ld path setup; use project.basedir to remove dependence on relative directories

hps-et-java/scripts
et_evio_producer_test.sh 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- et_evio_producer_test.sh	4 Jun 2013 18:58:34 -0000	1.4
+++ et_evio_producer_test.sh	4 Jun 2013 19:24:11 -0000	1.5
@@ -1,9 +1,6 @@
 #!/bin/sh
-
-export LD_LIBRARY_PATH=`pwd`/lib/Linux-x86_64/
-
-et=`pwd`/target/hps-et-java-${project.version}.jar
-classpath=$et:`pwd`/jars/jevio-1.0.jar
+et=${project.basedir}/target/hps-et-java-${project.version}.jar
+classpath=${et}:`pwd`/jars/jevio-1.0.jar
 prod="java -classpath $classpath org.jlab.coda.et.apps.EvioProducer -f ETBuffer -host $(hostname) -s 1024"
 echo $prod
 exec $prod

hps-et-java/scripts
et_monitor_gui_test.sh 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- et_monitor_gui_test.sh	4 Jun 2013 18:58:34 -0000	1.3
+++ et_monitor_gui_test.sh	4 Jun 2013 19:24:11 -0000	1.4
@@ -4,9 +4,8 @@
 # Run the ET GUI Monitor.
 #
 
-et=`pwd`/target/hps-et-java-${project.version}.jar
-classpath=$et:`pwd`/jars/jlayout30.jar:`pwd`/jars/jlm20.jar:`pwd`/jars/jloox20.jar
-
+et=${project.basedir}/target/hps-et-java-${project.version}.jar
+classpath=${et}:${project.basedir}/jars/jlayout30.jar:${project.basedir}/jars/jlm20.jar:${project.basedir}/jars/jloox20.jar
 monitor="java -classpath $classpath org.jlab.coda.et.monitorGui.Monitor"
 echo "$monitor"
 exec $monitor

hps-et-java/scripts
et_monitor_test.sh 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- et_monitor_test.sh	4 Jun 2013 18:58:34 -0000	1.2
+++ et_monitor_test.sh	4 Jun 2013 19:24:11 -0000	1.3
@@ -1,16 +1,6 @@
 #!/bin/sh
 
-if [ $(uname) == "Linux" ]
-then
-    echo "Running on a Linux system."
-else
-    echo "Not running on a Linux system!  Bailing."
-    exit 1
-fi
-
-export LD_LIBRARY_PATH=`pwd`/lib/Linux-x86_64/
-
-et=`pwd`/target/hps-et-java-${project.version}.jar
+et=${project.basedir}/target/hps-et-java-${project.version}.jar
 monitor="java -classpath $et org.jlab.coda.et.apps.EtMonitor -f ETBuffer -h localhost" 
 echo "$monitor"
 exec $monitor

hps-et-java/scripts
et_producer_test.sh 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- et_producer_test.sh	4 Jun 2013 18:58:34 -0000	1.2
+++ et_producer_test.sh	4 Jun 2013 19:24:11 -0000	1.3
@@ -1,4 +1,6 @@
-et=`pwd`/target/hps-et-java-${project.version}.jar
+#!/bin/sh
+
+et=${project.basedir}/target/hps-et-java-${project.version}.jar
 prod="java -classpath $et org.jlab.coda.et.apps.Blaster -f ETBuffer -host localhost"
 echo $prod
 exec $prod

hps-et-java/scripts
et_server_start.sh 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- et_server_start.sh	4 Jun 2013 18:58:34 -0000	1.3
+++ et_server_start.sh	4 Jun 2013 19:24:11 -0000	1.4
@@ -1,13 +1,7 @@
 #!/bin/sh
 
-et=`pwd`/target/hps-et-java-${project.version}.jar
+et=${project.basedir}/target/hps-et-java-${project.version}.jar
 server="java -Xmx1024m -classpath $et org.jlab.coda.et.apps.StartEt $@" 
 
-if [[ `uname` == "Darwin" ]]; then
-  export DYLD_LIBRARY_PATH=`pwd`/lib/Darwin-x86_32/
-else
-  export LD_LIBRARY_PATH=`pwd`/lib/Linux-x86_64/  
-fi
-
 echo "$server"
 exec $server

hps-et-java/scripts
et_server_test.sh 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- et_server_test.sh	4 Jun 2013 18:58:34 -0000	1.8
+++ et_server_test.sh	4 Jun 2013 19:24:11 -0000	1.9
@@ -1,10 +1,10 @@
-et=`pwd`/target/hps-et-java-${project.version}.jar
+#!/bin/sh
+
+# Setup server for test EVIO events. 
+et=${project.basedir}/target/hps-et-java-${project.version}.jar
 #server="java -classpath $et org.jlab.coda.et.apps.StartEt -p 11111 -f ETBuffer -n 100 -s 1024 -v -d" 
 server="java -Xmx1024m -classpath $et org.jlab.coda.et.apps.StartEt -f ETBuffer" 
-# Setup server for test EVIO events. 
 server=$server" -s 10000 -v"
 
-export LD_LIBRARY_PATH=`pwd`/lib/Linux-x86_64/
-
 echo "$server"
 exec $server

hps-et-java/scripts
et_start_c_server.sh 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- et_start_c_server.sh	4 Jun 2013 18:58:34 -0000	1.4
+++ et_start_c_server.sh	4 Jun 2013 19:24:11 -0000	1.5
@@ -1,4 +1,5 @@
-server="./bin/Linux-x86_64/et_start"
-export LD_LIBRARY_PATH=`pwd`/lib/Linux-x86_64/ 
+#!/bin/sh
+
+server="${project.basedir}/bin/Linux-x86_64/et_start"
 echo "$server"
 exec $server $@

hps-et-java/scripts
et_start_c_server_defaults.sh 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- et_start_c_server_defaults.sh	23 Mar 2012 19:33:52 -0000	1.1
+++ et_start_c_server_defaults.sh	4 Jun 2013 19:24:11 -0000	1.2
@@ -1 +1,3 @@
-./scripts/et_start_c_server.sh -d -f ETBuffer -s 10000 -nd
+#!/bin/sh
+
+${project.basedir}/target/scripts/et_start_c_server.sh -d -f ETBuffer -s 10000 -nd

hps-et-java/scripts
ldpath.sh 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- ldpath.sh	6 Apr 2012 20:43:04 -0000	1.1
+++ ldpath.sh	4 Jun 2013 19:24:11 -0000	1.2
@@ -1,2 +1,11 @@
-export LD_LIBRARY_PATH=`pwd`/lib/Linux-x86_64/
-echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+#!/bin/sh
+
+if [[ `uname` == "Darwin" ]]; then
+  export DYLD_LIBRARY_PATH=`pwd`/lib/Darwin-x86_32/
+  echo DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
+elif [[ `uname` == "Linux" ]]; then
+  export LD_LIBRARY_PATH=`pwd`/lib/Linux-x86_64/
+  echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+else
+  echo "ERROR: Unrecognized platform."
+fi
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1