From bb6b91f696431a6bd69ebbdd0bb0bef8cce74cc5 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Tue, 20 Mar 2012 00:50:08 +0000 Subject: [PATCH] Simplify bin scripts by adding all jar files to classpath at once. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4888 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/bin/prism.bat.win | 6 ++---- prism/src/bin/prism.cygwin | 14 ++------------ prism/src/bin/prism.darwin32 | 14 ++------------ prism/src/bin/prism.darwin64 | 14 ++------------ prism/src/bin/prism.linux | 14 ++------------ prism/src/bin/xprism.bat.win | 6 ++---- 6 files changed, 12 insertions(+), 56 deletions(-) diff --git a/prism/src/bin/prism.bat.win b/prism/src/bin/prism.bat.win index a258e5ae..5869724b 100755 --- a/prism/src/bin/prism.bat.win +++ b/prism/src/bin/prism.bat.win @@ -17,10 +17,8 @@ rem - PRISM jar file (for binary versions) (gets priority) rem - classes directory (most PRISM classes) rem - top-level directory (for images, dtds) rem - lib/pepa.zip (PEPA stuff) -rem - lib/{jcommon,jfreechart}.jar (JFreeChart stuff) -rem - lib/epsgraphics.jar (Java EPS Graphics library) -rem - lib/colt.jar (COLT statistics library) -set CP=%PRISM_DIR%\lib\prism.jar;%PRISM_DIR%\classes;%PRISM_DIR%;%PRISM_DIR%\lib\pepa.zip;%PRISM_DIR%\lib\jcommon.jar;%PRISM_DIR%\lib\jfreechart.jar;%PRISM_DIR%\lib\epsgraphics.jar;%PRISM_DIR%\lib\colt.jar +rem - lib/*.jar (all other jars) +set CP=%PRISM_DIR%\lib\prism.jar;%PRISM_DIR%\classes;%PRISM_DIR%;%PRISM_DIR%\lib\pepa.zip;%PRISM_DIR%\lib\* rem Run PRISM through Java java -Djava.library.path="%PRISM_DIR%\lib" -classpath "%CP%" prism.PrismCL %* diff --git a/prism/src/bin/prism.cygwin b/prism/src/bin/prism.cygwin index cf3376c4..3c2dce4b 100644 --- a/prism/src/bin/prism.cygwin +++ b/prism/src/bin/prism.cygwin @@ -34,18 +34,8 @@ fi # - classes directory (most PRISM classes) # - top-level directory (for images, dtds) # - lib/pepa.zip (PEPA stuff) -# - lib/{jcommon,jfreechart}.jar (JFreeChart stuff) -# - lib/epsgraphics.jar (Java EPS Graphics library) -# - lib/colt.jar (COLT statistics library) -PRISM_CLASSPATH=\ -"$PRISM_DIR"/lib/prism.jar\ -:"$PRISM_DIR"/classes\ -:"$PRISM_DIR"\ -:"$PRISM_DIR"/lib/pepa.zip\ -:"$PRISM_DIR"/lib/jcommon.jar\ -:"$PRISM_DIR"/lib/jfreechart.jar\ -:"$PRISM_DIR"/lib/epsgraphics.jar\ -:"$PRISM_DIR"/lib/colt.jar +# - 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 92c92f1b..b6946991 100755 --- a/prism/src/bin/prism.darwin32 +++ b/prism/src/bin/prism.darwin32 @@ -42,18 +42,8 @@ fi # - classes directory (most PRISM classes) # - top-level directory (for images, dtds) # - lib/pepa.zip (PEPA stuff) -# - lib/{jcommon,jfreechart}.jar (JFreeChart stuff) -# - lib/epsgraphics.jar (Java EPS Graphics library) -# - lib/colt.jar (COLT statistics library) -PRISM_CLASSPATH=\ -"$PRISM_DIR"/lib/prism.jar\ -:"$PRISM_DIR"/classes\ -:"$PRISM_DIR"\ -:"$PRISM_DIR"/lib/pepa.zip\ -:"$PRISM_DIR"/lib/jcommon.jar\ -:"$PRISM_DIR"/lib/jfreechart.jar\ -:"$PRISM_DIR"/lib/epsgraphics.jar\ -:"$PRISM_DIR"/lib/colt.jar +# - 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 087dc882..7ac50341 100755 --- a/prism/src/bin/prism.darwin64 +++ b/prism/src/bin/prism.darwin64 @@ -42,18 +42,8 @@ fi # - classes directory (most PRISM classes) # - top-level directory (for images, dtds) # - lib/pepa.zip (PEPA stuff) -# - lib/{jcommon,jfreechart}.jar (JFreeChart stuff) -# - lib/epsgraphics.jar (Java EPS Graphics library) -# - lib/colt.jar (COLT statistics library) -PRISM_CLASSPATH=\ -"$PRISM_DIR"/lib/prism.jar\ -:"$PRISM_DIR"/classes\ -:"$PRISM_DIR"\ -:"$PRISM_DIR"/lib/pepa.zip\ -:"$PRISM_DIR"/lib/jcommon.jar\ -:"$PRISM_DIR"/lib/jfreechart.jar\ -:"$PRISM_DIR"/lib/epsgraphics.jar\ -:"$PRISM_DIR"/lib/colt.jar +# - 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 94bdaa36..0a2b5d9b 100755 --- a/prism/src/bin/prism.linux +++ b/prism/src/bin/prism.linux @@ -42,18 +42,8 @@ fi # - classes directory (most PRISM classes) # - top-level directory (for images, dtds) # - lib/pepa.zip (PEPA stuff) -# - lib/{jcommon,jfreechart}.jar (JFreeChart stuff) -# - lib/epsgraphics.jar (Java EPS Graphics library) -# - lib/colt.jar (COLT statistics library) -PRISM_CLASSPATH=\ -"$PRISM_DIR"/lib/prism.jar\ -:"$PRISM_DIR"/classes\ -:"$PRISM_DIR"\ -:"$PRISM_DIR"/lib/pepa.zip\ -:"$PRISM_DIR"/lib/jcommon.jar\ -:"$PRISM_DIR"/lib/jfreechart.jar\ -:"$PRISM_DIR"/lib/epsgraphics.jar\ -:"$PRISM_DIR"/lib/colt.jar +# - 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 diff --git a/prism/src/bin/xprism.bat.win b/prism/src/bin/xprism.bat.win index 48c60921..1f6a4271 100755 --- a/prism/src/bin/xprism.bat.win +++ b/prism/src/bin/xprism.bat.win @@ -17,10 +17,8 @@ rem - PRISM jar file (for binary versions) (gets priority) rem - classes directory (most PRISM classes) rem - top-level directory (for images, dtds) rem - lib/pepa.zip (PEPA stuff) -rem - lib/{jcommon,jfreechart}.jar (JFreeChart stuff) -rem - lib/epsgraphics.jar (Java EPS Graphics library) -rem - lib/colt.jar (COLT statistics library) -set CP=%PRISM_DIR%\lib\prism.jar;%PRISM_DIR%\classes;%PRISM_DIR%;%PRISM_DIR%\lib\pepa.zip;%PRISM_DIR%\lib\jcommon.jar;%PRISM_DIR%\lib\jfreechart.jar;%PRISM_DIR%\lib\epsgraphics.jar;%PRISM_DIR%\lib\colt.jar +rem - lib/*.jar (all other jars) +set CP=%PRISM_DIR%\lib\prism.jar;%PRISM_DIR%\classes;%PRISM_DIR%;%PRISM_DIR%\lib\pepa.zip;%PRISM_DIR%\lib\* rem Run PRISM through Java start "PRISM" javaw -Djava.library.path="%PRISM_DIR%\lib" -classpath "%CP%" userinterface/GUIPrism %*