From aa0e7a4db0d35caa867130f7e0e7f4c6c5037dc5 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sat, 11 Sep 2021 16:47:44 -0700
Subject: [PATCH] add library dependency for SRM to support inclusion in
open-dis7-full.jar
---
build.xml | 52 +++++++++++++++++++++++++++++++++-------------------
1 file changed, 33 insertions(+), 19 deletions(-)
diff --git a/build.xml b/build.xml
index 3f9c2f615c..c79bb4eb7a 100644
--- a/build.xml
+++ b/build.xml
@@ -18,6 +18,27 @@
<property name="Implementation-Version" value="${timestamp}"/>
<property name="Implementation-Vendor" value="Naval Postgraduate School (NPS)"/>
+ <!-- ensure backwards compatibility to specified version of Java -->
+ <property name="java.source" value="1.8"/>
+ <property name="java.target" value="1.8"/>
+
+ <property name="javadoc.additionalparam" value=""/>
+ <property name="javadoc.author" value="Don Brutzman brutzman@nps.edu"/>
+ <property name="javadoc.dir" value="dist/javadoc"/>
+ <property name="javadoc.encoding" value="ISO-8859-1"/>
+ <property name="javadoc.copyright" value="Copyright ©1995-2021 held by the authors, <a href='https://www.www.nps.edu'>Naval Postgraduate School (NPS)</a> under an <a href='../license.html'>open-source license</a> and free for any use. <a href='mailto:brutzman@nps.edu?subject=open-dis7%20feedback'>Feedback</a> is welcome."/>
+ <property name="javadoc.noindex" value="false"/>
+ <property name="javadoc.nonavbar" value="false"/>
+ <property name="javadoc.notree" value="false"/>
+ <property name="javadoc.private" value="false"/>
+ <property name="javadoc.source" value="${java.source}"/>
+ <property name="javadoc.splitindex" value="true"/>
+ <property name="javadoc.breakiterator" value="true"/>
+ <property name="javadoc.use" value="true"/><!-- Create class and package usage pages -->
+ <property name="javadoc.version" value="true"/>
+ <property name="javadoc.windowtitle" value="open-dis7 Javadoc"/>
+ <property name="javadoc.doctitle" value="${javadoc.windowtitle}"/>
+ <!-- build.impl <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> -->
<target description="Build and test the whole project, create distribution jar files." name="all">
<echo message="timestamp ${timestamp}"/>
<fail message="Please build using Ant 1.9.0 or higher.">
@@ -92,23 +113,7 @@
<!-- TODO implementation-independent approach if possible, but note that other Ant approaches usually have to be customized for each OS. -->
</target>
- <target name="processScenes.javadoc.donotrun"><!-- copied as potential template -->
-
- <property name="javadoc.windowtitle" value="${archive.name} Examples Archive Javadoc using X3DJSAIL, X3D Java Scene Access Interface Library"/>
- <property name="javadoc.doctitle" value="${archive.name} Examples Archive Javadoc"/>
- <property name="javadoc.additionalparam" value=""/>
- <property name="javadoc.author" value="Don Brutzman brutzman@nps.edu"/>
- <property name="javadoc.dir" value="javadoc"/>
- <property name="javadoc.encoding" value="ISO-8859-1"/>
- <property name="javadoc.copyright" value="Copyright ©2005-2020 <a href='https://www.web3d.org'>Web3D Consortium</a> under an <a href='../../../../license.html'>open-source license</a>, free for any use. <a href='mailto:x3d-public@web3D.org,brutzman@nps.edu?subject=X3D%20Examples%20Archive%20X3DJSAIL%20feedback'>Feedback</a> is welcome."/>
- <property name="javadoc.noindex" value="false"/>
- <property name="javadoc.nonavbar" value="false"/>
- <property name="javadoc.notree" value="false"/>
- <property name="javadoc.private" value="false"/>
- <property name="javadoc.splitindex" value="true"/>
- <property name="javadoc.breakiterator" value="true"/>
- <property name="javadoc.use" value="true"/><!-- Create class and package usage pages -->
- <property name="javadoc.version" value="true"/>
+ <target name="javadoc.custom" description="TODO testing, not ready for production">
<javadoc destdir="${javadoc.dir}"
author="${javadoc.author}"
@@ -348,16 +353,25 @@
</target>
<target name="jar-full" depends="compile" description="merges all dis7 subpackage assets">
- <delete file="dist/open-dis7-full.jar" verbose="true"/>
+ <delete file="dist/open-dis7-full.jar" verbose="false"/>
<!-- https://stackoverflow.com/questions/515428/clean-way-to-combine-multiple-jars-preferably-using-ant -->
<jar destfile="dist/open-dis7-full.jar"
update="true"
zip64Mode="always">
<zipgroupfileset dir="dist">
<include name="open-dis7-*.jar"/>
- <!--<exclude name="open-dis7-source.jar"/> only about 30MB -->
+ <!-- TODO consider whether these dependencies are strictly needed -->
+ <include name="../lib/commons-io-2.6.jar"/>
+ <include name="../lib/guava-28.0-jre.jar"/>
+ <include name="../lib/srm-4.4.0.jar"/>
+ <!--<exclude name="open-dis7-source.jar"/> only about 30MB, keep it for debugging -->
<exclude name="open-dis7-full.jar"/><!-- not self -->
</zipgroupfileset>
+ <zipgroupfileset dir="lib">
+ <include name="commons-io-2.6.jar"/>
+ <include name="guava-28.0-jre.jar"/>
+ <include name="srm-4.4.0.jar"/>
+ </zipgroupfileset>
<!-- https://docs.oracle.com/javase/tutorial/deployment/jar/manifestindex.html -->
<manifest>
<attribute name="description" value="Full set of assets for ${manifest.name}"/>
--
GitLab