From ecca781f224f53c94b26619c599e3f304bf93774 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sun, 26 Dec 2021 09:17:57 -0800
Subject: [PATCH] improved clean
---
build.xml | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 0735a85bad..41187e5e5c 100644
--- a/build.xml
+++ b/build.xml
@@ -41,7 +41,7 @@
<property name="javadoc.doctitle" value="${javadoc.windowtitle}"/>
<!-- build.impl <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> -->
- <target description="Build and test the whole project, create distribution jar files." name="all">
+ <target name="all" description="Build and test the whole project, create distribution jar files.">
<echo message="timestamp ${timestamp}"/>
<fail message="Please build using Ant 1.10.11 or higher.">
<condition>
@@ -51,6 +51,9 @@
</condition>
</fail>
<antcall target="clean"/>
+ <mkdir dir="build" description="ensure necessary directory present"/>
+ <mkdir dir="build/classes" description="ensure necessary directory present"/>
+ <mkdir dir="build/test/classes" description="ensure necessary directory present"/>
<echo message="================"/>
<antcall target="compile"/>
<echo message="================"/>
@@ -92,13 +95,15 @@
<delete dir="${dist.javadoc.dir}" description="get rid of all prior files" failonerror="false"/>
<delete verbose="false" includeemptydirs="false" failonerror="false">
<fileset dir="${build.classes.dir}" includes="**/*"/>
+ <fileset dir="${build.test.dir}" includes="**/*"/>
</delete>
</target>
<target name="clean.build">
<!-- should be fixed now... <echo message="warning: be judicious about clean.build, full recompilation may require multiple compilation loops afterward"/> -->
<mkdir dir="build" description="ensure necessary directory present"/>
- <delete includeemptydirs="true" verbose="false">
+ <delete includeemptydirs="true" verbose="false" failonerror="false">
+ <fileset dir="build" includes="**/*"/>
<fileset dir="build" includes="**/*"/>
</delete>
</target>
@@ -127,12 +132,12 @@
<echo message=" * update.open-dis7.jar.local"/>
<echo message=" * Test student assignments and course examples"/>
<echo message=" * commit open-dis7-full.jar"/>
- <echo message="* scp savage.nps.edu/data/html/open-dis7-java"/>
+ <echo message=" * scp savage.nps.edu/data/html/open-dis7-java"/>
<echo message=" * open-dis7-java/dist/javadoc"/>
<echo message=" * open-dis7-java/dist/open-dis7-full.jar"/>
<echo message=" * open-dis7-source-generator/xml/DIS_7_2012.autogenerated.xsd to xml"/>
<echo message=" * open-dis7-source-generator/xml/dis_7_2021 directory of template files"/>
- <echo message=" * Corresponding Altova XMLSpy autogenerated documentation to xml/SchemaDocumentation"/>
+ <echo message=" * Corresponding Altova XMLSpy autogenerated documentation to xml/SchemaDocumentation"/>
<!-- TODO additional pieces/parts -->
</target>
--
GitLab