Changeset 31972

Timestamp:

2017-09-15T20:55:51+12:00 (7 years ago)

Author:

ak19

Message:

GS2 on Mac now comes with a bundled JRE, since Maverick or Yosemite onwards, we're not guaranteed to have a system Java. So now GS2 needs to also set the Java env vars to the JAVA found (JRE_HOME or JAVA_HOME, and update PATH). This is necessary if GLI for instance needs to build a lucene collection, which requires java in the environment to launch it.

Location:

main/trunk/greenstone2

Files:

• perllib/IncrementalBuildUtils.pm (modified) (1 diff)
• setup.bash (modified) (1 diff)

main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

@@ -79 +79 @@
 # Ensure the collection specific binaries are on the search path
 my $path_separator = ":";
-if($ENV{'GSDLOS'} =~ /win/) {
+if($ENV{'GSDLOS'} =~ /^win/) {
   $path_separator = ";";
 }

main/trunk/greenstone2/setup.bash

@@ -300 +300 @@
 fi
 
+# Only for GS2: work out java, and if the bundled jre is found, then set Java env vars with it
+# Then the same java will be consistently available for all aspects of GS2 (server or GLI, and any subshells these launch)
+if [ "x$GSDL3SRCHOME" = "x" ] ; then
+    echo "@@@@ SETUP.BASH: Found GS2 installation"
+
+    SEARCH4J_EXECUTABLE="$GSDLHOME/bin/$GSDLOS$GSDLARCH/search4j"
+    if [ -f "$SEARCH4J_EXECUTABLE" ]; then
+    MINIMUM_JAVA_VERSION=1.5.0_00   
+    
+    # Give search4j a hint to find Java depending on the platform
+        # we now include a JRE with Mac (Mountain) Lion, because from Yosemite onwards there's no system Java on Macs
+    HINT=`cd "$GSDLHOME";pwd`/packages/jre    
+    
+        # we can't use boolean operator -a to do the AND, since it doesn't "short-circuit" if the first test fails
+        # see http://www.tldp.org/LDP/abs/html/comparison-ops.html
+    if [ "x$GSDLOS" = "xdarwin" ] && [ ! -d "$HINT" ]; then
+           # http://java.dzone.com/articles/java-findingsetting
+       # explains that /usr/libexec/java_home will print the default JDK
+       # regardless of which Mac OS we're on. Tested on Maverick, Lion, Leopard
+       # (run `/usr/libexec/java_home -v 1.7` to find a specific version)
+        HINT=`/usr/libexec/java_home`
+    fi
+    
+    javahome="`"$SEARCH4J_EXECUTABLE" -p "$HINT" -m $MINIMUM_JAVA_VERSION`"
+    BUNDLED_JRE="$GSDLHOME/packages/jre"
+
+    if [ "$?" != "0" ]; then
+        echo "setup.bash: Could not find Java in the environment or installation."
+        echo "Set JAVA_HOME or JRE_HOME, and put it on the PATH, if working with Java tools like Lucene."
+    elif [ "x$javahome" != "x$BUNDLED_JRE" ]; then
+        if [ "x$JAVA_HOME" = "x" ]; then
+        # if Java env vars not already set, then set them to the $javahome found
+        echo "Found a Java on the system. Setting up GS2's Java environment to use this"
+        export JAVA_HOME=$javahome
+        export PATH=$JAVA_HOME/bin:$PATH
+        fi
+        # else JAVA_HOME, and PATH presumably too, would already be set
+    elif [ -d "$GSDLHOME/packages/jre" ]; then
+        echo "Found a bundled JRE. Setting up GS2's Java environment to use this"
+        export JRE_HOME=$GSDLHOME/packages/jre    
+        export PATH=$JRE_HOME/bin:$PATH
+    else
+        # can we ever really get here?
+        echo "Java environment not set and bundled JRE doesn't exist. Some tools need the Java environment. Proceeding without..."
+    fi
+    fi
+fi
 
 # if the Perl-for-greenstone tarfile has been installed in the bin/linux