Commit in hps-et-java/scripts on MAIN | |||
et_server_start.sh | +9 | -2 | 1.1 -> 1.2 |
et_start_c_server.sh | +1 | -5 | 1.2 -> 1.3 |
+10 | -7 |
update et version; move ld path to JNI script (C server not available on Mac)
diff -u -r1.1 -r1.2 --- et_server_start.sh 10 Apr 2012 19:51:14 -0000 1.1 +++ et_server_start.sh 4 Jun 2013 18:17:53 -0000 1.2 @@ -1,6 +1,13 @@
#!/bin/sh
-et=`pwd`/target/hps-et-java-12.1-SNAPSHOT.jar
+ +et=`pwd`/target/hps-et-java-12.4-SNAPSHOT.jar
server="java -Xmx1024m -classpath $et org.jlab.coda.et.apps.StartEt $@"
-export LD_LIBRARY_PATH=`pwd`/lib/Linux-x86_64/
+ +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
diff -u -r1.2 -r1.3 --- et_start_c_server.sh 4 Jun 2013 18:15:01 -0000 1.2 +++ et_start_c_server.sh 4 Jun 2013 18:17:53 -0000 1.3 @@ -1,10 +1,6 @@
server="./bin/Linux-x86_64/et_start"
-if [[ `uname` == "Darwin" ]]; then - export DYLD_LIBRARY_PATH=`pwd`/lib/Darwin-x86_32/ -else - export LD_LIBRARY_PATH=`pwd`/lib/Linux-x86_64/ -fi
+export LD_LIBRARY_PATH=`pwd`/lib/Linux-x86_64/
echo "$server" exec $server $@
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