svn commit: r1623915 - in /cocoon/branches/BRANCH_2_1_X: build.sh cocoon.sh

Author: crossley
Date: Wed Sep 10 07:00:08 2014
New Revision: 1623915

URL: http://svn.apache.org/r1623915
Log:
Enable 'java' to be found on a modern Mac OS X.

Modified:
    cocoon/branches/BRANCH_2_1_X/build.sh
    cocoon/branches/BRANCH_2_1_X/cocoon.sh

Modified: cocoon/branches/BRANCH_2_1_X/build.sh
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/build.sh?rev=1623915&r1=1623914&r2=1623915&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/build.sh (original)
+++ cocoon/branches/BRANCH_2_1_X/build.sh Wed Sep 10 07:00:08 2014
@@ -23,6 +23,17 @@ chmod u+x ./tools/bin/ant
 S=":";
 case "`uname`" in
    CYGWIN*) S=";" ;;
+   Darwin*) darwin=true
+           if [ -z "$JAVA_HOME" ] ; then
+             if [ -x '/usr/libexec/java_home' ] ; then
+               JAVA_HOME=`/usr/libexec/java_home`
+             elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
+               JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+             else
+               JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+             fi
+           fi
+           ;;
 esac
 
 # ----- Ignore system CLASSPATH variable

Modified: cocoon/branches/BRANCH_2_1_X/cocoon.sh
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/cocoon.sh?rev=1623915&r1=1623914&r2=1623915&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/cocoon.sh (original)
+++ cocoon/branches/BRANCH_2_1_X/cocoon.sh Wed Sep 10 07:00:08 2014
@@ -94,7 +94,13 @@ case "`uname`" in
   CYGWIN*) cygwin=true ;;
   Darwin*) darwin=true
            if [ -z "$JAVA_HOME" ] ; then
-             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+             if [ -x '/usr/libexec/java_home' ] ; then
+               JAVA_HOME=`/usr/libexec/java_home`
+             elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
+               JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+             else
+               JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+             fi
            fi
            ;;
 esac