diff --git a/build.xml b/build.xml index 372476fa7e549133b3a77f762076d5cdef30e0d4..66bd0ed60b3a69f6148970cba89c2a49aef49ed8 100644 --- a/build.xml +++ b/build.xml @@ -551,7 +551,7 @@ Key references: </fail> </target> - <target name="clean.all" depends="clean.backups,clean.duplicates,clean.Canonical.xml,clean.htmlPrettyPrintDocumentation,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.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"/> @@ -702,7 +702,7 @@ Key references: </for> </target> - <target name="clean.htmlPrettyPrintDocumentation" description="clean out autogenerated pretty-print *.html files (only)"> + <target name="clean.htmlPrettyPrintPages" description="clean out autogenerated pretty-print *.html files (only)"> <echo message="clean/delete autogenerated pretty-print files matching *.x3d scenes: *.html "/> <for param="file.path.name"> <path> @@ -2277,7 +2277,7 @@ ignoreSetupDownloadErrors=true <!-- processScenes.canonicalX3D occurs second because it replaces original .x3d scene --> <!-- processScenes.X3DtoVRML97 occurs third because provides diagnostic scene correctness checks --> <!-- processScripts.jslint, X3dToJson occur fourth,fifth & provide diagnostic script correctness checks --> - <!-- processScenes.captureImages occurs sixth because it must be performed before processScenes.X3dToHtmlListing --> + <!-- processScenes.captureImages occurs sixth because it must be performed before processScenes.htmlPrettyPrintPages --> <!-- this task depends on other tasks to look through the directories, only updating as needed --> <antcall target="processScenes.regularExpressionChecks"/> <antcall target="processScenes.canonicalX3D"/> @@ -2292,13 +2292,13 @@ ignoreSetupDownloadErrors=true <antcall target="processScenes.X3dToX3domXhtml"/> <antcall target="processScenes.X3dToX3dvClassicVrmlEncoding"/> <antcall target="processScenes.X3dToX3dbCompressedBinaryEncoding"/> - <!-- processScenes.captureImages need to precede processScenes.X3dToHtmlListing --> + <!-- processScenes.captureImages need to precede processScenes.htmlPrettyPrintPages --> <antcall target="processScenes.captureImages"/> - <antcall target="processScenes.X3dToHtmlListing"/> + <antcall target="processScenes.htmlPrettyPrintPages"/> <echo message="${archive.name} processScenes complete."/> </target> - <target name="processScenes.X3dToHtmlListing" description="convert each .x3d scene into pretty-print .html version, also generate SVG diagrams of 2D plots such as Extrusion crossSection" depends="get.saxon"> + <target name="processScenes.htmlPrettyPrintPages" description="convert each .x3d scene into pretty-print .html version, also generate SVG diagrams of 2D plots such as Extrusion crossSection" depends="get.saxon"> <for param="file.path.name"> <path> <fileset refid="x3dScenes"/> @@ -2364,7 +2364,7 @@ ignoreSetupDownloadErrors=true <include name="**/*.svg"/> </replace> <antcall target="echo.timestamp"/> - <echo>processScenes.X3dToHtmlListing complete.</echo> + <echo>processScenes.htmlPrettyPrintPages complete.</echo> </target> <target name="processScenes.X3dToX3domXhtml" description="convert each .x3d scene into *X3dom.xhtml version for X3DOM" depends="get.saxon,clean.RoundTrip"> @@ -2962,7 +2962,7 @@ ignoreSetupDownloadErrors=true </touch> --> </target> - <target name="processScenes.touch.HtmlPages" description="update timestamp on X3D documentation pages to allow reshooting images and processing scenes"> + <target name="processScenes.touch.htmlPrettyPrintPages" description="update timestamp on X3D documentation pages to allow reshooting images and processing scenes"> <for param="file.path.name"> <path> <fileset refid="x3dScenes"/> @@ -3120,7 +3120,7 @@ TODO: fix Xj3D from launching window, instead perform offline rendering while h <target name="processScenes.captureImages" description="Utilize Xj3D's Replica class to create thumbnails and viewpoint images for each scene for use as icons, triggered by html timestamp, then updates html"> <echo message="Utilize Xj3D's Replica class to create thumbnails and viewpoint images for each scene for use as icons, triggered by html timestamp, then updates html"/> - <echo message="Optional prerequisite: touch.X3dScenes or clean.htmlPrettyPrintDocumentation prior to reshooting all images"/> + <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}"/>