manually merge master --> hmc-clock

beast-dev · Aug 15, 2023 · 69a1199 · 69a1199
2 parents 4b1574c + c9f4577
commit 69a1199
Show file tree

Hide file tree

Showing 68 changed files with 2,092 additions and 532 deletions.
diff --git a/build.xml b/build.xml
@@ -74,7 +74,8 @@
                fork="true"
                includeantruntime="false"
                memoryinitialsize="256m"
-               memorymaximumsize="1024m">
+               memorymaximumsize="1024m"
+               encoding="UTF-8">
             <include name="dr/app/beast/**"/>
             <include name="dr/app/beauti/**"/>
             <include name="dr/app/bss/**"/>
@@ -255,13 +256,38 @@
             </fileset>
         </jar>
 
+        <!-- Put everything in ${build} into the tempest-lib.jar file -->
+        <jar jarfile="${dist}/tempest-lib.jar">
+            <manifest>
+                <attribute name="Built-By" value="${user.name}"/>
+            </manifest>
+            <fileset dir="${build}">
+                <include name="dr/app/beauti/tipdatepanel/**/*.class"/>
+                <include name="dr/app/beauti/util/**/*.class"/>
+                <include name="dr/app/beauti/options/**/*.class"/>
+                <include name="dr/app/gui/**/*.class"/>
+                <include name="dr/app/tools/*.class"/>
+                <include name="dr/app/util/*.class"/>
+                <include name="dr/evolution/tree/**/*.class"/>
+                <include name="dr/evolution/io/*.class"/>
+                <include name="dr/evolution/util/*.class"/>
+                <include name="dr/math/**/*.class"/>
+                <include name="dr/stats/**/*.class"/>
+                <include name="dr/util/**/*.class"/>
+            </fileset>
+        </jar>
     </target>
 
     <!-- used to copy the compiled trace.jar into place in the Tracer lib folder -->
     <target name="copy_trace_jar" depends="dist" >
         <copy file="${dist}/trace.jar" todir="../Tracer/lib"/>
     </target>
 
+    <!-- used to copy the compiled tempest-lib.jar into place in the Tempest lib folder -->
+    <target name="copy_tempest-lib_jar" depends="dist" >
+        <copy file="${dist}/tempest-lib.jar" todir="../Tempest/lib"/>
+    </target>
+
     <!-- run beast.jar -->
     <target name="run_BEAST">
         <java jar="${dist}/beast.jar" fork="true"/>
@@ -662,7 +688,7 @@
 					useJavaXKey="true"
                     icon="${common_dir}/icons/beast.icns"
                     jvmversion="${jvm_version}"
-                    vmoptions="-Xmx2048M"
+                    vmoptions="-Xmx2048M -Djava.library.path=/usr/local/lib"
                     arguments="-window -working -options"
                     highresolutioncapable="true"
                     version="${version}"

diff --git a/build_coalsim.xml b/build_coalsim.xml
@@ -8,7 +8,7 @@
     <property name="build" location="build"/>
     <property name="lib" location="lib"/>
     <property name="dist" location="dist"/>
-                                                                                2
+
     <property environment="env"/>
 
     <target name="init">