From ef9aee9870973d38ea524a9f12ded48b5a8de68e Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sun, 22 Mar 2020 16:18:53 -0700
Subject: [PATCH] check.ant.java.versions
---
build.xml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 9142ae48f1..9c211f3658 100644
--- a/build.xml
+++ b/build.xml
@@ -466,7 +466,7 @@ Key references:
</macrodef>
<!-- target tasks common to all build files ===================================================================== -->
- <target name="all" depends="echo.timestamp,check.ant.version,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,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>
@@ -519,15 +519,16 @@ Key references:
<antcall target="echo.timestamp"/>
</target>
- <target name="build" depends="echo.timestamp,check.ant.version,clean.duplicates,get.slideshowTools,commonSetup,processScenes,catalog,zip" description="build this X3D archive">
+ <target name="build" depends="echo.timestamp,check.ant.java.versions,clean.duplicates,get.slideshowTools,commonSetup,processScenes,catalog,zip" description="build this X3D archive">
<!-- note no validation occurs -->
<antcall target="echo.timestamp"/>
<echo message="build complete."/>
</target>
- <target name="check.ant.version" description="Check Apache Ant version">
- <echo message="saxon: using ${saxon.dir}/${saxon.jar}"/>
+ <target name="check.ant.java.versions" description="Check Apache Ant and Java versions">
<echo message="ant.version=${ant.version}"/>
+ <echo message=" java.home=${java.home}"/>
+ <echo message=" saxon path=${saxon.dir}/${saxon.jar}"/>
<echoproperties/>
<fail message="Build requires Apache Ant version 1.7, 1.8, 1.9 or 1.10">
<condition>
--
GitLab