Skip to content
Snippets Groups Projects
Commit 4af3d131 authored by terry-norbraten's avatar terry-norbraten
Browse files

[Terry N.] prepare for NB 12.5 running on JDK17

parent e953590f
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
build.xml
+ 27
− 30
View file @ 4af3d131
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<property name="javadoc.additionalparam" value=""/> <property name="javadoc.additionalparam" value=""/>
<property name="javadoc.author" value="Don Brutzman brutzman@nps.edu"/> <property name="javadoc.author" value="Don Brutzman brutzman@nps.edu"/>
<property name="javadoc.dir" value="dist/javadoc"/> <property name="javadoc.dir" value="${dist.javadoc.dir}"/>
<property name="javadoc.encoding" value="ISO-8859-1"/> <property name="javadoc.encoding" value="ISO-8859-1"/>
<property name="javadoc.copyright" value="Copyright &#169;1995-2021 held by the authors, &lt;a href='https://www.www.nps.edu'&gt;Naval Postgraduate School (NPS)&lt;/a&gt; under an &lt;a href='../license.html'&gt;open-source license&lt;/a&gt; and free for any use. &lt;a href='mailto:brutzman@nps.edu?subject=open-dis7%20feedback'&gt;Feedback&lt;/a&gt; is welcome."/> <property name="javadoc.copyright" value="Copyright &#169;1995-2021 held by the authors, &lt;a href='https://www.www.nps.edu'&gt;Naval Postgraduate School (NPS)&lt;/a&gt; under an &lt;a href='../license.html'&gt;open-source license&lt;/a&gt; and free for any use. &lt;a href='mailto:brutzman@nps.edu?subject=open-dis7%20feedback'&gt;Feedback&lt;/a&gt; is welcome."/>
<property name="javadoc.noindex" value="false"/> <property name="javadoc.noindex" value="false"/>
...@@ -69,10 +69,9 @@ ...@@ -69,10 +69,9 @@
</delete> </delete>
</target> </target>
<target name="clean" description="clean assets created by this project"> <target name="clean" depends="init" description="clean assets created by this project">
<mkdir dir="dist" description="ensure necessary directory present"/>
<delete verbose="true"> <delete verbose="true">
<fileset dir="dist"> <fileset dir="${dist.dir}">
<include name="open-dis7-pdus-classes.jar"/> <include name="open-dis7-pdus-classes.jar"/>
<include name="open-dis7-pdus-source.jar"/> <include name="open-dis7-pdus-source.jar"/>
<include name="open-dis7-pdus-javadoc.jar"/> <include name="open-dis7-pdus-javadoc.jar"/>
...@@ -85,11 +84,9 @@ ...@@ -85,11 +84,9 @@
<exclude name="README.md"/> <exclude name="README.md"/>
</fileset> </fileset>
</delete> </delete>
<delete dir="dist/javadoc" description="get rid of all prior files"/> <delete dir="${dist.javadoc.dir}" description="get rid of all prior files"/>
<mkdir dir="dist/javadoc" description="restore directory"/>
<mkdir dir="build/classes" description="ensure necessary directory present"/>
<delete verbose="false" includeemptydirs="false"> <delete verbose="false" includeemptydirs="false">
<fileset dir="build/classes" includes="**/*"/> <fileset dir="${build.classes.dir}" includes="**/*"/>
</delete> </delete>
</target> </target>
...@@ -108,8 +105,8 @@ ...@@ -108,8 +105,8 @@
</target> </target>
<target name="view.javadoc.local" description="view local package javadoc in web browser (Netbeans only)"> <target name="view.javadoc.local" description="view local package javadoc in web browser (Netbeans only)">
<echo message="view local javadoc in dist/javadoc subdirectory"/> <echo message="view local javadoc in ${dist.javadoc.dir} subdirectory"/>
<nbbrowse file="dist/javadoc/index.html" /> <nbbrowse file="${dist.javadoc.dir}/index.html" />
<!-- TODO implementation-independent approach if possible, but note that other Ant approaches usually have to be customized for each OS. --> <!-- TODO implementation-independent approach if possible, but note that other Ant approaches usually have to be customized for each OS. -->
</target> </target>
...@@ -237,24 +234,24 @@ ...@@ -237,24 +234,24 @@
<target name="zip-full" description="full set of everything, pdus and enumerations"> <target name="zip-full" description="full set of everything, pdus and enumerations">
<!-- TODO README --> <!-- TODO README -->
<delete file="dist/open-dis7-full.zip"/> <delete file="${dist.dir}/open-dis7-full.zip"/>
<zip destfile="dist/open-dis7-full.zip" <zip destfile="${dist.dir}/open-dis7-full.zip"
update="true" update="true"
zip64Mode="always"> zip64Mode="always">
<!-- zip64Mode https://stackoverflow.com/questions/39524481/error-creating-jar-archive-contains-more-than-65535-entries/ --> <!-- zip64Mode https://stackoverflow.com/questions/39524481/error-creating-jar-archive-contains-more-than-65535-entries/ -->
<!-- https://stackoverflow.com/questions/515428/clean-way-to-combine-multiple-jars-preferably-using-ant --> <!-- https://stackoverflow.com/questions/515428/clean-way-to-combine-multiple-jars-preferably-using-ant -->
<zipfileset src="dist/open-dis7-enumerations-classes.jar"/> <zipfileset src="${dist.dir}/open-dis7-enumerations-classes.jar"/>
<zipfileset src="dist/open-dis7-enumerations-javadoc.jar"/> <zipfileset src="${dist.dir}/open-dis7-enumerations-javadoc.jar"/>
<zipfileset src="dist/open-dis7-enumerations-source.jar"/> <zipfileset src="${dist.dir}/open-dis7-enumerations-source.jar"/>
<zipfileset src="dist/open-dis7-pdus-classes.jar"/> <zipfileset src="${dist.dir}/open-dis7-pdus-classes.jar"/>
<zipfileset src="dist/open-dis7-pdus-javadoc.jar"/> <zipfileset src="${dist.dir}/open-dis7-pdus-javadoc.jar"/>
<zipfileset src="dist/open-dis7-pdus-source.jar"/> <zipfileset src="${dist.dir}/open-dis7-pdus-source.jar"/>
<!-- <fileset dir="build" defaultexcludes="yes"> <!-- <fileset dir="build" defaultexcludes="yes">
<include name="classes/**/*"/> <include name="classes/**/*"/>
<exclude name="test/*"/> <exclude name="test/*"/>
</fileset>--> </fileset>-->
<fileset dir="dist" defaultexcludes="yes"> <fileset dir="${dist.dir}" defaultexcludes="yes">
<exclude name="javadoc/**"/> <exclude name="javadoc/**"/>
</fileset> </fileset>
<!-- <fileset dir="src" defaultexcludes="yes"> <!-- <fileset dir="src" defaultexcludes="yes">
...@@ -287,12 +284,12 @@ ...@@ -287,12 +284,12 @@
</target> </target>
<target name="jar-pdus-javadoc" description="full set of javadoc"> <!-- avoid performing multiple times: depends="javadoc" --> <target name="jar-pdus-javadoc" description="full set of javadoc"> <!-- avoid performing multiple times: depends="javadoc" -->
<echo message="(note that generated javadoc subdirectory is found within dist subdirectory)"/> <echo message="(note that generated javadoc subdirectory is found within ${dist.dir} subdirectory)"/>
<delete file="dist/open-dis7-pdus-javadoc.jar"/> <delete file="${dist.dir}/open-dis7-pdus-javadoc.jar"/>
<jar destfile="dist/open-dis7-pdus-javadoc.jar" <jar destfile="${dist.dir}/open-dis7-pdus-javadoc.jar"
update="true" update="true"
zip64Mode="always"> zip64Mode="always">
<fileset dir="dist/javadoc" defaultexcludes="yes"> <fileset dir="${dist.javadoc.dir}" defaultexcludes="yes">
<include name="**/*"/> <include name="**/*"/>
<exclude name="edu/nps/moves/dis7/entities/**"/> <exclude name="edu/nps/moves/dis7/entities/**"/>
<exclude name="edu/nps/moves/dis7/enumerations/**"/> <exclude name="edu/nps/moves/dis7/enumerations/**"/>
...@@ -318,8 +315,8 @@ ...@@ -318,8 +315,8 @@
</target> </target>
<target name="jar-pdus-source"> <target name="jar-pdus-source">
<delete file="dist/open-dis7-pdus-source.jar"/> <delete file="${dist.dir}/open-dis7-pdus-source.jar"/>
<jar destfile="dist/open-dis7-pdus-source.jar" <jar destfile="${dist.dir}/open-dis7-pdus-source.jar"
update="true" update="true"
zip64Mode="always"> zip64Mode="always">
<fileset dir="src" defaultexcludes="yes"> <fileset dir="src" defaultexcludes="yes">
...@@ -353,12 +350,12 @@ ...@@ -353,12 +350,12 @@
</target> </target>
<target name="jar-full" depends="compile" description="merges all dis7 subpackage assets"> <target name="jar-full" depends="compile" description="merges all dis7 subpackage assets">
<delete file="dist/open-dis7-full.jar" verbose="false"/> <delete file="${dist.dir}/open-dis7-full.jar" verbose="false"/>
<!-- https://stackoverflow.com/questions/515428/clean-way-to-combine-multiple-jars-preferably-using-ant --> <!-- https://stackoverflow.com/questions/515428/clean-way-to-combine-multiple-jars-preferably-using-ant -->
<jar destfile="dist/open-dis7-full.jar" <jar destfile="${dist.dir}/open-dis7-full.jar"
update="true" update="true"
zip64Mode="always"> zip64Mode="always">
<zipgroupfileset dir="dist"> <zipgroupfileset dir="${dist.dir}">
<include name="open-dis7-*.jar"/> <include name="open-dis7-*.jar"/>
<!-- TODO consider whether these dependencies are strictly needed --> <!-- TODO consider whether these dependencies are strictly needed -->
<include name="../lib/commons-io-2.6.jar"/> <include name="../lib/commons-io-2.6.jar"/>
...@@ -394,8 +391,8 @@ ...@@ -394,8 +391,8 @@
</target> </target>
<target name="jar-pdus-classes" depends="compile" description="merges all dis7 subpackage classes except for enumerations"> <target name="jar-pdus-classes" depends="compile" description="merges all dis7 subpackage classes except for enumerations">
<delete file="dist/open-dis7-pdus-classes.jar"/> <delete file="${dist.jar}"/>
<jar destfile="dist/open-dis7-pdus-classes.jar" <jar destfile="${dist.jar}"
update="true" update="true"
zip64Mode="always"> zip64Mode="always">
<fileset dir="build/classes" defaultexcludes="yes"> <fileset dir="build/classes" defaultexcludes="yes">
......
nbproject/build-impl.xml
+ 75
− 47
View file @ 4af3d131
This diff is collapsed.
nbproject/genfiles.properties
+ 3
− 3
View file @ 4af3d131
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=7793ec18 nbproject/build-impl.xml.data.CRC32=a21aee8e
nbproject/build-impl.xml.script.CRC32=2b37b8f7 nbproject/build-impl.xml.script.CRC32=b33f34e1
nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.97.0.48 nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.100.0.48
nbproject/project.properties
+ 2
− 2
View file @ 4af3d131
...@@ -35,7 +35,7 @@ debug.test.modulepath=\ ...@@ -35,7 +35,7 @@ debug.test.modulepath=\
dist.archive.excludes= dist.archive.excludes=
# This directory is removed when the project is cleaned: # This directory is removed when the project is cleaned:
dist.dir=dist dist.dir=dist
dist.jar=${dist.dir}/open-dis7-java.jar dist.jar=${dist.dir}/open-dis7-pdus-classes.jar
dist.javadoc.dir=${dist.dir}/javadoc dist.javadoc.dir=${dist.dir}/javadoc
dist.jlink.dir=${dist.dir}/jlink dist.jlink.dir=${dist.dir}/jlink
dist.jlink.output=${dist.jlink.dir}/open-dis7-java dist.jlink.output=${dist.jlink.dir}/open-dis7-java
...@@ -117,7 +117,7 @@ manifest.custom.permissions= ...@@ -117,7 +117,7 @@ manifest.custom.permissions=
meta.inf.dir=${src.dir}/META-INF meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false mkdist.disabled=false
no.dependencies=true no.dependencies=true
platform.active=default_platform platform.active=JDK_16
project.licensePath=./license.txt project.licensePath=./license.txt
run.classpath=\ run.classpath=\
${javac.classpath}:\ ${javac.classpath}:\
......
nbproject/project.xml
+ 1
− 0
View file @ 4af3d131
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>open-dis7-java</name> <name>open-dis7-java</name>
<explicit-platform explicit-source-supported="true"/>
<source-roots> <source-roots>
<root id="src.src-generated.dir"/> <root id="src.src-generated.dir"/>
<root id="src.dir"/> <root id="src.dir"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment