From 663cb26c3198affbd0f7a05b67866e0a1900d727 Mon Sep 17 00:00:00 2001 From: brutzman <brutzman@DESKTOP-2S09UKA> Date: Sat, 29 Aug 2020 10:33:38 -0700 Subject: [PATCH] updated retrieval of library jars --- build.xml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/build.xml b/build.xml index 81dd36b2b1..d794938d6c 100644 --- a/build.xml +++ b/build.xml @@ -106,22 +106,26 @@ POSSIBILITY OF SUCH DAMAGE. <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"> + <fail message="open-dis7-pdus-classes.jar not found"> <condition> <not> <resourcecount count="1"> - <fileset id="fs" dir="${open-dis7-java.relative}" includes="open-dis7-classes.jar"/><!-- comma separated --> + <fileset id="fs" dir="${open-dis7-java.relative}" includes="open-dis7-pdus-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"/> + <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 --> - <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"/> + <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-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"/> </target> <target name="update.open-dis7.jar.gitlab" description="update open-dis7.jar in project lib directory"> -- GitLab