Browse Source

Set JAVA_HOME for MacOSX users in bootstrap.sh and build.sh

PR:	17100
Submitted by:	Jesse Stockall


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274072 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 22 years ago
parent
commit
12ad2ad389
2 changed files with 15 additions and 2 deletions
  1. +7
    -1
      bootstrap.sh
  2. +8
    -1
      build.sh

+ 7
- 1
bootstrap.sh View File

@@ -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


+ 8
- 1
build.sh View File

@@ -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


Loading…
Cancel
Save