Merge branch 'prism'

prism/Makefile

@@ -273,7 +273,7 @@ ifeq ($(OSTYPE),linux)
 	endif
 	endif
 	BIN_TARGETS=prism.linux xprism.linux
-	JFLAGS = -encoding UTF8
+	JFLAGS := -encoding UTF8
 	SHARED = -shared
 	#SHARED = -G
 	EXE =
@@ -290,7 +290,7 @@ ifeq ($(OSTYPE),solaris)
 	BINDISTSUFFIX = solaris
 	BINDISTARCH = solaris
 	BIN_TARGETS=prism.linux xprism.linux
-	JFLAGS = -encoding UTF8
+	JFLAGS := -encoding UTF8
 	SHARED = -shared -mimpure-text
 	EXE =
 	LIBPREFIX = lib
@@ -316,7 +316,7 @@ ifeq ($(OSTYPE),cygwin)
 		BINDISTARCH = x86
 	endif
 	BIN_TARGETS=prism.cygwin xprism.linux prism.bat.win xprism.bat.win
-	JFLAGS = -encoding UTF8
+	JFLAGS := -encoding UTF8
 	SHARED = -shared
 	#SHARED = -G
 	EXE = .exe
@@ -351,7 +351,7 @@ ifeq ($(OSTYPE),darwin)
 		BIN_TARGETS=prism.darwin xprism.linux
 	endif
 	endif
-	JFLAGS = -encoding UTF8
+	JFLAGS := -encoding UTF8
 	SHARED = -dynamiclib
 	EXE =
 	LIBPREFIX = lib
@@ -671,10 +671,11 @@ BIN_DIST_FILE = $(BIN_DIST_DIR).tar.gz
 BIN_DIST_INST = $(BIN_DIST_DIR)-installer.exe
 
 # Build a (binary) distribution in the release directory
-# (run "make clean_all && make all" first )
 
-release: JFLAGS += --release 9
-release: binary release_check_version build_release clean_binary
+release: release_config clean_all all binary release_check_version build_release clean_binary
+
+release_config:
+	$(eval JFLAGS := --release 9 $(JFLAGS))
 
 release_check_version:
 	@if [ "$(VERSION)" = "" ]; then echo "Usage: make release VERSION=4.5"; exit 1; fi

prism/etc/scripts/prism-install-cygwin

@@ -9,6 +9,8 @@ set -x # Print commands as they are executed
 # Download the latest development version from GitHub
 git clone https://github.com/prismmodelchecker/prism-games.git
 
-# Compile PRISM-games and run a few tests
-# (each should display: "Testing result: PASS")
-(cd prism-games/prism && make && make test testz3)
+# Compile PRISM-games and run a few tests (unless --nobuild passed)
+# (should ultimately display: "Testing result: PASS")
+if [ "$*" = "${*/--nobuild}" ]; then
+  (cd prism-games/prism && make && make test testz3)
+fi

prism/etc/scripts/prism-install-fedora

@@ -16,6 +16,8 @@ sudo yum -y install python
 # Download the latest development version from GitHub
 git clone https://github.com/prismmodelchecker/prism-games.git
 
-# Compile PRISM-games and run a few tests
-# (each should display: "Testing result: PASS")
-(cd prism-games/prism && make && make test testz3)
+# Compile PRISM-games and run a few tests (unless --nobuild passed)
+# (should ultimately display: "Testing result: PASS")
+if [ "$*" = "${*/--nobuild}" ]; then
+  (cd prism-games/prism && make && make test testppl testyices testz3)
+fi

prism/etc/scripts/prism-install-ubuntu

@@ -5,6 +5,11 @@
 set -e # Abort if one of the commands fails
 set -x # Print commands as they are executed
 
+# Avoid interruptions during install
+if [ -e "/etc/needrestart/needrestart.conf" ]; then
+  sudo sed -i "/#\$nrconf{restart} = 'i';/s/.*/\$nrconf{restart} = 'a';/" /etc/needrestart/needrestart.conf
+fi
+
 # Install dependencies: make/gcc/Java/git
 sudo apt-get -y update
 sudo apt -y install make gcc g++ default-jdk git
@@ -62,6 +67,8 @@ cd ..
 # cp /usr/lib/libz3.so ../prism-games/prism/lib
 # cd ..
 
-# Compile PRISM-games and run a few tests
-# (each should display: "Testing result: PASS")
-(cd prism-games/prism && make PPL_DIR=/usr/local/lib && make test testppl testyices testz3)
+# Compile PRISM-games and run a few tests (unless --nobuild passed)
+# (should ultimately display: "Testing result: PASS")
+if [ "$*" = "${*/--nobuild}" ]; then
+  (cd prism-games/prism && make && make test testppl testyices testz3)
+fi