Fix previous Makefile addition + add d32/64 to Mac launch scripts.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4579 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/Makefile

@@ -222,14 +222,15 @@ ifeq ($(OSTYPE),darwin)
 		CPPFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
 		LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,-search_paths_first
 		BINDISTSUFFIX = osx64
+		BIN_TARGETS=prism.darwin64 xprism.linux
 	else
 		CUDD_XCFLAGS = -arch i386 -DHAVE_IEEE_754 -DBSD -fno-common $(DEBUG)
 		CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
 		CPPFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
 		LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,-search_paths_first
 		BINDISTSUFFIX = osx32
+		BIN_TARGETS=prism.darwin32 xprism.linux
 	endif
-	BIN_TARGETS=prism.darwin xprism.linux
 	JFLAGS =
 	SHARED = -dynamiclib
 	EXE =
@@ -351,12 +352,12 @@ testslocal:
 	fi
 
 bin_scripts:
-	@./install.sh silent
 	@for target in $(BIN_TARGETS); do \
 	  target_trunc=`echo $$target | sed 's/\.[^.]*$$//'` && \
 	  echo Copying "$(SRC_DIR)/bin/$$target -> bin/$$target_trunc" && \
 	  cp $(SRC_DIR)/bin/$$target bin/$$target_trunc; \
-	done; \
+	done;
+	@./install.sh silent
 
 VERSION=# default value for VERSION is blank to force provision at command-line 
 

prism/src/bin/prism.darwin → prism/src/bin/prism.darwin32

@@ -71,7 +71,7 @@ fi
 ICON_OPTION="-Xdock:name=PRISM -Xdock:icon=$PRISM_DIR/etc/icons/p64.png"
 
 # Run PRISM through Java
-"$PRISM_JAVA" $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=$PRISM_DIR/lib -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@"
 
 PRISM_EXIT_CODE=$?
 

prism/src/bin/prism.darwin64

@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# Startup script for PRISM (Mac OS X)
+
+# PRISM home directory
+PRISM_DIR=/home/luser/prism
+
+# Default value for notification after the scipt has finished (yes/no)
+NOTIFY_DEFAULT=no
+
+# Set value for notification
+if [ "$NOTIFY" = "" ]; then
+	NOTIFY=$NOTIFY_DEFAULT
+fi;
+
+# Command to launch Java
+if [ "$PRISM_JAVA" = "" ]; then
+	PRISM_JAVA=java
+fi
+
+# Max memory for Java
+if [ "$PRISM_JAVAMAXMEM" != "" ]; then
+	PRISM_JAVAMAXMEM=`echo "$PRISM_JAVAMAXMEM" | awk /^[0-9]+[kmg]?$/`
+	if [ "$PRISM_JAVAMAXMEM" = "" ]; then
+		echo; echo "Error: Environment variable PRISM_JAVAMAXMEM is invalid."; exit
+	fi
+	PRISM_JAVAMAXMEM="-Xmx$PRISM_JAVAMAXMEM"
+else
+	# default
+	PRISM_JAVAMAXMEM="-Xmx512m"
+fi
+
+# Add PRISM to DYLD_LIBRARY_PATH
+if [ "$DYLD_LIBRARY_PATH" = "" ]; then
+	DYLD_LIBRARY_PATH="$PRISM_DIR"/lib
+else
+	DYLD_LIBRARY_PATH="$PRISM_DIR"/lib:$DYLD_LIBRARY_PATH
+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/{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
+
+# Export environment variables
+export PRISM_DIR DYLD_LIBRARY_PATH
+
+# Main Java class to launch
+if [ "$PRISM_MAINCLASS" = "" ]; then
+	PRISM_MAINCLASS=prism.PrismCL
+fi
+
+# Do we run headless? (GUI overrides this)
+if [ "$PRISM_HEADLESS" = "" ]; then
+	PRISM_HEADLESS=true
+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_EXIT_CODE=$?
+
+if [ "$NOTIFY" = "yes" ]; then
+	if [ -n "`which growlnotify`" ]; then
+		growlnotify --image $PRISM_DIR/etc/icons/prism.ico PRISM has finished -m "" > /dev/null 2> /dev/null
+	fi
+fi;
+
+exit $PRISM_EXIT_CODE