diff --git a/build.xml b/build.xml index b48845a177f86db43b55a53aa1384f4e273d42d9..3941f179d2ec9bb429b99ab0ec5928005244307f 100644 --- a/build.xml +++ b/build.xml @@ -39,7 +39,7 @@ POSSIBILITY OF SUCH DAMAGE. Author : Don Brutzman and Don McGregor Description: Ant build.xml file for Networked Graphics MV3500 --> -<project name="Networked_Graphics_MV3500" default="all" basedir="."> +<project name="MV3500 Networked Graphics" default="all" basedir="."> <description>Build targets for NPS Networked Graphics MV3500</description> <!-- TODO add targets for project maintenance, testing and deployment @@ -84,22 +84,44 @@ POSSIBILITY OF SUCH DAMAGE. <nbbrowse url="https://github.com/open-dis"/> </target> - <target name="update.open-dis7.jar.local" description="update open-dis7.jar in project lib directory"> - <!-- TODO get clearer about what each of 4 jar files might be --> - <property name="open-dis7-java.relative" value="../open-dis7-java/dist"/> - <echo message="copy ${open-dis7-java.relative}/open-dis7-java.jar to project lib/ subdirectory"/> + <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"/> + <echo message="copy ${open-dis7-java.relative}/open-dis7-java.jar and related jar files to project lib/ subdirectory"/> <!-- https://ant.apache.org/manual/Tasks/fail.html --> - <fail message="open-dis7-java.jar not found"> + <fail message="open-dis7-enumerations-classes.jar not found"> <condition> <not> <resourcecount count="1"> - <fileset id="fs" dir="${open-dis7-java.relative}" includes="open-dis7-java.jar"/><!-- comma separated --> + <fileset id="fs" dir="${open-dis7-java.relative}" includes="open-dis7-enumerations-classes.jar"/><!-- comma separated --> </resourcecount> </not> </condition> </fail> - <delete file="lib/open-dis7-java.jar" verbose="true" /> - <copy file="${open-dis7-java.relative}/open-dis7-java.jar" todir="lib" force="true" verbose="true" failonerror="true"/> + <delete file="lib/open-dis7-enumerations-classes.jar" verbose="true" failonerror="false"/> + <delete file="lib/open-dis7-enumerations-javadoc.jar" verbose="true" failonerror="false"/> + <delete file="lib/open-dis7-enumerations-source.jar" verbose="true" failonerror="false"/> + + <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-javadoc.jar" todir="lib" force="true" verbose="true" failonerror="true"/> + + <fail message="open-dis7-classes.jar not found"> + <condition> + <not> + <resourcecount count="1"> + <fileset id="fs" dir="${open-dis7-java.relative}" includes="open-dis7-classes.jar"/><!-- comma separated --> + </resourcecount> + </not> + </condition> + </fail> + <delete file="lib/open-dis7-classes.jar" verbose="true" failonerror="false"/> + <delete file="lib/open-dis7-javadoc.jar" verbose="true" failonerror="false"/> + <delete file="lib/open-dis7-source.jar" verbose="true" failonerror="false"/> + + <copy file="${open-dis7-java.relative}/open-dis7-classes.jar" todir="lib" force="true" verbose="true" failonerror="true"/> + <copy file="${open-dis7-java.relative}/open-dis7-javadoc.jar" todir="lib" force="true" verbose="true" failonerror="true"/> + <copy file="${open-dis7-java.relative}/open-dis7-source.jar" todir="lib" force="true" verbose="true" failonerror="true"/> </target> <target name="update.open-dis7.jar.gitlab" description="update open-dis7.jar in project lib directory">