From 5cb2faff94976610723f9575ab98229748be52a8 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Wed, 16 Jul 2014 16:53:45 +0000 Subject: [PATCH] Slight (additional) refactor in launch scripts to ease addition of extra libraries. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8848 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/bin/prism.cygwin | 18 ++++++++++-------- prism/src/bin/prism.darwin32 | 18 ++++++++++-------- prism/src/bin/prism.darwin64 | 18 ++++++++++-------- prism/src/bin/prism.linux | 18 ++++++++++-------- 4 files changed, 40 insertions(+), 32 deletions(-) diff --git a/prism/src/bin/prism.cygwin b/prism/src/bin/prism.cygwin index 4aeaf358..0aa2356a 100644 --- a/prism/src/bin/prism.cygwin +++ b/prism/src/bin/prism.cygwin @@ -22,8 +22,18 @@ else PRISM_JAVAMAXMEM="-Xmx512m" fi +# Set up CLASSPATH: +# - PRISM jar file (for binary versions) (gets priority) +# - classes directory (most PRISM classes) +# - top-level directory (for images, dtds) +# - lib/pepa.zip (PEPA stuff) +# - lib/*.jar (all other jars) +PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/pepa.zip:"$PRISM_DIR"/lib/* + # Set up pointers to libraries PRISM_LIB_PATH="$PRISM_DIR"/lib + +# Copy library path to relevant vars if [ "$PATH" = "" ]; then PATH="$PRISM_LIB_PATH" else @@ -31,14 +41,6 @@ else fi JAVA_LIBRARY_PATH="$PRISM_LIB_PATH" -# Set up CLASSPATH: -# - PRISM jar file (for binary versions) (gets priority) -# - classes directory (most PRISM classes) -# - top-level directory (for images, dtds) -# - lib/pepa.zip (PEPA stuff) -# - lib/*.jar (all other jars) -PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/pepa.zip:"$PRISM_DIR"/lib/* - # Export environment variables export PRISM_DIR PATH diff --git a/prism/src/bin/prism.darwin32 b/prism/src/bin/prism.darwin32 index 089ccc7b..2f5a42af 100755 --- a/prism/src/bin/prism.darwin32 +++ b/prism/src/bin/prism.darwin32 @@ -30,8 +30,18 @@ else PRISM_JAVAMAXMEM="-Xmx512m" fi +# Set up CLASSPATH: +# - PRISM jar file (for binary versions) (gets priority) +# - classes directory (most PRISM classes) +# - top-level directory (for images, dtds) +# - lib/pepa.zip (PEPA stuff) +# - lib/*.jar (all other jars) +PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/pepa.zip:"$PRISM_DIR"/lib/* + # Set up pointers to libraries PRISM_LIB_PATH="$PRISM_DIR"/lib + +# Copy library path to relevant vars if [ "$DYLD_LIBRARY_PATH" = "" ]; then DYLD_LIBRARY_PATH="$PRISM_LIB_PATH" else @@ -39,14 +49,6 @@ else fi JAVA_LIBRARY_PATH="$PRISM_LIB_PATH" -# Set up CLASSPATH: -# - PRISM jar file (for binary versions) (gets priority) -# - classes directory (most PRISM classes) -# - top-level directory (for images, dtds) -# - lib/pepa.zip (PEPA stuff) -# - lib/*.jar (all other jars) -PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/pepa.zip:"$PRISM_DIR"/lib/* - # Export environment variables export PRISM_DIR DYLD_LIBRARY_PATH diff --git a/prism/src/bin/prism.darwin64 b/prism/src/bin/prism.darwin64 index 248dad86..caae8fa5 100755 --- a/prism/src/bin/prism.darwin64 +++ b/prism/src/bin/prism.darwin64 @@ -30,8 +30,18 @@ else PRISM_JAVAMAXMEM="-Xmx512m" fi +# Set up CLASSPATH: +# - PRISM jar file (for binary versions) (gets priority) +# - classes directory (most PRISM classes) +# - top-level directory (for images, dtds) +# - lib/pepa.zip (PEPA stuff) +# - lib/*.jar (all other jars) +PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/pepa.zip:"$PRISM_DIR"/lib/* + # Set up pointers to libraries PRISM_LIB_PATH="$PRISM_DIR"/lib + +# Copy library path to relevant vars if [ "$DYLD_LIBRARY_PATH" = "" ]; then DYLD_LIBRARY_PATH="$PRISM_LIB_PATH" else @@ -39,14 +49,6 @@ else fi JAVA_LIBRARY_PATH="$PRISM_LIB_PATH" -# Set up CLASSPATH: -# - PRISM jar file (for binary versions) (gets priority) -# - classes directory (most PRISM classes) -# - top-level directory (for images, dtds) -# - lib/pepa.zip (PEPA stuff) -# - lib/*.jar (all other jars) -PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/pepa.zip:"$PRISM_DIR"/lib/* - # Export environment variables export PRISM_DIR DYLD_LIBRARY_PATH diff --git a/prism/src/bin/prism.linux b/prism/src/bin/prism.linux index 379c6425..f9d273fe 100755 --- a/prism/src/bin/prism.linux +++ b/prism/src/bin/prism.linux @@ -30,8 +30,18 @@ else PRISM_JAVAMAXMEM="-Xmx512m" fi +# Set up CLASSPATH: +# - PRISM jar file (for binary versions) (gets priority) +# - classes directory (most PRISM classes) +# - top-level directory (for images, dtds) +# - lib/pepa.zip (PEPA stuff) +# - lib/*.jar (all other jars) +PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/pepa.zip:"$PRISM_DIR"/lib/* + # Set up pointers to libraries PRISM_LIB_PATH="$PRISM_DIR"/lib + +# Copy library path to relevant vars if [ "$LD_LIBRARY_PATH" = "" ]; then LD_LIBRARY_PATH="$PRISM_LIB_PATH" else @@ -39,14 +49,6 @@ else fi JAVA_LIBRARY_PATH="$PRISM_LIB_PATH" -# Set up CLASSPATH: -# - PRISM jar file (for binary versions) (gets priority) -# - classes directory (most PRISM classes) -# - top-level directory (for images, dtds) -# - lib/pepa.zip (PEPA stuff) -# - lib/*.jar (all other jars) -PRISM_CLASSPATH="$PRISM_DIR"/lib/prism.jar:"$PRISM_DIR"/classes:"$PRISM_DIR":"$PRISM_DIR"/lib/pepa.zip:"$PRISM_DIR"/lib/* - # Export environment variables export PRISM_DIR LD_LIBRARY_PATH