Changeset 33931

Timestamp:

2020-02-15T19:10:54+13:00 (4 years ago)

Author:

davidb

Message:

Two changes to setup file. The first was to move the test for ant to be after running local/gs-setup.sh files as it could very well be the local/gs3-setup.sh file that adds in ant (when the test is earlier it can report that it has been unable to find it, which can be misleading). The second change relates to testing the bitness: 32-bit or 64-bit. Newer version of java (e.g. 1.11), no longer appear to support the -d flag related to bitness. The change still tries out a -d test, but if that fails the newer code added then uses 'file' to figure out the bitness of the binary and compare that with the compiled-up Greenstone bitness. For the ant change, it looks like how the Windows gs3-setup.bat does this and the message displayed isn't so confusing, so can probably stay as it is. For the bitness test, it would be good to update this to be the same as what has been done in this commit for the unix gs3-setup.sh file

File:

• main/trunk/greenstone3/gs3-setup.sh (modified) (5 diffs)

main/trunk/greenstone3/gs3-setup.sh

@@ -122 +122 @@
   echo "  - Adjusted LD_LIBRARY_PATH and DYLD_LIBRARY_PATH"
 
-  #ant
-  ANT_VERSION=1.7.1
-  if [ -x "$GSDL3SRCHOME/packages/ant/bin/ant" ]; then
-    ANT_HOME="$GSDL3SRCHOME/packages/ant"
-    export ANT_HOME
-    addtopath PATH "$ANT_HOME/bin"
-    echo "  - Setup Greenstone ant ($GSDL3SRCHOME/packages/ant)"
-  else
-    which ant &> /dev/null
-    if [ "$?" == "0" ]; then
-      echo "  - WARNING: Greenstone 'Ant' package missing - falling back to system Ant"
-      echo "             Note that Greenstone requires Ant $ANT_VERSION or greater"
-    elif [ "ANT_HOME" != "" ]; then
-      addtopath PATH "$ANT_HOME/bin"
-      echo "  - WARNING: Greenstone 'Ant' package missing - falling back to system Ant"
-      echo "             Note that Greenstone requires Ant $ANT_VERSION or greater"
-    else
-      echo "  - ERROR: Greenstone 'Ant' package missing - please install Ant yourself"
-      echo "           Note that Greenstone requires Ant $ANT_VERSION or greater"
-    fi
-  fi
-
   #ImageMagick
   #if test -d "$GSDL3SRCHOME/gs2build/bin/$GSDLOS/imagemagick" ; then
@@ -309 +287 @@
     else
       # search4j wasn't present, and no bundled JRE, so check JAVA_HOME or JRE_HOME manually
-      echo "*** Could not find an appropriate JDK or JRE java"
-      echo "*** Attempting to use JAVA_HOME else JRE_HOME in the environment"
-
+      #echo "*** Could not find an appropriate JDK or JRE java"
+      #echo "*** Attempting to use JAVA_HOME else JRE_HOME in the environment"
+      echo "Checking for Java explicitly set through environment variables"
       if [ "$JAVA_HOME" != "" ] && [ "`which java`" == "$JAVA_HOME/bin/java" ]; then
-      echo "  - Using java at $JAVA_HOME"
-      echo "  - WARNING: Greenstone has not checked the version number of this java installation"
-      echo "             The source distribution of Greenstone3 requires java 1.5 or greater"
-      echo "             (SVN users may still use java 1.4)"
+      echo "  - Using Java at $JAVA_HOME"
+      echo "  - Detected Java version: `$JAVA_HOME/bin/java -version 2>&1 | head -n 1`"
+      echo "  - Note that Greenstone requires Java 1.5 or greater"
+#     echo "  - WARNING: Greenstone has not checked the version number of this java installation"
+#     echo "             The source distribution of Greenstone3 requires java 1.5 or greater"
+#     echo "             (SVN users may still use java 1.4)"
       elif [ "$JRE_HOME" != "" ] && [ "`which java`" == "$JRE_HOME/bin/java" ]; then
       echo "  - Using java at $JRE_HOME"
-      echo "  - WARNING: Greenstone has not checked the version number of this java installation"
-      echo "             The source distribution of Greenstone3 requires java 1.5 or greater"
-      echo "             (SVN users may still use java 1.4)"
+      echo "  - Detected Java version: `$JAVA_HOME/bin/java -version 2>&1 | head -n 1`"
+      echo "  - Note that Greenstone requires Java 1.5 or greater"    
+#     echo "  - WARNING: Greenstone has not checked the version number of this java installation"
+#     echo "             The source distribution of Greenstone3 requires java 1.5 or greater"
+#     echo "             (SVN users may still use java 1.4)"
       
       #failing all that, print a warning
@@ -374 +356 @@
 
     checkJavaBitnessAgainstGSBitness "$PATHTOJAVA" "$bitness"
-    
+    check_status=$?
+
     isjavaset=false
 
-    if [ "$?" == "0" ]; then
+    if [ "$check_status" == "0" ]; then
     # http://tldp.org/LDP/abs/html/comparison-ops.html
     if [ "$bitness" != "-1" ] && [ "$DEBUG" == "true" ]; then
@@ -425 +408 @@
     return 0
     elif [ "$?" == "1" ]; then
-    return 1
+
+        # Newer Java's don't support -d, so result to using 'file' to determin bitness of 'java' binary
+        java_bitness=`file $java_installation/bin/java`
+        if [[ $java_bitness == *"$bitness-bit"* ]]; then
+        return 0
+    else
+        return 1
+    fi
     else
     echo "*** Problem determining bitness of java using java at $java_installation"
@@ -528 +518 @@
 checkJava
 echo ""
+
+#ant
+ANT_VERSION=1.7.1
+echo "Checking for Ant"
+if [ -x "$GSDL3SRCHOME/packages/ant/bin/ant" ]; then
+  ANT_HOME="$GSDL3SRCHOME/packages/ant"
+  export ANT_HOME
+  addtopath PATH "$ANT_HOME/bin"
+  echo "  - Setup Greenstone ant ($GSDL3SRCHOME/packages/ant)"
+else
+  if [ "ANT_HOME" != "" ]; 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
+      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'"
+    fi
+  fi
+fi
+