#380 support multiple architectures for solver binaries z3

.appveyor.yml

@@ -15,15 +15,15 @@ clone_depth: 1
 install:
   - ps: |
       Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\ant\apache-ant-1.10.14" )) {
+      if (!(Test-Path -Path "C:\ant\apache-ant-1.10.15" )) {
         (new-object System.Net.WebClient).DownloadFile(
-        'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.14-bin.zip',
+        'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.15-bin.zip',
           'C:\ant-bin.zip'
         )
         [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\ant-bin.zip", "C:\ant")
       }
-  - SET JAVA_HOME=C:\Program Files\Java\jdk14
-  - SET PATH=C:\ant\apache-ant-1.10.14\bin;%JAVA_HOME%\bin;%PATH%
+  - SET JAVA_HOME=C:\Program Files\Java\jdk17
+  - SET PATH=C:\ant\apache-ant-1.10.15\bin;%JAVA_HOME%\bin;%PATH%
   - SET IVY_CACHE_DIR=C:\ivy
   - echo %USERPROFILE%
   - echo %PATH%
@@ -34,9 +34,9 @@ build_script:
   # Windows does not allow symlinks, thus we need to copy native solver binaries
   # to make it available for JUnit tests.
   # See lib\native\x86_64-windows\README.md for details.
-  - copy lib\java\runtime-z3\*dll lib\native\x86_64-windows\
-  - copy lib\java\runtime-mathsat\*dll lib\native\x86_64-windows\
-  - copy lib\java\runtime-bitwuzla\*dll lib\native\x86_64-windows\
+  - copy lib\java\runtime-z3\x64\*dll lib\native\x86_64-windows\
+  - copy lib\java\runtime-mathsat\x64\*dll lib\native\x86_64-windows\
+  - copy lib\java\runtime-bitwuzla\x64\*dll lib\native\x86_64-windows\
 
 test_script:
   - ant unit-tests

README.md

@@ -54,28 +54,33 @@ JavaSMT can express formulas in the following theories:
 The concrete support for a certain theory depends on the underlying SMT solver.
 Only a few SMT solvers provide support for theories like Arrays, Floating Point, String or RegEx.
 
-Currently JavaSMT supports several SMT solvers (see [Getting Started](doc/Getting-started.md) for installation):
-
-| SMT Solver | Linux64 | Windows64 | MacOS | Description |
-| --- |:---:|:---:|:---:|:--- |
-| [Bitwuzla](https://bitwuzla.github.io/) | :heavy_check_mark: | :heavy_check_mark: |  | a fast solver for bitvector logic |
-| [Boolector](https://boolector.github.io/) | :heavy_check_mark: |  |  | a fast solver for bitvector logic, misses formula introspection, deprecated |
-| [CVC4](https://cvc4.github.io/) | :heavy_check_mark: |  |  |  |
-| [CVC5](https://cvc5.github.io/) | :heavy_check_mark: |  |  |  |
-| [MathSAT5](http://mathsat.fbk.eu/) | :heavy_check_mark: | :heavy_check_mark: |  |  |
-| [OpenSMT](https://verify.inf.usi.ch/opensmt) | :heavy_check_mark: |  |  |  |
-| [OptiMathSAT](http://optimathsat.disi.unitn.it/) | :heavy_check_mark: |  |  | based on MathSAT5, with support for optimization queries |
-| [Princess](http://www.philipp.ruemmer.org/princess.shtml) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Java-based SMT solver |
-| [SMTInterpol](https://ultimate.informatik.uni-freiburg.de/smtinterpol/) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Java-based SMT solver |
-| [Yices2](https://yices.csl.sri.com/) | :heavy_check_mark: | [maybe](https://github.com/sosy-lab/java-smt/pull/215) |  |  |
-| [Z3](https://github.com/Z3Prover/z3) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | mature and well-known solver |
-
+JavaSMT supports several SMT solvers (see [Getting Started](doc/Getting-started.md) for installation):
+
+| SMT Solver | Linux x64 | Linux arm64 | Windows x64 | Windows arm64 | MacOS x64 | MacOS arm64 | Description |
+| --- |:---:|:---:|:---:|:---:|:---:|:---:|:--- |
+| [Bitwuzla](https://bitwuzla.github.io/) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |  |  |  | a fast solver for bitvector logic |
+| [Boolector](https://boolector.github.io/) | :heavy_check_mark: |  |  |  |  |  | a fast solver for bitvector logic, misses formula introspection, deprecated |
+| [CVC4](https://cvc4.github.io/) | :heavy_check_mark: |  |  |  |  |  |  |
+| [CVC5](https://cvc5.github.io/) | :heavy_check_mark: |  |  |  |  |  |  |
+| [MathSAT5](http://mathsat.fbk.eu/) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |  |  |  |  |
+| [OpenSMT](https://verify.inf.usi.ch/opensmt) | :heavy_check_mark: |  |  |  |  |  |  |
+| [OptiMathSAT](http://optimathsat.disi.unitn.it/) | :heavy_check_mark: |  |  |  |  |  | based on MathSAT5, with support for optimization queries |
+| [Princess](http://www.philipp.ruemmer.org/princess.shtml) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Java-based SMT solver |
+| [SMTInterpol](https://ultimate.informatik.uni-freiburg.de/smtinterpol/) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Java-based SMT solver |
+| [Yices2](https://yices.csl.sri.com/) | :heavy_check_mark: |  | [maybe](https://github.com/sosy-lab/java-smt/pull/215) |  |  |  |  |
+| [Z3](https://github.com/Z3Prover/z3) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | mature and well-known solver |
+
+#### Operating System and Architecture Support
 We support a reasonable list of operating systems and versions.
 Our main target is Linux (64-bit, mainly Ubuntu 22.04 or newer,
 several solver libraries also work on Ubuntu 18.04, or comparable Linux distributions).
-Windows 10/11 and MacOS are supported for several SMT solvers (with limited hardware for testing).
-If a specific operating system is missing and required, please do not hesitate and open an issue!
+Windows 10/11 and MacOS are supported for several SMT solvers.
+Our main development architecture is x64 (x86-64).
+We also provide some solvers for ARM64 (AArch64 for ARMv8-A), e.g., Java-based SMT solvers, Z3, and MathSAT.
+If a specific operating system or architecture is missing and required,
+please do not hesitate and open an issue!
 
+#### Solver Features
 The following features are supported (depending on the used SMT solver):
 
  - Satisfiability checking
@@ -97,9 +102,9 @@ If something specific is missing, please [look for or file an issue](https://git
 | [Bitwuzla](https://bitwuzla.github.io/) | :heavy_check_mark: |  |
 | [Boolector](https://boolector.github.io/) | :heavy_check_mark: |  |
 | [CVC4](https://cvc4.github.io/) | :heavy_check_mark: | :heavy_check_mark: |
-| [CVC5](https://cvc4.github.io/) | :question: | |
+| [CVC5](https://cvc4.github.io/) | :question: |  |
 | [MathSAT5](http://mathsat.fbk.eu/) | :heavy_check_mark: |  |
-| [OpenSMT](https://verify.inf.usi.ch/opensmt) | :question: | |
+| [OpenSMT](https://verify.inf.usi.ch/opensmt) | :question: |  |
 | [OptiMathSAT](http://optimathsat.disi.unitn.it/) | :heavy_check_mark: |  |
 | [Princess](http://www.philipp.ruemmer.org/princess.shtml) | :heavy_check_mark: |  |
 | [SMTInterpol](https://ultimate.informatik.uni-freiburg.de/smtinterpol/) | :heavy_check_mark: |  |

build.xml

@@ -3,7 +3,7 @@ This file is part of JavaSMT,
 an API wrapper for a collection of SMT solvers:
 https://github.com/sosy-lab/java-smt
 
-SPDX-FileCopyrightText: 2020 Dirk Beyer <https://www.sosy-lab.org>
+SPDX-FileCopyrightText: 2024 Dirk Beyer <https://www.sosy-lab.org>
 
 SPDX-License-Identifier: Apache-2.0
 -->
@@ -79,12 +79,14 @@ SPDX-License-Identifier: Apache-2.0
     <!-- Main targets -->
 
     <target name="clean" description="Clean">
-        <property name="bitwuzla.path" value="${user.dir}/lib/native/source/libbitwuzla"/>
+        <property name="jarFiles" value="${class.dir}/** ${ivy.module}-*.jar ivy-*.xml *.jar"/>
+        <property name="libraryFiles" value="*.so *.dll *.dylib x64/*.so x64/*.dll x64/*.dylib arm64/*.so arm64/*.dll arm64/*.dylib"/>
+
         <delete includeEmptyDirs="true">
-            <fileset dir="." includes="${class.dir}/** ${ivy.module}-*.jar ivy-*.xml *.so *.dll *.dylib *.jar"/>
+            <fileset dir="." includes="${libraryFiles} ${jarFiles} Javadoc-z3/"/>
             <fileset dir="lib/native/source/libmathsat5j" includes="*.so *.dll *.o"/>
-            <fileset dir="${bitwuzla.path}" includes="include/"/>
-            <fileset dir="${bitwuzla.path}" includes="bitwuzla_wrap.o"/>
+            <fileset dir="lib/native/source/libbitwuzla" includes="include/"/>
+            <fileset dir="lib/native/source/libbitwuzla" includes="bitwuzla_wrap.o"/>
         </delete>
     </target>
 

build/build-ivy.xml

@@ -66,7 +66,7 @@ SPDX-License-Identifier: Apache-2.0
     <target name="resolve-dependencies" depends="load-ivy, update-contrib" unless="ivy.disable">
         <echo message="Downloading and installing dependencies with Ivy..."/>
         <ivy:resolve conf="${ivy.configurations}" log="download-only"/>
-        <ivy:retrieve sync="true" overwriteMode="different" pattern="${ivy.lib.dir}/[conf]/[artifact](-[classifier]).[ext]"/>
+        <ivy:retrieve sync="true" overwriteMode="different" pattern="${ivy.lib.dir}/[conf]/([arch]/)[artifact](-[classifier]).[ext]"/>
     </target>
 
     <target name="report-dependencies" depends="resolve-dependencies" description="Generate dependencies report">
@@ -80,7 +80,7 @@ SPDX-License-Identifier: Apache-2.0
 
     <target name="install-contrib" depends="load-ivy" unless="ivy.disable" description="Retrieve sources and docs for external libraries">
         <ivy:resolve conf="contrib" log="download-only"/>
-        <ivy:retrieve sync="true" pattern="${ivy.lib.dir}-contrib/[artifact](-[classifier]).[ext]"/>
+        <ivy:retrieve sync="true" pattern="${ivy.lib.dir}-contrib/([arch]/)[artifact](-[classifier]).[ext]"/>
     </target>
 
     <target name="update-lib" depends="load-ivy" description="Update the version of a library to the latest one">