Author: crossley Date: Fri Jun 27 06:22:07 2014 New Revision: 1605958 URL: http://svn.apache.org/r1605958 Log: Enable 'java' to be found on a modern Mac.
Modified: forrest/trunk/bin/forrest forrest/trunk/site-author/status.xml forrest/trunk/tools/ant/bin/ant Modified: forrest/trunk/bin/forrest URL: http://svn.apache.org/viewvc/forrest/trunk/bin/forrest?rev=1605958&r1=1605957&r2=1605958&view=diff ============================================================================== --- forrest/trunk/bin/forrest (original) +++ forrest/trunk/bin/forrest Fri Jun 27 06:22:07 2014 @@ -24,7 +24,11 @@ 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 + fi fi ;; esac Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=1605958&r1=1605957&r2=1605958&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Fri Jun 27 06:22:07 2014 @@ -153,6 +153,11 @@ Added document to facilitate <link href="site:upgrading_010">upgrading to v0.10-dev</link> </action> +<!-- 2014-## --> +<!-- 2014-06 --> + <action context="code" type="update" dev="DC"> + Enable 'java' to be found on a modern Mac. + </action> <!-- 2013-12 --> <action context="code" type="add" dev="DC" fixes-bug="FOR-1245"> Enable per-project configuration of Cocoon error handling. Modified: forrest/trunk/tools/ant/bin/ant URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/bin/ant?rev=1605958&r1=1605957&r2=1605958&view=diff ============================================================================== --- forrest/trunk/tools/ant/bin/ant (original) +++ forrest/trunk/tools/ant/bin/ant Fri Jun 27 06:22:07 2014 @@ -82,7 +82,11 @@ 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 + fi fi ;; esac