From 76b60b87d660b80ffc6d170a896c300c93044f2e Mon Sep 17 00:00:00 2001 From: Etienne Kneuss Date: Fri, 18 Oct 2013 18:13:05 +0200 Subject: [PATCH] Release ScalaZ3 2.1 with libz3 bundled --- README.md | 6 +++--- build.sbt | 2 +- src/main/java/z3/Z3Wrapper.java | 7 +------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index aa05e06..c7b4509 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ respectively. (eg: z3/4.3-unix-64b/include/z3.h and z3/4.3-unix-64b/lib/libz3.so). 2) Run 'sbt package' to create the jar file. It will be in -'target/scala-2.10/scalaz3\_2.10-2.0.jar' and will contain the shared library +'target/scala-2.10/scalaz3\_2.10-2.1.jar' and will contain the shared library dependencies. 3) For testing, run @@ -36,7 +36,7 @@ respectively. (eg: z3/4.3-unix-64b/include/z3.h and z3/4.3-unix-64b/lib/libz3.dnylib). 2) Run 'sbt package' to create the jar file. It will be in -'target/scala-2.10/scalaz3\_2.10-2.0.jar' and will contain the shared library +'target/scala-2.10/scalaz3\_2.10-2.1.jar' and will contain the shared library dependencies. 3) For testing, run @@ -52,5 +52,5 @@ Windows include/\*.h to /z3/[z3version]/include/. (eg: z3/4.3-win-64b/bin/libz3.dll) 3) Run 'sbt package' to create the jar file. It will end up in -'target/scala2.10/scalaz3\_2.10-2.0.jar' and will contain the shared library +'target/scala2.10/scalaz3\_2.10-2.1.jar' and will contain the shared library dependencies. diff --git a/build.sbt b/build.sbt index afbf171..2237548 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "ScalaZ3" -version := "2.0" +version := "2.1" organization := "ch.epfl.lara" diff --git a/src/main/java/z3/Z3Wrapper.java b/src/main/java/z3/Z3Wrapper.java index 49ef298..e6e558b 100644 --- a/src/main/java/z3/Z3Wrapper.java +++ b/src/main/java/z3/Z3Wrapper.java @@ -35,8 +35,7 @@ public final class Z3Wrapper { private static final String versionString = LibraryChecksum.value; - //private static final String isDebug = System.getProperty("scalaz3.debug.load"); - private static final String isDebug = "aaa"; + private static final String isDebug = System.getProperty("scalaz3.debug.load"); // this is just to force class loading, and therefore library loading. static { @@ -54,10 +53,6 @@ private static void debug(String msg) { } } - public static void main(String[] args) { - System.out.println("yay"); - } - public static boolean withinJar() { java.net.URL classJar = Z3Wrapper.class.getResource("/lib-bin/"); return classJar != null;