Pardinus v1.2.0

.travis.yml

@@ -0,0 +1,22 @@
+language: java
+
+jdk:
+  - openjdk8
+
+before_install:
+  - sudo wget https://github.com/ocaml/opam/releases/download/2.0.0/opam-2.0.0-x86_64-linux -O /usr/bin/opam
+  - sudo chmod 755 /usr/bin/opam
+  - opam init -a --disable-sandboxing 
+  - opam update
+  - eval $(opam env)
+  - curl -L "http://nusmv.fbk.eu/distrib/NuSMV-2.6.0-zchaff-linux64.tar.gz" | tar --extract --gzip --strip-components=2 -C $HOME/bin "NuSMV-2.6.0-Linux/bin/NuSMV" || true
+  - curl -N -L "http://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-2.0.0-linux64.tar.gz" | tar --extract --gzip --strip-components=2 -C $HOME/bin "nuXmv-2.0.0-Linux/bin/nuXmv" || true
+
+script: mvn clean package -e -P solvers
+
+cache:
+  directories:
+  - $HOME/bin
+  - $HOME/.opam
+  - $HOME/.m2
+  - build/jni

README.md

@@ -3,6 +3,8 @@ Pardinus
 
 Pardinus is Kodkod's (slightly bulkier) Iberian cousin.
 
+<a href="https://travis-ci.org/haslab/Pardinus"><img align="right" alt="Build Status" src="https://travis-ci.org/haslab/Pardinus.svg?branch=master"/></a>
+
 This repository includes the source code for the Pardinus solver, an extension to the [Kodkod](http://alloy.mit.edu/kodkod/index.html) solver for relational logic. It extends Kodkod with the following functionalities:
 * Target-oriented and weighted-target oriented model finding
 * Model finding over (past and future) LTL relational formulas
@@ -50,6 +52,9 @@ point to the JDK 8 home directory.
 - Tiago Guimarães, HASLab, INESC TEC & Universidade do Minho, Portugal, 2013 - 2014
 
 ## History
+### Pardinus ([1.1.0](https://github.com/haslab/Pardinus/releases/tag/v1.1)) (April 2019)
+- Major [changes](https://github.com/haslab/Pardinus/pull/29) to the solving engine
+
 ### Pardinus ([1.0.0](https://github.com/haslab/Pardinus/releases/tag/v1.0)) (January 2018)
 <!--- FM,ABZ 18 submissions --->
 - Support for unbounded model finding in SMV through [Electrod](https://github.com/grayswandyr/electrod/releases/tag/0.1)

bnd.bnd

@@ -29,6 +29,7 @@ Export-Package: \
 	org.sat4j.maxsat,\
 	org.sat4j.pb,\
 	slf4j.api,\
+	slf4j.simple,\
 	org.alloytools.kodkod.nativesat.util;version=latest,\
 	org.alloytools.kodkod.nativesat.amd64-linux;version=latest,\
 	org.alloytools.kodkod.nativesat.x86-linux;version=latest,\

jni/electrod/wscript

@@ -10,10 +10,14 @@ def configure(conf):
     subprocess.check_call('opam update',shell=True)
 
 def build(bld):
-    bld(rule = 'opam install -y electrod')
+    bld(rule = 'opam install -y electrod --destdir ' + bld.path.abspath() + '/electrod')
+
+    bld.install_files('${LIBDIR}', 'electrod/bin/electrod', chmod=493)
 
 def distclean(ctx):
-    pass
+    from waflib import Scripting
+    Scripting.distclean(ctx)
+    shutil.rmtree(ctx.path.abspath() + '/electrod', True)
 
 def sourceclean(ctx):
     pass