Skip to content
Snippets Groups Projects
Commit 339fa8e4 authored by Brutzman, Don's avatar Brutzman, Don
Browse files

combined jar fixes local javadoc references from within NetBeans IDE

parent c3583ae0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 20 deletions
build.xml
+ 33
− 20
View file @ 339fa8e4
...@@ -46,6 +46,12 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -46,6 +46,12 @@ POSSIBILITY OF SUCH DAMAGE.
<property name="specificationsDirectory" location="specifications"/> <property name="specificationsDirectory" location="specifications"/>
<import file="specifications/build.xml"/> --> <import file="specifications/build.xml"/> -->
<target name="javadoc.all">
<ant dir="examples" target="view.open-dis7.javadoc"/>
<ant dir="examples" target="javadoc"/>
<ant dir="assignments" target="javadoc"/>
</target>
<target name="view.gitlab.nps.edu.MV3500" description="view MV3500 gitlab site in web browser (via Netbeans only)"> <target name="view.gitlab.nps.edu.MV3500" description="view MV3500 gitlab site in web browser (via Netbeans only)">
<echo message="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500"/> <echo message="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500"/>
...@@ -87,20 +93,30 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -87,20 +93,30 @@ POSSIBILITY OF SUCH DAMAGE.
<target name="update.open-dis7.jar.local" description="update open-dis7-java jar files from locally built project into lib directory"> <target name="update.open-dis7.jar.local" description="update open-dis7-java jar files from locally built project into lib directory">
<property name="open-dis7-java.relative" value="../../x3d-github/open-dis7-java/dist"/> <property name="open-dis7-java.relative" value="../../x3d-github/open-dis7-java/dist"/>
<echo message="copy ${open-dis7-java.relative}/open-dis7-java.jar and related jar files to project lib/ subdirectory"/> <echo message="Copy ${open-dis7-java.relative}/open-dis7-full.jar to project lib/ subdirectory..."/>
<!-- https://ant.apache.org/manual/Tasks/fail.html --> <!-- https://ant.apache.org/manual/Tasks/fail.html -->
<fail message="open-dis7-enumerations-classes.jar not found"> <fail message="open-dis7-full.jar not found">
<condition> <condition>
<not> <not>
<resourcecount count="1"> <resourcecount count="1">
<fileset id="fs" dir="${open-dis7-java.relative}" includes="open-dis7-enumerations-classes.jar"/><!-- comma separated --> <fileset id="fs" dir="${open-dis7-java.relative}" includes="open-dis7-full.jar"/><!-- comma separated -->
</resourcecount> </resourcecount>
</not> </not>
</condition> </condition>
</fail> </fail>
<delete file="lib/open-dis7-enumerations-classes.jar" verbose="true" failonerror="false"/> <!-- clean out prior versions -->
<delete file="lib/open-dis7-enumerations-javadoc.jar" verbose="true" failonerror="false"/> <delete file="lib/open-dis7-pdus-classes.jar" verbose="false" failonerror="false"/>
<delete file="lib/open-dis7-enumerations-source.jar" verbose="true" failonerror="false"/> <delete file="lib/open-dis7-pdus-javadoc.jar" verbose="false" failonerror="false"/>
<delete file="lib/open-dis7-pdus-source.jar" verbose="false" failonerror="false"/>
<delete file="lib/open-dis7-enumerations-classes.jar" verbose="false" failonerror="false"/>
<delete file="lib/open-dis7-enumerations-javadoc.jar" verbose="false" failonerror="false"/>
<delete file="lib/open-dis7-enumerations-source.jar" verbose="false" failonerror="false"/>
<!-- replace latest version -->
<delete file="lib/open-dis7-full.jar" verbose="true" failonerror="false"/>
<copy file="${open-dis7-java.relative}/open-dis7-full.jar" todir="lib" force="true" verbose="true" failonerror="true"/>
<!--
<copy file="${open-dis7-java.relative}/open-dis7-enumerations-classes.jar" todir="lib" force="true" verbose="true" failonerror="true"/> <copy file="${open-dis7-java.relative}/open-dis7-enumerations-classes.jar" todir="lib" force="true" verbose="true" failonerror="true"/>
<copy file="${open-dis7-java.relative}/open-dis7-enumerations-source.jar" todir="lib" force="true" verbose="true" failonerror="true"/> <copy file="${open-dis7-java.relative}/open-dis7-enumerations-source.jar" todir="lib" force="true" verbose="true" failonerror="true"/>
...@@ -110,22 +126,21 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -110,22 +126,21 @@ POSSIBILITY OF SUCH DAMAGE.
<condition> <condition>
<not> <not>
<resourcecount count="1"> <resourcecount count="1">
<fileset id="fs" dir="${open-dis7-java.relative}" includes="open-dis7-pdus-classes.jar"/><!-- comma separated --> <fileset id="fs" dir="${open-dis7-java.relative}" includes="open-dis7-pdus-classes.jar"/>
</resourcecount> </resourcecount>
</not> </not>
</condition> </condition>
</fail> </fail>
<delete file="lib/open-dis7-classes.jar" verbose="true" failonerror="false"/><!-- prior name -->
<delete file="lib/open-dis7-javadoc.jar" verbose="true" failonerror="false"/><!-- prior name -->
<delete file="lib/open-dis7-source.jar" verbose="true" failonerror="false"/><!-- prior name -->
<delete file="lib/open-dis7-pdus-classes.jar" verbose="true" failonerror="false"/>
<delete file="lib/open-dis7-pdus-javadoc.jar" verbose="true" failonerror="false"/>
<delete file="lib/open-dis7-pdus-source.jar" verbose="true" failonerror="false"/>
<copy file="${open-dis7-java.relative}/open-dis7-pdus-classes.jar" todir="lib" force="true" verbose="true" failonerror="true"/> <copy file="${open-dis7-java.relative}/open-dis7-pdus-classes.jar" todir="lib" force="true" verbose="true" failonerror="true"/>
<copy file="${open-dis7-java.relative}/open-dis7-pdus-javadoc.jar" todir="lib" force="true" verbose="true" failonerror="true"/> <copy file="${open-dis7-java.relative}/open-dis7-pdus-javadoc.jar" todir="lib" force="true" verbose="true" failonerror="true"/>
<copy file="${open-dis7-java.relative}/open-dis7-pdus-source.jar" todir="lib" force="true" verbose="true" failonerror="true"/> <copy file="${open-dis7-java.relative}/open-dis7-pdus-source.jar" todir="lib" force="true" verbose="true" failonerror="true"/>
-->
<!-- <delete file="lib/open-dis7-classes.jar" verbose="true" failonerror="false"/> prior name -->
<!-- <delete file="lib/open-dis7-javadoc.jar" verbose="true" failonerror="false"/> prior name -->
<!-- <delete file="lib/open-dis7-source.jar" verbose="true" failonerror="false"/> prior name -->
</target> </target>
<property name="gitlab.nps.edu.MV3500.lib" value="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/tree/master/lib"/> <property name="gitlab.nps.edu.MV3500.lib" value="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/tree/master/lib"/>
...@@ -134,6 +149,9 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -134,6 +149,9 @@ POSSIBILITY OF SUCH DAMAGE.
<echo message="Update local open-dis7 .jar files in project lib directory using"/> <echo message="Update local open-dis7 .jar files in project lib directory using"/>
<echo message=" ${gitlab.nps.edu.MV3500.lib}"/> <echo message=" ${gitlab.nps.edu.MV3500.lib}"/>
<nbbrowse url="${gitlab.nps.edu.MV3500.lib}"/> <nbbrowse url="${gitlab.nps.edu.MV3500.lib}"/>
<get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/open-dis7-full.jar"
dest="lib" verbose="true" usetimestamp="true"/>
<!--
<get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/open-dis7-pdus-classes.jar" <get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/open-dis7-pdus-classes.jar"
dest="lib" verbose="true" usetimestamp="true"/> dest="lib" verbose="true" usetimestamp="true"/>
<get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/open-dis7-enumerations-classes.jar" <get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/open-dis7-enumerations-classes.jar"
...@@ -146,15 +164,10 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -146,15 +164,10 @@ POSSIBILITY OF SUCH DAMAGE.
dest="lib" verbose="true" usetimestamp="true"/> dest="lib" verbose="true" usetimestamp="true"/>
<get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/open-dis7-enumerations-javadoc.jar" <get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/open-dis7-enumerations-javadoc.jar"
dest="lib" verbose="true" usetimestamp="true"/> dest="lib" verbose="true" usetimestamp="true"/>
-->
</target> </target>
<target name="update.open-dis7.jar.maven" description="update open-dis7.jar in project lib directory"> <target name="update.open-dis7.jar.maven" description="update open-dis7.jar in project lib directory">
<!-- TODO retrieve from Maven published repository once available --> <echo message="TODO retrieve from Maven published repository once available"/>
</target>
<target name="javadoc.all">
<ant dir="examples" target="view.open-dis7.javadoc"/>
<ant dir="examples" target="javadoc"/>
<ant dir="assignments" target="javadoc"/>
</target> </target>
</project> </project>
\ No newline at end of file
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