From 7c9cf45f3088e85e49db9116cfb2c2352d7d8111 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Tue, 26 Dec 2023 23:47:11 +0000 Subject: [PATCH] Update install scripts for PRISM-games. --- prism/etc/scripts/prism-install-cygwin | 10 +++++----- prism/etc/scripts/prism-install-fedora | 10 +++++----- prism/etc/scripts/prism-install-ubuntu | 8 +++----- prism/etc/scripts/prism-install-windows.bat | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/prism/etc/scripts/prism-install-cygwin b/prism/etc/scripts/prism-install-cygwin index 6b5c8ef8..96cbadd7 100755 --- a/prism/etc/scripts/prism-install-cygwin +++ b/prism/etc/scripts/prism-install-cygwin @@ -1,14 +1,14 @@ #!/bin/sh -# Script for installation of PRISM on a clean install of Cygwin +# Script for installation of PRISM-games on a clean install of Cygwin # already set up with required packages, e.g., via prism-install-win set -e # Abort if one of the commands fails set -x # Print commands as they are executed # Download the latest development version from GitHub -git clone https://github.com/prismmodelchecker/prism.git +git clone https://github.com/prismmodelchecker/prism-games.git -# Compile PRISM and run a single test -# (should ultimately display: "Testing result: PASS") -(cd prism/prism && make && make test) +# Compile PRISM-games and run a few tests +# (each should display: "Testing result: PASS") +(cd prism-games/prism && make && make test testz3) diff --git a/prism/etc/scripts/prism-install-fedora b/prism/etc/scripts/prism-install-fedora index 09f8aedc..00521bb7 100755 --- a/prism/etc/scripts/prism-install-fedora +++ b/prism/etc/scripts/prism-install-fedora @@ -1,6 +1,6 @@ #!/bin/sh -# Script for installation of PRISM on a clean install of Fedora-based Linux +# Script for installation of PRISM-games on a clean install of Fedora-based Linux # (current based on Amazon Linux, should be easy to adapt to RHEL/CentOS/etc.) set -e # Abort if one of the commands fails @@ -14,8 +14,8 @@ sudo yum -y install make gcc gcc-c++ java-11-amazon-corretto-devel git sudo yum -y install python # Download the latest development version from GitHub -git clone https://github.com/prismmodelchecker/prism.git +git clone https://github.com/prismmodelchecker/prism-games.git -# Compile PRISM and run a single test -# (should ultimately display: "Testing result: PASS") -(cd prism/prism && make && make test) +# Compile PRISM-games and run a few tests +# (each should display: "Testing result: PASS") +(cd prism-games/prism && make && make test testz3) diff --git a/prism/etc/scripts/prism-install-ubuntu b/prism/etc/scripts/prism-install-ubuntu index ca9fa47f..5c48b4a7 100755 --- a/prism/etc/scripts/prism-install-ubuntu +++ b/prism/etc/scripts/prism-install-ubuntu @@ -62,8 +62,6 @@ cd .. # cp /usr/lib/libz3.so ../prism-games/prism/lib # cd .. -# Compile PRISM-games and run two tests -# (should ultimately 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 +# (each should display: "Testing result: PASS") +(cd prism-games/prism && make PPL_DIR=/usr/local/lib && make test testppl testyices testz3) diff --git a/prism/etc/scripts/prism-install-windows.bat b/prism/etc/scripts/prism-install-windows.bat index 49352f86..5a3251ec 100755 --- a/prism/etc/scripts/prism-install-windows.bat +++ b/prism/etc/scripts/prism-install-windows.bat @@ -1,4 +1,4 @@ -@REM Script to prepare for installation of PRISM on a clean Windows install +@REM Script to prepare for installation of PRISM-games on a clean Windows install @REM Run this in a Windows Command Prompt @REM e.g. cmd /K prism-install-windows.bat @REM Then run prism-install-cygwin in a Cygwin window