Changeset 35311

Timestamp:

2021-08-18T15:28:05+12:00 (3 years ago)

Author:

davidb

Message:

Now explicitly testing for minimum version of ant in build.xml, so 'warning' message in gs3-setup.sh no longer needed

Location:

main/trunk/greenstone3

Files:

• build.xml (modified) (1 diff)
• gs3-setup.sh (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -8 +8 @@
      ====================================================================== -->
 <project name="greenstone3" default="usage" basedir=".">
-  <echo>os.name: ${os.name}</echo>
+  <echo>OS    : ${os.name}</echo>
   <!--
       <echo>os.arch: ${os.arch}</echo>
       <echo>os.version: ${os.version}</echo>
-      -->
+  -->
+  
+  <antversion property="ant.version.running" />
+  <fail message="Minimum of Ant v1.7.1 required to operate Greenstone3 (detected version ${ant.version.running})">
+    <condition>
+      <not><antversion atleast="1.7.1" /></not>
+    </condition>
+  </fail>
+
 
   <!-- ============ classpath =================== -->

main/trunk/greenstone3/gs3-setup.sh

@@ -559 +559 @@
 echo ""
 
-#ant
-ANT_VERSION=1.7.1
+# Ant
 echo "Checking for Ant"
-if [ -x "$GSDL3SRCHOME/packages/ant/bin/ant" ]; then
+#Note: No longer need to print out info about minimum version of Ant needed
+#  for Greenstone3 (v1.7.1 at the time of writing this comment!), as this is
+#  now explicitly tested for in the build.xml file, and an error message generated
+#  if not new enough
+
+if [ -x "$GSDL3SRCHOME/packages/ant/bin/ant" ] ; then
   ANT_HOME="$GSDL3SRCHOME/packages/ant"
   export ANT_HOME
@@ -568 +572 @@
   echo "  - Setup Greenstone ant ($GSDL3SRCHOME/packages/ant)"
 else
-  if [ "$ANT_HOME" != "" ]; then
+  if [ "x$ANT_HOME" != "x" ] ; then
     addtopath PATH "$ANT_HOME/bin"
     echo "  - `ant -version`"
-    echo "  - Note that Greenstone requires Ant $ANT_VERSION or greater"
   else 
     which ant &> /dev/null
-    if [ "$?" = "0" ]; then
+    if [ "$?" = "0" ] ; then
       echo "  - System install ant detected"
       echo "  - `ant -version`"
-      echo "  - Note that Greenstone requires Ant $ANT_VERSION or greater"
     else
       echo "  - WARNING: Failed to find 'ant'"