From c2ff477ec83a51794fc9426ff7f1bd229eca795a Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Fri, 24 Jan 2020 03:19:12 -0800
Subject: [PATCH] simpler target name
---
build.xml | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 40 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index 03e4d24a98..a1e672fb8c 100644
--- a/build.xml
+++ b/build.xml
@@ -3109,10 +3109,15 @@ TODO: fix Xj3D from launching window, instead perform offline rendering while h
-->
<target name="processScenes.captureViewpointImages" depends="get.saxon,platformInitialize"
- description="use Xj3D to create snapshot pictures of each viewpoint">
+ description="use Xj3D to create snapshot pictures of each viewpoint, triggered by html and then updates html">
+ <echo message="use Xj3D to create snapshot pictures of each viewpoint, triggered by html and then updates html"/>
+ <echo message="optional prerequisite: clean.htmlPrettyPrintDocumentation prior to reshooting all images"/>
+ <echo message="rework usually minimized by only regenerating images for each triggering .html change as needed."/>
<echo message="processScenes.captureViewpointImages depends on local Xj3D installation, current directory xj3d.dir=${xj3d.dir}"/>
- <!-- -Djava.library.path needs to point to odejava64.dll driver -->
+ <!-- TODO -Djava.library.path needs to point to odejava64.dll driver, or jogl.dll driver??? -->
<echo message="-Djava.library.path=${xj3d.dir.jars}/../${native.library.path}"/>
+ <!-- TODO -Djava.ext.dirs=??? -->
+ <echo message="-Djava.ext.dirs=???"/>
<!-- output help for Replica -->
<java classname="xj3d.replica.Replica" fork="${fork}" dir=".">
<classpath>
@@ -3124,8 +3129,6 @@ TODO: fix Xj3D from launching window, instead perform offline rendering while h
<!-- Xj3D run.args -->
<arg value="-help"/>
</java>
- <echo message="clean.htmlPrettyPrintDocumentation is prerequisite for capturing a full set of images, usually rework is minimized"/>
- <echo message=" by only regenerating viewpoint images for each triggering .html version as needed."/>
<if>
<not>
<equals arg1="${jenkins.prepared}" arg2="true" />
@@ -3223,7 +3226,8 @@ TODO: fix Xj3D from launching window, instead perform offline rendering while h
<arg value="-quiet"/> <!-- -verbose or -quiet -->
<arg value="-stats"/>
<arg value="-size"/><arg value="792x465"/>
- <arg value="-timeout"/><arg value="20000"/><!-- ms -->
+ <arg value="-timeout"/><arg value="10000"/><!-- ms -->
+ <arg value="--illegal-access=warn"/><!-- enable warnings of further illegal reflective access operations -->
<!-- <arg value="-view"/><arg value="ICON_VIEWPOINT"/> -->
<arg value="-filePrefix"/><arg value="${name.short}"/>
<arg value="-outdir"/><arg value="${relative.path1}/${relative.path2}/_viewpoints"/> <!-- output directory -->
@@ -3283,9 +3287,37 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
<echo>processScenes.captureViewpointImages complete.</echo>
</target>
+ <target name="processScenes.captureImages" description="reshoot all thumbnail and viewpoint images">
+ <echo message="reshoot all thumbnail and viewpoint images"/>
+ <echo message="optional prerequisite: clean.htmlPrettyPrintDocumentation prior to reshooting all images"/>
+ <antcall target="processScenes.captureThumbnailImages"/><!-- triggered by html but does not update html -->
+ <echo message="- - - - - - - - - - - - - - - - - - - -"/>
+ <antcall target="processScenes.captureViewpointImages"/><!-- triggered by html and then updates html -->
+ <echo message="processScenes.captureAllImages complete, htmlPrettyPrintDocumentation updated."/>
+ <echo message="- - - - - - - - - - - - - - - - - - - -"/>
+ </target>
+
<target name="processScenes.captureThumbnailImages"
- description="use Xj3D's replica app to create thumbnails of each scene for use as icons">
+ description="use Xj3D's Replica class to create thumbnails of each scene for use as icons, triggered by html but does not update html">
+ <echo message="use Xj3D's Replica class to create thumbnails of each scene for use as icons, triggered by html but does not update html"/>
+ <echo message="optional prerequisite: clean.htmlPrettyPrintDocumentation prior to reshooting all images"/>
+ <echo message="rework usually minimized by only regenerating images for each triggering .html change as needed."/>
<echo message="processScenes.captureThumbnailImages depends on local Xj3D installation, current directory xj3d.dir=${xj3d.dir}"/>
+ <!-- TODO -Djava.library.path needs to point to odejava64.dll driver, or jogl.dll driver??? -->
+ <echo message="-Djava.library.path=${xj3d.dir.jars}/../${native.library.path}"/>
+ <!-- TODO -Djava.ext.dirs=??? -->
+ <echo message="-Djava.ext.dirs=???"/>
+ <!-- output help for Replica -->
+ <java classname="xj3d.replica.Replica" fork="${fork}" dir=".">
+ <classpath>
+ <pathelement path="${classpath}"/>
+ <fileset refid="xj3d.jars.all"/>
+ </classpath>
+ <!-- -Djava.library.path needs to point to jogl.dll driver -->
+ <jvmarg value="-Djava.library.path=${xj3d.dir.jars}/../${native.library.path}"/>
+ <!-- Xj3D run.args -->
+ <arg value="-help"/>
+ </java>
<for param="file.path.name">
<path>
<fileset refid="x3dScenes"/>
@@ -3309,7 +3341,6 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
input="@{file.path.name}"
regexp="([^\n]*)Savage[\\/]([^\n^\\^/]*)[\\/]([^\n^\\^/]*)([\\/][^\n]*)\.x3d"
select="\3"/>
-
<if>
<available file="${relative.path1}/${relative.path2}/_thumbnails/${name.short}Thumbnail.png"/>
<else>
@@ -3340,6 +3371,8 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
<arg value="-view"/><arg value="AUTO"/> <!-- Fit to world -->
<arg value="-outfile"/><arg value="${outfilePath}"/> <!-- output directory and file name -->
<arg value="-threepointlight"/>
+ <arg value="-timeout"/><arg value="10000"/><!-- ms -->
+ <arg value="--illegal-access=warn"/><!-- enable warnings of further illegal reflective access operations -->
<arg value="${relative.path1}/${relative.path2}/${name.short}.x3d"/> <!-- sceneFile -->
</java>
</else>
--
GitLab