summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorDiane Holt <holtdl@apache.org>2002-04-29 21:35:16 +0000
committerDiane Holt <holtdl@apache.org>2002-04-29 21:35:16 +0000
commite0281ea5e00797be4946e7bf4f92d7603a77b7b6 (patch)
tree9431cbeca95468f8b364cbf15ae78b581715601b /src/script
parent9a344e3b98faa046bcdf13fc53d3937bf368988f (diff)
downloadant-e0281ea5e00797be4946e7bf4f92d7603a77b7b6.tar.gz
Set JAVA_HOME for OS/X. (PR 8503)
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272594 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/script')
-rw-r--r--src/script/ant7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/script/ant b/src/script/ant
index 449a82279..3609e8196 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -26,7 +26,11 @@ cygwin=false;
darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
- Darwin*) darwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ fi
+ ;;
esac
if [ -z "$ANT_HOME" ] ; then
@@ -145,7 +149,6 @@ if [ -n "$JAVA_HOME" ] ; then
done
fi
fi
-
else
echo "Warning: JAVA_HOME environment variable is not set."
echo " If build fails because sun.* classes could not be found"