From dd82a7fe35179fad573bb161c68c9bdef281dd1a Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Thu, 23 Jan 2020 03:18:53 -0800
Subject: [PATCH] upgrade to Xj3D v2.2; hide unneeded references to legacy Xj3D
specialty jars
---
build.xml | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/build.xml b/build.xml
index 92f16980f2..03e4d24a98 100644
--- a/build.xml
+++ b/build.xml
@@ -250,19 +250,20 @@ POSSIBILITY OF SUCH DAMAGE.
-->
<!-- ======================================== -->
- <!-- TODO update xj3d.dir reference from NPS branch to upcoming v2.1 trunk when Sourceforge codebase is refactored -->
- <!-- Version-control source at https://svn.code.sf.net/p/xj3d/code -->
+ <!-- Savage Developers Guide, Xj3D viewer: NPS source documentation https://savage.nps.edu/Savage/developers.html#Xj3D -->
+ <!-- Xj3D v2.2 git version-control source at https://gitlab.nps.edu/Savage/xj3d -->
+ <!-- Xj3D v2.1 subversion version-control source at https://svn.code.sf.net/p/xj3d/code -->
<!-- all Xj3D.nps jars need to be in same directory for fileset to work properly. -->
- <!-- Prerequisite: run build_nps.xml 'dist' task to get the .jars built and in the right place -->
+ <!-- Prerequisite: run build.xml 'dist' or 'all' target to get the .jars built and in the right place -->
<!-- TODO in order for server-side jenkins to also work, they are retrieved to same directory -->
- <property name="xj3d.dir" location="C:/xj3d-code/xj3d"/> <!-- formerly C:/xj3d-code/branches/NPS, C:/j3d-code/xj3d -->
+ <property name="xj3d.dir" location="C:/x-nps-gitlab/xj3d"/> <!-- formerly C:/xj3d-code/branches/NPS, C:/j3d-code/xj3d, C:/xj3d-code/xj3d -->
<property name="xj3d.dir.jars" location="${xj3d.dir}/jars"/> <!-- C:/j3d-code/xj3d/jars -->
- <property name="xj3d.3rdparty.jar" value="xj3d-2.1-3rdparty-nps.jar"/> <!-- C:/j3d-code/xj3d/jars -->
- <property name="xj3d.jar" value="xj3d-2.1-nps.jar"/> <!-- C:/j3d-code/xj3d/jars -->
- <property name="xj3d.browser.jar" value="xj3d.browser_2.1.0-nps.jar"/> <!-- C:/j3d-code/xj3d/jars -->
- <property name="xj3d.cadfilter.jar" value="xj3d.cadfilter_2.1.0-nps.jar"/> <!-- C:/j3d-code/xj3d/jars -->
- <property name="xj3d.replica.jar" value="xj3d.replica_2.1.0-nps.jar"/> <!-- C:/j3d-code/xj3d/jars -->
+ <property name="xj3d.3rdparty.jar" value="xj3d-2.2-3rdparty-nps.jar"/> <!-- C:/j3d-code/xj3d/jars -->
+ <property name="xj3d.jar" value="xj3d-2.2-nps.jar"/> <!-- C:/j3d-code/xj3d/jars -->
+ <property name="xj3d.browser.jar" value="xj3d.browser_2.2.0-nps.jar"/> <!-- C:/j3d-code/xj3d/jars -->
+ <property name="xj3d.cadfilter.jar" value="xj3d.cadfilter_2.2.0-nps.jar"/> <!-- C:/j3d-code/xj3d/jars -->
+ <property name="xj3d.replica.jar" value="xj3d.replica_2.2.0-nps.jar"/> <!-- C:/j3d-code/xj3d/jars -->
<!-- see HelloWorld task for path diagnostic messages -->
<fileset dir="${xj3d.dir.jars}" id="xj3d.jars.all">
<include name="${xj3d.jar}"/>
@@ -270,11 +271,13 @@ POSSIBILITY OF SUCH DAMAGE.
<include name="${xj3d.cadfilter.jar}"/>
<include name="${xj3d.replica.jar}"/>
<include name="${xj3d.3rdparty.jar}"/>
+ <include name="jhall.jar"/>
+ <!--
<include name="*-${sun.desktop}-${os.arch}.jar"/>
<include name="gluegen-rt.jar"/>
- <include name="jhall.jar"/>
<include name="joal.jar"/>
<include name="jogl-all.jar"/>
+ -->
</fileset>
<!-- site to download latest xj3d jars -->
--
GitLab