Please review any and all PUBLIC repositories, groups and associate files. These allow anyone on the Internet to access without authentication. Repository and group owners are responsible for their content and permission settings. Go to your project(s), click on Settings > General and expand the "Visibility, project features, permissions" to change this setting.

Commit 3427475e authored by Brutzman, Don's avatar Brutzman, Don

consistent cleanups, including *Tidy.x3d models

parent d848f094
......@@ -467,7 +467,7 @@ Key references:
</macrodef>
<!-- target tasks common to all build files ===================================================================== -->
<target name="all" depends="echo.timestamp,check.ant.java.versions,clean.backups,commonSetup,validate.full,build,upload" description="clean backups, build, zip and upload this X3D archive">
<target name="all" depends="echo.timestamp,check.ant.java.versions,clean.backups,clean.duplicates,clean.RoundTrip,clean.X3dTidy,commonSetup,validate.full,build,upload" description="clean backups, build, zip and upload this X3D archive">
<echo message="Copying latest build.log.txt to subdirectory ${archive.name}/_archive/"/>
<copy file="build.log.txt" todir="_archive/" overwrite="true" failonerror="false"/>
</target>
......@@ -551,7 +551,7 @@ Key references:
</fail>
</target>
<target name="clean.all" depends="clean.backups,clean.duplicates,clean.Canonical.xml,clean.htmlPrettyPrintPages,clean.java,clean.schematron,clean.SVG,clean.wrl,clean.json,clean.x3dv,clean.x3db,clean.X3domXhtml,clean.X_ITE.html,clean.slideshowTools,clean.catalog.pages,clean.X3dTidy,clean.python,clean.turtle" description="clean out autogenerated files (only)">
<target name="clean.all" depends="clean.backups,clean.duplicates,clean.RoundTrip,clean.X3dTidy,clean.Canonical.xml,clean.htmlPrettyPrintPages,clean.java,clean.schematron,clean.SVG,clean.wrl,clean.json,clean.x3dv,clean.x3db,clean.X3domXhtml,clean.X_ITE.html,clean.slideshowTools,clean.catalog.pages,clean.X3dTidy,clean.python,clean.turtle" description="clean out autogenerated files (only)">
<echo message="clean/delete autogenerated ${archive.name} catalog pages and files matching *.x3d scenes: *.html *.wrl *.x3db *.x3dv *Canonical.xml (but do not clean autogenerated images under version control)"/>
<!-- delete autogenerated directories, but not _archive directory -->
<delete dir="_svg" quiet="true" includeemptydirs="true" failonerror="false"/>
......@@ -2223,7 +2223,7 @@ ignoreSetupDownloadErrors=true
</for>
</target>
<target name="refresh.local" depends="echo.timestamp,clean.backups,clean.duplicates,clean.RoundTrip,commonSetup,processScenes,catalog" description="quick master refresh of all .x3d examples: processScenes, catalog, zip">
<target name="refresh.local" depends="echo.timestamp,clean.backups,clean.duplicates,clean.RoundTrip,clean.X3dTidy,commonSetup,processScenes,catalog" description="quick master refresh of all .x3d examples: processScenes, catalog, zip">
<!-- unreliable when network delays occur: validate.DTD -->
<antcall target="echo.timestamp"/>
<echo message="${archive.name} refresh.local complete."/>
......@@ -2257,7 +2257,7 @@ ignoreSetupDownloadErrors=true
<echo message="${archive.name} upload.pages complete."/>
</target>
<target name="upload.scenes" depends="clean.backups,clean.duplicates" description="upload scenes in examples archive (overwrite previous versions), do not upload .zip">
<target name="upload.scenes" depends="clean.backups,clean.duplicates,clean.RoundTrip,clean.X3dTidy" description="upload scenes in examples archive (overwrite previous versions), do not upload .zip">
<ant dir=".." target="scp.uploadExampleUpdates.${archive.name}.scenes"/>
<antcall target="echo.timestamp"/>
<echo message="${archive.name} upload.scenes complete."/>
......@@ -2783,10 +2783,13 @@ ignoreSetupDownloadErrors=true
</jslint>
-->
<echo>${archive.path}/${relative.path1}/${relative.path2}/${name.short}.json validation checking with json-schema-validator</echo>
<java jar="${json-schema-validator.jar}" fork="${fork}">
<echo message="... does not support latest JSON Schema, this test is not yet usable"/>
<!--
<java jar="${json-schema-validator.jar}" fork="${fork}">
<arg value="../../../../specifications/x3d-3.3-JSONSchema.json"/>
<arg value="${archive.path}/${relative.path1}/${relative.path2}/${name.short}.json"/>
</java>
-->
<!-- TODO also validate using JSON schema https://github.com/everit-org/json-schema -->
</sequential>
</outofdate>
......@@ -3123,7 +3126,8 @@ TODO: fix Xj3D from launching window, instead perform offline rendering while h
<echo message="Optional prerequisite: touch.X3dScenes or clean.htmlPrettyPrintPages prior to reshooting all images"/>
<echo message="Rework usually minimized by only regenerating images for each triggering .html change as needed."/>
<echo message="processScenes.captureImages depends on local Xj3D installation available, current directory xj3d.dir=${xj3d.dir}"/>
<echo message="-Djava.library.path=${xj3d.dir.jars}/../${native.library.path}"/>
<echo message=" -Djava.library.path=${xj3d.dir.jars}/../${native.library.path}"/>
<echo message="Xj3D Replica help follows..."/>
<!-- output help for Replica at the beginning -->
<java classname="xj3d.replica.Replica" fork="${fork}" dir=".">
<classpath>
......@@ -3559,7 +3563,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
</concat>
</target>
<target name="zip" depends="clean.backups,clean.RoundTrip,commonSetup" description="generate .zip distribution">
<target name="zip" depends="clean.backups,clean.duplicates,clean.RoundTrip,clean.X3dTidy,commonSetup" description="generate .zip distribution">
<echo>Building ${zipFileName} distribution</echo>
<!-- TODO: figure out
<if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment