restructure variables in build-scripts.

build.xml

@@ -31,9 +31,9 @@ SPDX-License-Identifier: Apache-2.0
         runtime-yices2,
         runtime-z3
     "/>
-    <property name="ivy.configurations" value="build, core, ${ivy.solver.configurations}, test, format-source, checkstyle, spotbugs"/>
+    <property name="ivy.configuration.main" value="core"/>
+    <property name="ivy.configurations" value="build, ${ivy.configuration.main}, ${ivy.solver.configurations}, test, format-source, checkstyle, spotbugs"/>
     <property name="package" value="java_smt"/>
-    <property name="jar.libdir" value="core"/> <!-- only include the minimal set of libraries in the classpath of the JAR-MANIFEST -->
     <property name="jar.excludes" value="**/*Test.class **/*Test$*.class ${yices2Classes}"/>
     <property name="jar.sources.excludes" value="**/*Test.java ${yices2Sources}"/>
     <property name="jar.excludesInYices2Jar" value=""/> <!-- only excluded in the Jar for Yices2 bindings -->

build/build-ivy.xml

@@ -26,7 +26,8 @@ SPDX-License-Identifier: Apache-2.0
     <!-- <property name="ivy.disable" value=""/> --> <!-- Disable ivy completely. -->
     <property name="ivy.repo.url" value="https://www.sosy-lab.org/ivy"/>
     <property name="ivy.lib.dir" value="lib/java"/>
-    <property name="ivy.configurations" value="build, runtime, test, spotbugs"/>
+    <property name="ivy.configuration.main" value="runtime"/>
+    <property name="ivy.configurations" value="build, ${ivy.configuration.main}, test, spotbugs"/>
     <property name="ivy.dep.file" value="lib/ivy.xml"/>
     <property name="ivy.settings.file" value="build/ivysettings.xml"/>
 

build/build-jar.xml

@@ -23,15 +23,16 @@ SPDX-License-Identifier: Apache-2.0
     <!-- These properties can and should be overridden from including file. -->
     <property name="class.main" value=""/>
     <property name="project.url" value=""/>
-    <property name="jar.libdir" value="runtime"/>
     <property name="jar.excludes" value="**/*Test.class **/*Test$*.class"/>
     <property name="jar.sources.excludes" value="**/*Test.java"/>
 
     <target name="jar" depends="determine-version,build" description="Create a runnable JAR file">
         <property name="jar.file" value="${ivy.module}-${version}.jar"/>
         <copy todir="${class.dir}"><fileset dir="." includes="META-INF/**"/></copy>
-        <manifestclasspath property="classpath.jar" jarfile="${ivy.lib.dir}/${jar.libdir}/${jar.file}" maxParentLevels="0">
-            <classpath><fileset dir="${ivy.lib.dir}/${jar.libdir}" includes="*.jar"/></classpath>
+        <manifestclasspath property="classpath.jar"
+                jarfile="${ivy.lib.dir}/${ivy.configuration.main}/${jar.file}"
+                maxParentLevels="0">
+            <classpath><fileset dir="${ivy.lib.dir}/${ivy.configuration.main}" includes="*.jar"/></classpath>
         </manifestclasspath>
         <jar basedir="${class.dir}/"
                 destfile="${jar.file}"