Changeset 28829 for main/trunk

Timestamp:

2014-02-04T18:28:38+13:00 (10 years ago)

Author:

ak19

Message:

In the two Mac mavericks tested, java JDK was found in a different location. Furthermore, the JDK version numbers in the jdk installation folder need not be consistent. However, the means of finding out what javahome is, was consistent on Maverick. The java HINT that's set for search4j now goes through these steps to work out what the JAVAHOME hint out to be.

File:

• main/trunk/gli/findjava.sh (modified) (1 diff)

main/trunk/gli/findjava.sh

@@ -67 +67 @@
 
     # Give search4j a hint to find Java depending on the platform
-    if [ $GSDLOS = linux ]; then
+    if [ "$GSDLOS" = "linux" ]; then
     HINT=`cd "$GSDLHOME";pwd`/packages/jre
-    elif [ $GSDLOS = darwin ]; then
-    HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
-        #/System/Library/Frameworks/JavaVM.framework/Home
+    elif [ "$GSDLOS" = "darwin" ]; then
+    osversion=`uname -r | sed 's/\..*$//'`; 
+    # mac maverick is version 13
+    if [ $osversion -ge 13 ] ; then 
+        # To work out java:
+        # 1. run "which java", which for example prints /usr/bin/java
+        # 2a. then do "ls -la" on that. The result is for example
+        # lrwxr-xr-x  1 root  wheel  74 20 Jan 15:08 /usr/bin/java -> /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java
+        # 2b. remove everything before the symlink portion (before the "-> "), to get
+        # /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java
+        # 3. then suffix "_home" to it, to get
+        # /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java_home
+        # 4. Then run this executable, which will tell you JAVA_HOME, e.g.
+        # /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
+
+        whichjava=`which java`;
+        symlink=`ls -la $whichjava | sed 's/[^>]*> //'`
+        javahome=$symlink"_home"
+        HINT=`$javahome`        
+    else
+        HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+        #/System/Library/Frameworks/JavaVM.framework/Home
+    fi
+
     fi