From adede93ab100e1abf809bc68984d9ad947978594 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 17 Jan 2013 14:18:16 +0000
Subject: [PATCH] port Tomcat's logic for setting JAVA_HOME to an script - PR
 52632

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1434680 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW       | 3 +++
 src/script/ant | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW b/WHATSNEW
index 55693cea0..a089723bc 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -65,6 +65,9 @@ Fixed bugs:
  * Zip task on <mappedresources> that excludes certain files by way of the mapper resulted in a NullPointerException
    Bugzilla Report 54026
 
+ * The ant launcher script should properly detect JAVA_HOME on
+   MacOS X 10.7
+   Bugzilla Report 52632
 
 Other changes:
 --------------
diff --git a/src/script/ant b/src/script/ant
index 11c1b598c..b5ed5be6a 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -85,7 +85,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
            ;;
   MINGW*) mingw=true ;;