Fix folder structure in CVC5 compile script and use the correct jar name based on a link in it
@@ -243,9 +243,12 @@ SPDX-License-Identifier: Apache-2.0
<!-- Build options for CVC5 i used:
Note: most - are double - below (not the last one)
- Reasoning: auto download loads all dependencies automatically, statistics for the new statistics stuff, prefix because i don't want it to use system installed or install systemwide, fPIC because it complained when i didn't use it.
+ Reasoning: auto download loads all dependencies automatically, statistics for the new
+ statistics stuff, prefix because i don't want it to use system installed or install
+ systemwide, fPIC because it complained when i didn't use it.
./configure.sh production -java-bindings -auto-download -statistics -prefix=/home/baierd/cvc5-main/build/install -DVAR=fPIC
-Theoretically CVC5s performance should be improveable by using -best (uses the best known general performance/dependencies) but this does not auto download
+ Theoretically CVC5s performance should be improveable by using -best (uses the best
+ known general performance/dependencies) but this does not auto download
-->
<!-- SECTION: Publishing CVC5
==================================================================
@@ -265,7 +268,7 @@ Theoretically CVC5s performance should be improveable by using -best (uses the b
numbers from the ivy repository. The script will append the git revision.
</fail>
- <!-- get a new version -->
+ <!-- get the short commit hash of the cvc5 version used -->
<exec executable="git" dir="${cvc5.path}" outputproperty="cvc5.revision" failonerror="true">
<arg value="show"/>
<arg value="-s"/>
@@ -292,7 +295,7 @@ Theoretically CVC5s performance should be improveable by using -best (uses the b
</exec>
<!-- remove unneeded symbols -->
- <exec executable="strip" dir="${cvc5.path}/build/src/bindings/java/" failonerror="true">
+ <exec executable="strip" dir="${cvc5.path}/build/src/api/java/" failonerror="true">
<arg value="libcvc5jni.so" />
</exec>
<exec executable="strip" dir="${cvc5.path}/build/src/" failonerror="true">
@@ -327,11 +330,17 @@ Theoretically CVC5s performance should be improveable by using -best (uses the b
<arg value="libpolyxx.so"/>
</exec>
+ <!-- get the actual jar location as cvc5.jar is just a link -->
+ <exec executable="readlink" dir="${cvc5.path}/build/src/api/java" outputproperty="cvc5.jar" failonerror="true">
+ <arg value="-f"/>
+ <arg value="cvc5.jar"/>
+ </exec>
+
<!-- copy library files into directory to be published for IVY -->
<copy file="${cvc5.path}/build/src/libcvc5.so" tofile="libcvc5-${cvc5.version}.so"/>
<copy file="${cvc5.path}/build/src/parser/libcvc5parser.so" tofile="libcvc5parser-${cvc5.version}.so"/>
- <copy file="${cvc5.path}/build/src/bindings/java/libcvc5jni.so" tofile="libcvc5jni-${cvc5.version}.so"/>
- <copy file="${cvc5.path}/build/src/bindings/java/CVC5.jar" tofile="CVC5-${cvc5.version}.jar"/>
+ <copy file="${cvc5.path}/build/src/api/java/libcvc5jni.so" tofile="libcvc5jni-${cvc5.version}.so"/>
+ <copy file="${cvc5.jar}" tofile="cvc5-${cvc5.version}.jar"/>
</target>
<target name="publish-cvc5" depends="package-cvc5, load-ivy"
