From 8a8075ab9d890159e62713e34b1f7a43e8bf0a31 Mon Sep 17 00:00:00 2001
From: Don Brutzman <brutzman@nps.edu>
Date: Sat, 3 Jul 2021 18:01:44 -0700
Subject: [PATCH] improved javadoc jar, more refinements to follow

---
 build.xml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index ad351adb13..2f6464cf23 100644
--- a/build.xml
+++ b/build.xml
@@ -242,7 +242,7 @@
                 <attribute name="Implementation-Version" value="${Implementation-Version}"/>
                 <attribute name="Implementation-Vendor"  value="${Implementation-Vendor}"/>
                 
-                <section name="edu/nps/moves/dis7">
+                <section name="edu/nps/moves/**">
                     <attribute name="Sealed" value="true"/>
                 </section>
             </manifest>
@@ -259,7 +259,15 @@
                 <include name="**/*.java"/>
                 <include name="**/*.md"/>
                 <include name="**/*.txt"/>
-                <include name="**/*.dislog"/>
+            <!--<include name="**/*.dislog"/>-->
+                <exclude name="edu/nps/moves/dis7/utilities/logs/**"/>
+                <include name="edu/nps/moves/spatial/**"/>
+            </fileset>
+            <fileset dir="src-generated" defaultexcludes="yes">
+                <!-- omitting enumerations directories -->
+                <include name="edu/nps/moves/dis7/pdus/**"/>
+                <include name="edu/nps/moves/dis7/utilities/**/*.java"/>
+                <exclude name="edu/nps/moves/dis7/utilities/logs/**"/>
             </fileset>
             
             <!-- https://docs.oracle.com/javase/tutorial/deployment/jar/manifestindex.html -->
@@ -281,14 +289,17 @@
     </target>
     
     <target name="jar-classes" depends="compile" description="merges all dis7 subpackage classes except for enumerations">
+        <!--   -->
         <jar destfile="dist/open-dis7-pdus-classes.jar"
              basedir="."
-             includes="edu/nps/moves/dis7/**"
+             includes="edu/nps/moves/**"
              excludes=".keep"
                update="true"
             zip64Mode="always">
             <fileset dir="build/classes" defaultexcludes="yes">
-                <include name="**/moves/**/*.class"/>
+                <include name="edu/nps/moves/dis7/pdus/*.class"/>
+                <include name="edu/nps/moves/dis7/utilities/**/*.class"/>
+                <include name="edu/nps/moves/spatial/*.class"/>
             </fileset>
             <!-- https://docs.oracle.com/javase/tutorial/deployment/jar/manifestindex.html -->
             <manifest>
-- 
GitLab