From 6639a8b0951438aa4347ec8ee42e735932e0f776 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sun, 2 Mar 2025 23:13:41 -0800
Subject: [PATCH] <property environment="env"/>
---
build.xml | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index 5961b24953..e5e7b7de5d 100644
--- a/build.xml
+++ b/build.xml
@@ -47,6 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
<property name="specificationsDirectory" location="specifications"/>
<import file="specifications/build.xml"/> -->
<property file="build.properties"/>
+ <property environment="env"/>
<target name="versions" description="show tool versions and environment values">
<echo>java -version</echo>
@@ -134,6 +135,25 @@ POSSIBILITY OF SUCH DAMAGE.
<nbbrowse url="https://github.com/open-dis"/>
</target>
+ <target name="update.viskit.jar.from.local" description="update update.viskit.jar.from.local jar files from locally built project into lib directory">
+
+ <property name="viskit.relative" value="../../x3d-nps-gitlab/viskit/build/lib"/>
+ <echo message="Copy ${viskit.relative}/viskit.jar to project lib/ subdirectory..."/>
+ <!-- https://ant.apache.org/manual/Tasks/fail.html -->
+ <fail message="viskit.jar not found">
+ <condition>
+ <not>
+ <resourcecount count="1">
+ <fileset id="fs" dir="${viskit.relative}" includes="viskit.jar"/><!-- comma separated -->
+ </resourcecount>
+ </not>
+ </condition>
+ </fail>
+ <!-- replace latest version -->
+ <delete file="lib/viskit.jar" verbose="true" failonerror="false"/>
+ <copy file="${viskit.relative}/viskit.jar" todir="lib" force="true" verbose="true" failonerror="true"/>
+ </target>
+
<target name="update.opendis7.jar.from.local" description="update opendis7-java jar files from locally built project into lib directory">
<property name="opendis7-java.relative" value="../../x3d-github/opendis7-java/dist"/>
@@ -226,11 +246,11 @@ POSSIBILITY OF SUCH DAMAGE.
<echo message="TODO not yet updating correctly..."/>
<echo message=" ${gitlab.nps.edu.MV3302.lib}"/>
<nbbrowse url= "${gitlab.nps.edu.MV3302.lib}"/>
- <get src="https://gitlab.nps.edu/abuss/MV3302ClassCode/-/raw/master/lib/Simkit/simkit.jar"
+ <get src="https://gitlab.nps.edu/abuss/mv3302classcode/-/raw/main/MV3302ClassCode/lib/Simkit/simkit.jar"
dest="lib" verbose="true" usetimestamp="true"/>
- <get src="https://gitlab.nps.edu/abuss/MV3302ClassCode/-/raw/master/lib/Simkit/simkit-src.zip"
+ <get src="https://gitlab.nps.edu/abuss/mv3302classcode/-/raw/main/MV3302ClassCode/lib/Simkit/simkit-src.zip"
dest="lib" verbose="true" usetimestamp="true"/>
- <get src="https://gitlab.nps.edu/abuss/MV3302ClassCode/-/raw/master/lib/Simkit/simkit-doc.zip"
+ <get src="https://gitlab.nps.edu/abuss/mv3302classcode/-/raw/main/MV3302ClassCode/lib/Simkit/simkit-doc.zip"
dest="lib" verbose="true" usetimestamp="true"/>
</target>
--
GitLab