conor 2003/02/15 17:12:14
Modified: . build.sh bootstrap.sh
Log:
Set JAVA_HOME for MacOSX users in bootstrap.sh and build.sh
PR: 17100
Submitted by: Jesse Stockall
Revision Changes Path
1.29 +8 -1 ant/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/ant/build.sh,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -w -u -r1.28 -r1.29
--- build.sh 1 Jun 2002 12:26:31 -0000 1.28
+++ build.sh 16 Feb 2003 01:12:14 -0000 1.29
@@ -1,11 +1,18 @@
#!/bin/sh
-# Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+# Copyright (c) 2000-2003 The Apache Software Foundation. All rights
# reserved.
+# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
+darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ fi
+ ;;
esac
REALANTHOME=$ANT_HOME
1.66 +7 -1 ant/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/ant/bootstrap.sh,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -w -u -r1.65 -r1.66
--- bootstrap.sh 1 Jun 2002 12:26:31 -0000 1.65
+++ bootstrap.sh 16 Feb 2003 01:12:14 -0000 1.66
@@ -1,12 +1,18 @@
#!/bin/sh
-# Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+# Copyright (c) 2000-2003 The Apache Software Foundation. All rights
# reserved.
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
+darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ fi
+ ;;
esac
# For Cygwin, ensure paths are in UNIX format before anything is touched
