From dada1cf95657d5c883b469e1312fb17be8d431bb Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@DESKTOP-2S09UKA>
Date: Fri, 1 Nov 2019 00:55:18 -0700
Subject: [PATCH] multiple improvements including turtle conversion output,
including turtle and python in process.scenes.all, javadoc invocation
---
build.xml | 36 +++++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/build.xml b/build.xml
index dd4d9d829d..a5f6c6d187 100644
--- a/build.xml
+++ b/build.xml
@@ -1706,7 +1706,8 @@ ignoreSetupDownloadErrors=true
<Saxon9 scene="HelloWorld"
stylesheet="${stylesheet.dir}/X3dToJava"
extension="java"
- expand="on"/>
+ expand="on"
+ parameterPair1="className=HelloWorld"/>
<!-- expand:on since DTD defaults needed -->
<echo>HelloWorld.py creation with X3dToPython.xslt</echo>
<!-- JavaScript Object Notation (JSON) -->
@@ -1726,12 +1727,12 @@ ignoreSetupDownloadErrors=true
<!-- expand:on since DTD defaults needed -->
<echo message="${arq} --data ${semantics.dir}/ontologies/X3dOntology4.0.ttl --query ${semantics.dir}/queries/X3dHelloWorldQuery_03.rq --graph HelloWorld.ttl"/>
<exec executable="${arq}" dir="." vmlauncher="false">
+ <arg value="--graph"/>
+ <arg value="HelloWorld.ttl"/>
<arg value="--data"/>
<arg value="${semantics.dir}/ontologies/X3dOntology4.0.ttl"/>
<arg value="--query"/>
<arg value="${semantics.dir}/queries/X3dHelloWorldQuery_03.rq"/>
- <arg value="--graph"/>
- <arg value="HelloWorld.ttl"/>
<redirector output="HelloWorld.rq.txt" alwayslog="true" append="true"/>
</exec>
@@ -1881,7 +1882,8 @@ ignoreSetupDownloadErrors=true
<Saxon9 scene="newScene"
stylesheet="${stylesheet.dir}/X3dToJava"
extension="java"
- expand="on"/>
+ expand="on"
+ parameterPair1="className=newScene"/>
<!-- expand:on since DTD defaults needed -->
<echo>newScene.py creation with X3dToPython.xslt</echo>
<!-- JavaScript Object Notation (JSON) -->
@@ -1901,12 +1903,12 @@ ignoreSetupDownloadErrors=true
<!-- expand:on since DTD defaults needed -->
<echo message="${arq} --data ${semantics.dir}/ontologies/X3dOntology4.0.ttl --query ${semantics.dir}/queries/X3dHelloWorldQuery_03.rq --graph newScene.ttl"/>
<exec executable="${arq}" dir="." vmlauncher="false">
+ <arg value="--graph"/>
+ <arg value="newScene.ttl"/>
<arg value="--data"/>
<arg value="${semantics.dir}/ontologies/X3dOntology4.0.ttl"/>
<arg value="--query"/>
<arg value="${semantics.dir}/queries/X3dHelloWorldQuery_03.rq"/>
- <arg value="--graph"/>
- <arg value="newScene.ttl"/>
<redirector output="newScene.rq.txt" alwayslog="true" append="true"/>
</exec>
@@ -2269,6 +2271,8 @@ ignoreSetupDownloadErrors=true
<antcall target="processScenes.javadoc"/>
<antcall target="processScripts.jslint"/>
<antcall target="processScenes.json"/>
+ <antcall target="processScenes.python"/>
+ <antcall target="processScenes.turtle"/>
<antcall target="processScenes.X3dToX_ITE.html"/>
<antcall target="processScenes.X3dToX3domXhtml"/>
<antcall target="processScenes.X3dToX3dvClassicVrmlEncoding"/>
@@ -3969,6 +3973,12 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
</sourcefiles>
<mapper dir="." type="glob" from="*.x3d" to="*.java"/>
<sequential>
+ <if>
+ <!-- https://ant.apache.org/manual/Tasks/conditions.html -->
+ <not>
+ <contains string="${name.short}" substring="XvlShell" />
+ </not>
+ <then>
<!-- process individual files here. show full path to facilitate user loading, editing of reported files -->
<echo>${archive.path}/${relative.path1}/${relative.path2}/${name.short}.x3d converted to ${name.short}.java</echo>
<!-- Saxon9 is locally defined macro -->
@@ -4066,6 +4076,11 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
classpath="${java.classes.dir};${x3djsail.stylesheets.dir}/${jsai.full.archive.jar.name}"
failonerror="false"/>
<echo message="==================================="/>
+ </then>
+ <else>
+ <echo message=" ... no Java source available for LatticeXvl ${name.short}.x3d"/>
+ </else>
+ </if>
</sequential>
</outofdate>
</sequential>
@@ -4260,7 +4275,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
<!-- Default options:
parameterPair1="defaultModelPrefix="
-->
- <echo>Query ${name.short}.ttl using SPARQL as self-validation test:</echo>
+ <echo>${archive.path}/${relative.path1}/${relative.path2}/${name.short}.ttl self-validation test using SPARQL query:</echo>
<if>
<!-- https://ant.apache.org/manual/Tasks/conditions.html -->
<contains string="${name.short}" substring="{name.short}" /><!-- undefined -->
@@ -4276,12 +4291,12 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
<copy file="${semantics.dir}/queries/X3dHelloWorldQuery_03.rq" tofile="${relative.path1}/${relative.path2}/${name.short}.rq.txt"/>
<echo message="${arq} --data ${semantics.dir}/ontologies/X3dOntology4.0.ttl --query ${semantics.dir}/queries/X3dHelloWorldQuery_03.rq --graph ${relative.path1}/${relative.path2}/${name.short}.ttl"/>
<exec executable="${arq}" dir="." vmlauncher="false">
+ <arg value="--graph"/>
+ <arg value="${relative.path1}/${relative.path2}/${name.short}.ttl"/>
<arg value="--data"/>
<arg value="${semantics.dir}/ontologies/X3dOntology4.0.ttl"/>
<arg value="--query"/>
<arg value="${semantics.dir}/queries/X3dHelloWorldQuery_03.rq"/>
- <arg value="--graph"/>
- <arg value="${relative.path1}/${relative.path2}/${name.short}.ttl"/>
<redirector output="${relative.path1}/${relative.path2}/${name.short}.rq.txt" alwayslog="true" append="true"/>
</exec>
<echo message="X3dToTurtle.xslt conversion of ${name.short}.x3d to ${name.short}.ttl complete."/>
@@ -4294,7 +4309,6 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
</for>
<antcall target="echo.timestamp"/>
<echo>processScenes.turtle complete.</echo>
- <!-- <antcall target="processScenes.javadoc"/> -->
<echo message="==============================================================="/>
</target>
@@ -4317,7 +4331,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
notree="${javadoc.notree}"
Overview="${javadoc.dir}/overview.html"
Private="${javadoc.private}"
- source="${java.src.dir}"
+ source="${java.source}"
Splitindex="${javadoc.splitindex}"
Use="${javadoc.use}"
useexternalfile="yes"
--
GitLab