From d5e8c19c3cf85759bf5af371b9c0761ebb6b8853 Mon Sep 17 00:00:00 2001 From: git <tdnorbra@nps.edu> Date: Wed, 21 Dec 2022 16:22:45 -0800 Subject: [PATCH] [Terry N.] catch up the the recenet rename --- build.properties | 4 ++-- build.xml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.properties b/build.properties index 8a9e7f79..841f02a2 100644 --- a/build.properties +++ b/build.properties @@ -237,9 +237,9 @@ replica=xj3d.replica.Replica sai.simserver.dir=${examples.dir}/sai/simserver examples.spec.x3d.java.dir=${examples.dir}/spec/x3d/java -xj3d.version=Version +xj3d.version.info=Xj3dVersionInformation xj3d.version.number=${product.version.major}.${product.version.level} -xj3d.version.file=${src.java.dir}/org/web3d/util/${xj3d.version}.java +xj3d.version.file=${src.java.dir}/org/web3d/util/${xj3d.version.info}.java browser.class=${browser.classes.dir}/xj3d/browser/Xj3DBrowser.class cadfilter.class=${cadfilter.classes.dir}/xj3d/filter/CDFFilter.class diff --git a/build.xml b/build.xml index 5f106186..2ba837cf 100644 --- a/build.xml +++ b/build.xml @@ -755,17 +755,17 @@ POSSIBILITY OF SUCH DAMAGE. <!-- This is a way to get our Version.java file compiled each time ant is run, --> <!-- but not have it show up in SVN as modified --> <copy file="${xj3d.version.file}" todir="."/> - <!-- put the build-time properties defined by the above step into our ${xj3d.version} file --> + <!-- put the build-time properties defined by the above step into our ${xj3d.version.info} file --> <!-- look for, e.g., DSTAMP = "blah", replace the "blah" with current property value --> - <replaceregexp file="./${xj3d.version}.java" + <replaceregexp file="./${xj3d.version.info}.java" match="DSTAMP\s++=\s++".*"" replace="DSTAMP = "${DSTAMP}""/> <echo message="DSTAMP = "${DSTAMP}""/> - <replaceregexp file="./${xj3d.version}.java" + <replaceregexp file="./${xj3d.version.info}.java" match="TSTAMP\s++=\s++".*"" replace="TSTAMP = "${TSTAMP}""/> <echo message="TSTAMP = "${TSTAMP}""/> - <replaceregexp file="./${xj3d.version}.java" + <replaceregexp file="./${xj3d.version.info}.java" match="TODAY\s++=\s++".*"" replace="TODAY = "${TODAY}""/> <echo message="TODAY = "${TODAY}""/> @@ -775,12 +775,12 @@ POSSIBILITY OF SUCH DAMAGE. source="${javac.source}" target="${javac.target}" debug="on" - includes="${xj3d.version}.java" + includes="${xj3d.version.info}.java" classpathref="app.classpath" includeantruntime="false"> <compilerarg line="${javac.compilerargs}"/> </javac> - <delete file="./${xj3d.version}.java"/> + <delete file="./${xj3d.version.info}.java"/> </target> <target name="javadoc" -- GitLab