From 3468e7ce0f6d0d89d30ff0f0f51033229a91abeb Mon Sep 17 00:00:00 2001
From: Don Brutzman <brutzman@nps.edu>
Date: Tue, 1 Sep 2020 17:32:26 -0700
Subject: [PATCH] corrected capitalization in jar filters to match renamed
objectTypes package, which remedies problem of duplicated subpackage tree in
both sets of jars (for enumerations and pdus)
---
build.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 6165281764..100745d726 100644
--- a/build.xml
+++ b/build.xml
@@ -310,7 +310,7 @@
<exclude name="**/entitytypes/**/*.java"/>
<exclude name="**/enumerations/**/*.java"/>
<exclude name="**/jammers/**/*.java"/>
- <exclude name="**/objecttypes/**/*.java"/>
+ <exclude name="**/objectTypes/**/*.java"/>
<exclude name="**/*.undef/**/*.java"/>
</fileset>
<!-- https://docs.oracle.com/javase/tutorial/deployment/jar/manifestindex.html -->
@@ -340,14 +340,14 @@
zip64Mode="always">
<fileset dir="build/classes" defaultexcludes="yes">
<include name="**/dis7*.class"/>
- <include name="**/dis7/**/*.class"/>
+ <include name="**/dis7/pdus/**/*.class"/>
<!-- avoid duplicating enumerations classes, which are maintained in separate jars -->
<exclude name="**/entities/**/*.class"/>
<exclude name="**/entitytypes/**/*.class"/>
<exclude name="**/enumerations/**/*.class"/>
<exclude name="**/jammers/**/*.class"/>
- <exclude name="**/objecttypes/**/*.class"/>
- <exclude name="**/objecttypes.undef/**/*"/>
+ <exclude name="**/objectTypes/**/*.class"/>
+ <exclude name="**/objectTypes.undef/**/*"/>
</fileset>
<!-- https://docs.oracle.com/javase/tutorial/deployment/jar/manifestindex.html -->
<manifest>
--
GitLab