From b9ade0d5dd5de097150e84b4edd26a4bf2f5dfdf Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Wed, 16 Jul 2014 13:18:57 +0000
Subject: [PATCH] Slight refactor in launch scripts to ease addition of extra
 libraries.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8846 bbc10eb1-c90d-0410-af57-cb519fbb1720
---
 prism/src/bin/prism.cygwin   | 10 ++++++----
 prism/src/bin/prism.darwin32 | 10 ++++++----
 prism/src/bin/prism.darwin64 | 10 ++++++----
 prism/src/bin/prism.linux    | 10 ++++++----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/prism/src/bin/prism.cygwin b/prism/src/bin/prism.cygwin
index 3c2dce4b..4aeaf358 100644
--- a/prism/src/bin/prism.cygwin
+++ b/prism/src/bin/prism.cygwin
@@ -22,12 +22,14 @@ else
 	PRISM_JAVAMAXMEM="-Xmx512m"
 fi
 
-# Add PRISM to PATH
+# Set up pointers to libraries
+PRISM_LIB_PATH="$PRISM_DIR"/lib
 if [ "$PATH" = "" ]; then
-	PATH="$PRISM_DIR"/lib
+	PATH="$PRISM_LIB_PATH"
 else
-	PATH="$PRISM_DIR"/lib:$PATH
+	PATH="$PRISM_LIB_PATH":$PATH
 fi
+JAVA_LIBRARY_PATH="$PRISM_LIB_PATH"
 
 # Set up CLASSPATH:
 #  - PRISM jar file (for binary versions) (gets priority)
@@ -51,4 +53,4 @@ if [ "$PRISM_HEADLESS" = "" ]; then
 fi
 
 # Run PRISM through Java
-"$PRISM_JAVA" $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path=`cygpath -wp $PRISM_DIR/lib` -classpath `cygpath -wp $"$PRISM_CLASSPATH"` $PRISM_MAINCLASS "$@"
+"$PRISM_JAVA" $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path=`cygpath -wp $JAVA_LIBRARY_PATH` -classpath `cygpath -wp $"$PRISM_CLASSPATH"` $PRISM_MAINCLASS "$@"
diff --git a/prism/src/bin/prism.darwin32 b/prism/src/bin/prism.darwin32
index b6946991..089ccc7b 100755
--- a/prism/src/bin/prism.darwin32
+++ b/prism/src/bin/prism.darwin32
@@ -30,12 +30,14 @@ else
 	PRISM_JAVAMAXMEM="-Xmx512m"
 fi
 
-# Add PRISM to DYLD_LIBRARY_PATH
+# Set up pointers to libraries
+PRISM_LIB_PATH="$PRISM_DIR"/lib
 if [ "$DYLD_LIBRARY_PATH" = "" ]; then
-	DYLD_LIBRARY_PATH="$PRISM_DIR"/lib
+	DYLD_LIBRARY_PATH="$PRISM_LIB_PATH"
 else
-	DYLD_LIBRARY_PATH="$PRISM_DIR"/lib:$DYLD_LIBRARY_PATH
+	DYLD_LIBRARY_PATH="$PRISM_LIB_PATH":$DYLD_LIBRARY_PATH
 fi
+JAVA_LIBRARY_PATH="$PRISM_LIB_PATH"
 
 # Set up CLASSPATH:
 #  - PRISM jar file (for binary versions) (gets priority)
@@ -61,7 +63,7 @@ fi
 ICON_OPTION="-Xdock:name=PRISM -Xdock:icon=$PRISM_DIR/etc/icons/p64.png"
 
 # Run PRISM through Java
-"$PRISM_JAVA" -d32 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $ICON_OPTION -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path=$PRISM_DIR/lib -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@"
+"$PRISM_JAVA" -d32 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $ICON_OPTION -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@"
 
 PRISM_EXIT_CODE=$?
 
diff --git a/prism/src/bin/prism.darwin64 b/prism/src/bin/prism.darwin64
index 7ac50341..248dad86 100755
--- a/prism/src/bin/prism.darwin64
+++ b/prism/src/bin/prism.darwin64
@@ -30,12 +30,14 @@ else
 	PRISM_JAVAMAXMEM="-Xmx512m"
 fi
 
-# Add PRISM to DYLD_LIBRARY_PATH
+# Set up pointers to libraries
+PRISM_LIB_PATH="$PRISM_DIR"/lib
 if [ "$DYLD_LIBRARY_PATH" = "" ]; then
-	DYLD_LIBRARY_PATH="$PRISM_DIR"/lib
+	DYLD_LIBRARY_PATH="$PRISM_LIB_PATH"
 else
-	DYLD_LIBRARY_PATH="$PRISM_DIR"/lib:$DYLD_LIBRARY_PATH
+	DYLD_LIBRARY_PATH="$PRISM_LIB_PATH":$DYLD_LIBRARY_PATH
 fi
+JAVA_LIBRARY_PATH="$PRISM_LIB_PATH"
 
 # Set up CLASSPATH:
 #  - PRISM jar file (for binary versions) (gets priority)
@@ -61,7 +63,7 @@ fi
 ICON_OPTION="-Xdock:name=PRISM -Xdock:icon=$PRISM_DIR/etc/icons/p64.png"
 
 # Run PRISM through Java
-"$PRISM_JAVA" -d64 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $ICON_OPTION -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path=$PRISM_DIR/lib -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@"
+"$PRISM_JAVA" -d64 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $ICON_OPTION -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@"
 
 PRISM_EXIT_CODE=$?
 
diff --git a/prism/src/bin/prism.linux b/prism/src/bin/prism.linux
index 0a2b5d9b..379c6425 100755
--- a/prism/src/bin/prism.linux
+++ b/prism/src/bin/prism.linux
@@ -30,12 +30,14 @@ else
 	PRISM_JAVAMAXMEM="-Xmx512m"
 fi
 
-# Add PRISM to LD_LIBRARY_PATH
+# Set up pointers to libraries
+PRISM_LIB_PATH="$PRISM_DIR"/lib
 if [ "$LD_LIBRARY_PATH" = "" ]; then
-	LD_LIBRARY_PATH="$PRISM_DIR"/lib
+	LD_LIBRARY_PATH="$PRISM_LIB_PATH"
 else
-	LD_LIBRARY_PATH="$PRISM_DIR"/lib:$LD_LIBRARY_PATH
+	LD_LIBRARY_PATH="$PRISM_LIB_PATH":$LD_LIBRARY_PATH
 fi
+JAVA_LIBRARY_PATH="$PRISM_LIB_PATH"
 
 # Set up CLASSPATH:
 #  - PRISM jar file (for binary versions) (gets priority)
@@ -59,7 +61,7 @@ if [ "$PRISM_HEADLESS" = "" ]; then
 fi
 
 # Run PRISM through Java
-"$PRISM_JAVA" $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path=$PRISM_DIR/lib -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@"
+"$PRISM_JAVA" $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@"
 
 PRISM_EXIT_CODE=$?