From d23549f62f9fcff76577534434927f05431358f9 Mon Sep 17 00:00:00 2001 From: brutzman <brutzman@nps.edu> Date: Sun, 22 Dec 2019 12:26:14 -0800 Subject: [PATCH] consistent whitespace --- build.xml | 78 +++++++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/build.xml b/build.xml index 436b587891..9ad8a65842 100644 --- a/build.xml +++ b/build.xml @@ -1488,21 +1488,21 @@ ignoreSetupDownloadErrors=true dest="newStylesheet.xslt" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/> <!-- Savage and SavageDefense have different licenses than Web3D archives; all are checked into version control --> <if> - <and> - <not> - <equals arg1="${archive.name}" arg2="Savage" /> - </not> - <not> - <equals arg1="${archive.name}" arg2="SavageDefense" /> - </not> - </and> - <then> - <get src="${x3d.sourceforge.site}/x3d/content/examples/license.html?format=raw" - dest="license.html" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/> - <get src="${x3d.sourceforge.site}/x3d/content/examples/license.txt?format=raw" - dest="license.txt" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/> - </then> - </if> + <and> + <not> + <equals arg1="${archive.name}" arg2="Savage" /> + </not> + <not> + <equals arg1="${archive.name}" arg2="SavageDefense" /> + </not> + </and> + <then> + <get src="${x3d.sourceforge.site}/x3d/content/examples/license.html?format=raw" + dest="license.html" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/> + <get src="${x3d.sourceforge.site}/x3d/content/examples/license.txt?format=raw" + dest="license.txt" verbose="true" ignoreerrors="${ignoreSetupDownloadErrors}"/> + </then> + </if> <antcall target="get.slideshowTools"/> </target> @@ -1771,8 +1771,8 @@ ignoreSetupDownloadErrors=true <if> <equals arg1="${use.sourceforge.site}" arg2="true" /> <then> - <get src="${x3d.sourceforge.site}/x3d/content/examples/X3dForWebAuthors/Chapter01TechnicalOverview/newScene.x3d?format=raw" - dest="newScene.x3d" ignoreerrors="${ignoreSetupDownloadErrors}"/> + <get src="${x3d.sourceforge.site}/x3d/content/examples/X3dForWebAuthors/Chapter01TechnicalOverview/newScene.x3d?format=raw" + dest="newScene.x3d" ignoreerrors="${ignoreSetupDownloadErrors}"/> </then> <else> <copy file="../newScene.x3d" todir="." overwrite="true" failonerror="true" verbose="true" preservelastmodified="true"/> @@ -2571,10 +2571,10 @@ ignoreSetupDownloadErrors=true <!-- now the correct one must be chosen --> <var name="parentX3dSceneName" unset="true"/> <if> - <contains string="@{file.path.name}" substring="Figure30.1ScriptSlidingBall.js" casesensitive="false"/> - <then> - <var name="parentX3dSceneName" value="C:\x3d-code\www.web3d.org\x3d\content\examples\Vrml2Sourcebook\Chapter30-Scripts\Figure30.1ScriptSlidingBall.x3d"/> - </then> + <contains string="@{file.path.name}" substring="Figure30.1ScriptSlidingBall.js" casesensitive="false"/> + <then> + <var name="parentX3dSceneName" value="C:\x3d-code\www.web3d.org\x3d\content\examples\Vrml2Sourcebook\Chapter30-Scripts\Figure30.1ScriptSlidingBall.x3d"/> + </then> <elseif> <contains string="@{file.path.name}" substring="donutmaker.js" casesensitive="false"/> <then> @@ -4185,23 +4185,23 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos parameterPair1="insertPackagePrefix=true" --> <echo>${archive.path}/${relative.path1}/${relative.path2}/${name.short}.py self-validation tests...</echo> - <if> - <!-- https://ant.apache.org/manual/Tasks/conditions.html --> - <contains string="${name.short}" substring="{name.short}" /><!-- undefined --> - <then> - <echo message="filename not found"/> <!-- in order to get a filename --> - </then> - <else> + <if> + <!-- https://ant.apache.org/manual/Tasks/conditions.html --> + <contains string="${name.short}" substring="{name.short}" /><!-- undefined --> + <then> + <echo message="filename not found"/> <!-- in order to get a filename --> + </then> + <else> <echo message="validate python:"/> - <!--<echo message="PYTHONPATH=${stylesheet.dir}/python"/>--> + <!--<echo message="PYTHONPATH=${env.PYTHONPATH}"/>--> <exec executable="python" dir="." vmlauncher="false"> <env key="PYTHONPATH" value="${env.PYTHONPATH}"/> <arg value="${relative.path1}/${relative.path2}/${name.short}.py"/> <!-- output-doc --> <arg value="-v"/><!-- verbose --> </exec> - </else> + </else> </if> - <echo message="==================================="/> + <echo message="==================================="/> </sequential> </outofdate> </sequential> @@ -4279,13 +4279,13 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos parameterPair1="defaultModelPrefix=" --> <echo>${archive.path}/${relative.path1}/${relative.path2}/${name.short}.ttl SPARQL query for self-validation check...</echo> - <if> - <!-- https://ant.apache.org/manual/Tasks/conditions.html --> - <contains string="${name.short}" substring="{name.short}" /><!-- undefined --> - <then> - <echo message="filename not found"/> <!-- in order to get a filename --> - </then> - <else> + <if> + <!-- https://ant.apache.org/manual/Tasks/conditions.html --> + <contains string="${name.short}" substring="{name.short}" /><!-- undefined --> + <then> + <echo message="filename not found"/> <!-- in order to get a filename --> + </then> + <else> <!-- verbose output of converted .ttl file <loadfile property="turtleFileContents" srcFile="${relative.path1}/${relative.path2}/${name.short}.ttl" /> <echo message="${turtleFileContents}" /> @@ -4305,7 +4305,7 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos <echo message="X3dToTurtle.xslt conversion of ${name.short}.x3d to ${name.short}.ttl complete."/> </else> </if> - <echo message="==================================="/> + <echo message="==================================="/> </sequential> </outofdate> </sequential> -- GitLab