diff --git a/build.xml b/build.xml index dc08fa5a13f88504e0b62eae54be41001fcf876b..3c1899eed47121e7a7e429baabafed6a21220f34 100644 --- a/build.xml +++ b/build.xml @@ -85,61 +85,61 @@ POSSIBILITY OF SUCH DAMAGE. <nbbrowse url="https://github.com/open-dis/open-dis-java"/> </target> - <target name="view.open-dis.github.com.open-dis7-source-generator" description="view github open-dis open-dis7-source-generator project in web browser (via Netbeans only)"> + <target name="view.open-dis.github.com.opendis7-source-generator" description="view github open-dis opendis7-source-generator project in web browser (via Netbeans only)"> <echo message="https://github.com/open-dis"/> <nbbrowse url="https://github.com/open-dis"/> </target> - <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 opendis7-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-full.jar to project lib/ subdirectory..."/> + <property name="opendis7-java.relative" value="../../x3d-github/opendis7-java/dist"/> + <echo message="Copy ${opendis7-java.relative}/opendis7-full.jar to project lib/ subdirectory..."/> <!-- https://ant.apache.org/manual/Tasks/fail.html --> - <fail message="open-dis7-full.jar not found"> + <fail message="opendis7-full.jar not found"> <condition> <not> <resourcecount count="1"> - <fileset id="fs" dir="${open-dis7-java.relative}" includes="open-dis7-full.jar"/><!-- comma separated --> + <fileset id="fs" dir="${opendis7-java.relative}" includes="opendis7-full.jar"/><!-- comma separated --> </resourcecount> </not> </condition> </fail> <!-- clean out prior versions --> - <delete file="lib/open-dis7-pdus-classes.jar" verbose="false" 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"/> + <delete file="lib/opendis7-pdus-classes.jar" verbose="false" failonerror="false"/> + <delete file="lib/opendis7-pdus-javadoc.jar" verbose="false" failonerror="false"/> + <delete file="lib/opendis7-pdus-source.jar" verbose="false" failonerror="false"/> + <delete file="lib/opendis7-enumerations-classes.jar" verbose="false" failonerror="false"/> + <delete file="lib/opendis7-enumerations-javadoc.jar" verbose="false" failonerror="false"/> + <delete file="lib/opendis7-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"/> + <delete file="lib/opendis7-full.jar" verbose="true" failonerror="false"/> + <copy file="${opendis7-java.relative}/opendis7-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-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"/> + <copy file="${opendis7-java.relative}/opendis7-enumerations-classes.jar" todir="lib" force="true" verbose="true" failonerror="true"/> + <copy file="${opendis7-java.relative}/opendis7-enumerations-source.jar" todir="lib" force="true" verbose="true" failonerror="true"/> + <copy file="${opendis7-java.relative}/opendis7-enumerations-javadoc.jar" todir="lib" force="true" verbose="true" failonerror="true"/> - <fail message="open-dis7-pdus-classes.jar not found"> + <fail message="opendis7-pdus-classes.jar not found"> <condition> <not> <resourcecount count="1"> - <fileset id="fs" dir="${open-dis7-java.relative}" includes="open-dis7-pdus-classes.jar"/> + <fileset id="fs" dir="${opendis7-java.relative}" includes="opendis7-pdus-classes.jar"/> </resourcecount> </not> </condition> </fail> - <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-source.jar" todir="lib" force="true" verbose="true" failonerror="true"/> + <copy file="${opendis7-java.relative}/opendis7-pdus-classes.jar" todir="lib" force="true" verbose="true" failonerror="true"/> + <copy file="${opendis7-java.relative}/opendis7-pdus-javadoc.jar" todir="lib" force="true" verbose="true" failonerror="true"/> + <copy file="${opendis7-java.relative}/opendis7-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 --> + <!-- <delete file="lib/opendis7-classes.jar" verbose="true" failonerror="false"/> prior name --> + <!-- <delete file="lib/opendis7-javadoc.jar" verbose="true" failonerror="false"/> prior name --> + <!-- <delete file="lib/opendis7-source.jar" verbose="true" failonerror="false"/> prior name --> </target> @@ -149,20 +149,20 @@ POSSIBILITY OF SUCH DAMAGE. <echo message="Update local open-dis7 .jar files in project lib directory using"/> <echo message=" ${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" + <get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/opendis7-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/opendis7-pdus-classes.jar" 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/opendis7-enumerations-classes.jar" dest="lib" verbose="true" usetimestamp="true"/> - <get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/open-dis7-pdus-source.jar" + <get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/opendis7-pdus-source.jar" dest="lib" verbose="true" usetimestamp="true"/> - <get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/open-dis7-enumerations-source.jar" + <get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/opendis7-enumerations-source.jar" dest="lib" verbose="true" usetimestamp="true"/> - <get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/open-dis7-pdus-javadoc.jar" + <get src="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/raw/master/lib/opendis7-pdus-javadoc.jar" 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/opendis7-enumerations-javadoc.jar" dest="lib" verbose="true" usetimestamp="true"/> --> </target>