From c4fedd82897444dc84745002e03420b52a99447e Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Mon, 20 Jan 2020 21:49:05 -0800
Subject: [PATCH] newlines
---
build.xml | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/build.xml b/build.xml
index a7678394c3..92f16980f2 100644
--- a/build.xml
+++ b/build.xml
@@ -50,9 +50,9 @@ POSSIBILITY OF SUCH DAMAGE.
<property name="numberOfSections" location="2"/>
<property name="subdir" location="*/*"/>
- <fileset id="x3dScenes" dir="." includes="*/*/*.x3d" excludes="_archive/*.*,**/_archive/*.*,_schematron/*.*,**/_schematron/*.*,**/hide/*,**/**/hide/*,InstallingCortonaBrowserAsPowerpointControl_files/*.*,**/build.xml,nbproject/**/*.xml,configuration/**/*.*,**/*Canonical.xml,**/*.nrrd,**/XvlShell.*"/>
- <fileset id="xmlFiles" dir="." includes="*/*/*.xml" excludes="_archive/*.*,**/_archive/*.*,_schematron/*.*,**/_schematron/*.*,**/hide/*,**/**/hide/*,InstallingCortonaBrowserAsPowerpointControl_files/*.*,**/build.xml,nbproject/**/*.xml,configuration/**/*.*,**/*Canonical.xml,**/*.nrrd,**/XvlShell.*"/>
- <fileset id="jsFiles" dir="." includes="*/*/*.js" excludes="_archive/*.*,**/_archive/*.*,_schematron/*.*,**/_schematron/*.*,**/hide/*,**/**/hide/*,InstallingCortonaBrowserAsPowerpointControl_files/*.*,**/build.xml,nbproject/**/*.xml,configuration/**/*.*,**/*Canonical.xml,**/*.nrrd,**/XvlShell.*"/>
+ <fileset id="x3dScenes" dir="." includes="*/*/*.x3d" excludes="_archive/*.*,**/_archive/*.*,_schematron/*.*,**/_schematron/*.*,**/hide/*,**/**/hide/*,**/InstallingCortonaBrowserAsPowerpointControl_files/*.*,**/build.xml,**/nbproject/**/*.xml,**/configuration/**/*.*,**/*Canonical.xml,**/*.nrrd,**/XvlShell.*"/>
+ <fileset id="xmlFiles" dir="." includes="*/*/*.xml" excludes="_archive/*.*,**/_archive/*.*,_schematron/*.*,**/_schematron/*.*,**/hide/*,**/**/hide/*,**/InstallingCortonaBrowserAsPowerpointControl_files/*.*,**/build.xml,**/nbproject/**/*.xml,**/configuration/**/*.*,**/*Canonical.xml,**/*.nrrd,**/XvlShell.*"/>
+ <fileset id="jsFiles" dir="." includes="*/*/*.js" excludes="_archive/*.*,**/_archive/*.*,_schematron/*.*,**/_schematron/*.*,**/hide/*,**/**/hide/*,**/InstallingCortonaBrowserAsPowerpointControl_files/*.*,**/build.xml,**/nbproject/**/*.xml,**/configuration/**/*.*,**/*Canonical.xml,**/*.nrrd,**/XvlShell.*"/>
<!-- properties common to all build files and archives ======================================== -->
@@ -1943,12 +1943,12 @@ ignoreSetupDownloadErrors=true
</target>
<target name="validate.full" description="XML well formed, DTD and schematron validation for all .x3d examples"
- depends="validate.DTD,validate.schema.loop,validate.schema.all.x3dv4,validate.schematron">
+ depends="validate.DTD,validate.schema.all,validate.schema.wildcard.x3dv4,validate.schematron">
<antcall target="echo.timestamp"/>
<echo message="validate.full using all methods: ${archive.name} archive complete"/>
<!-- TODO
<echo message="warning: schema validation of all files is a bit slow and is prone to java.lang.StackOverflowError within Ant"/>
- <antcall target="validate.schema.all"/><!- - possible problem: xmlcatalog not working, x3d schema is getting downloaded each time - ->
+ <antcall target="validate.schema.wildcard"/><!- - possible problem: xmlcatalog not working, x3d schema is getting downloaded each time - ->
<antcall target="validate.xmllint"/>
-->
<!-- TODO validate.schema.saxonicaSA, -->
@@ -1987,7 +1987,7 @@ ignoreSetupDownloadErrors=true
<echo>validate.DTD complete.</echo>
</target>
- <target name="validate.schema.all" description="XML validation for all .x3d examples using X3D schema as declared in scenes (caution, time consuming unless xmlcatalog points to local copy)"
+ <target name="validate.schema.wildcard" description="XML validation for all .x3d examples using X3D schema as declared in scenes (caution, time consuming unless xmlcatalog points to local copy)"
depends="clean.duplicates">
<!-- X3D schema validation -->
<echo message="Validate using X3D schema as declared in scenes: ${archive.name} archive"/>
@@ -2005,7 +2005,7 @@ ignoreSetupDownloadErrors=true
</schemavalidate>
</target>
- <target name="validate.schema.all.x3dv4" description="XML validation for all .x3d examples using X3Dv4 schema (caution, time consuming unless xmlcatalog points to local copy)"
+ <target name="validate.schema.wildcard.x3dv4" description="XML validation for all .x3d examples using X3Dv4 schema (caution, time consuming unless xmlcatalog points to local copy)"
depends="clean.duplicates">
<!-- X3D schema validation -->
<echo message="Validate using X3D schema version 4.0: ${archive.name} archive"/>
@@ -2024,7 +2024,7 @@ ignoreSetupDownloadErrors=true
</schemavalidate>
</target>
- <target name="validate.schema.loop" description="XML validation for new or modified .x3d examples using X3D schema as declared in scenes"
+ <target name="validate.schema.all" description="XML validation for new or modified .x3d examples using X3D schema as declared in scenes"
depends="clean.duplicates">
<echo message="Validate using X3D schema as declared in scenes: ${archive.name} archive, new scenes"/>
<echo message="X3D DTDs and schemas available at https://www.web3d.org/specifications"/>
@@ -2073,7 +2073,7 @@ ignoreSetupDownloadErrors=true
</sequential>
</for>
<echo>validation complete. run processScenes.canonicalX3D to change status of "new" scenes to confirmed..</echo>
- <echo>validate.schema.loop complete.</echo>
+ <echo>validate.schema.all complete.</echo>
</target>
<target name="validate.schema.saxonicaSA" description="XML validation for all .x3d examples using X3D schema as declared in scenes (caution, time consuming unless xmlcatalog points to local copy)"
@@ -3887,9 +3887,11 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
<if>
<or>
<equals arg1="${name.short}" arg2="QuadTreeExamples"></equals>
+ <equals arg1="${name.short}" arg2="SceneNodePrototype"></equals>
<equals arg1="${name.short}" arg2="SpinGroupInternalSubsetDeclaration"></equals>
<equals arg1="${name.short}" arg2="TestRegularExpressionChecks"></equals>
<equals arg1="${name.short}" arg2="TestSchematronDiagnostics"></equals>
+ <equals arg1="${name.short}" arg2="X3DRetreatProtoExercise"></equals>
</or>
<then>
<!-- avoid modifying scenes with intentional errors -->
--
GitLab