mirror of https://github.com/apache/maven.git
- Look for older setups as well, thanks to @mcculls for spotting this
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413474 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
567cd13787
commit
527cee25ef
|
@ -58,6 +58,13 @@ case "`uname`" in
|
||||||
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
|
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
|
||||||
# for the new JDKs provided by Oracle.
|
# for the new JDKs provided by Oracle.
|
||||||
#
|
#
|
||||||
|
if [[ -z "$JAVA_HOME" && -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ]] ; then
|
||||||
|
#
|
||||||
|
# Apple JDKs
|
||||||
|
#
|
||||||
|
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then
|
if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then
|
||||||
#
|
#
|
||||||
# Apple JDKs
|
# Apple JDKs
|
||||||
|
|
|
@ -62,6 +62,13 @@ case "`uname`" in
|
||||||
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
|
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
|
||||||
# for the new JDKs provided by Oracle.
|
# for the new JDKs provided by Oracle.
|
||||||
#
|
#
|
||||||
|
if [[ -z "$JAVA_HOME" && -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ]] ; then
|
||||||
|
#
|
||||||
|
# Apple JDKs
|
||||||
|
#
|
||||||
|
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then
|
if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then
|
||||||
#
|
#
|
||||||
# Apple JDKs
|
# Apple JDKs
|
||||||
|
|
|
@ -66,6 +66,13 @@ case "`uname`" in
|
||||||
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
|
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
|
||||||
# for the new JDKs provided by Oracle.
|
# for the new JDKs provided by Oracle.
|
||||||
#
|
#
|
||||||
|
if [[ -z "$JAVA_HOME" && -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ]] ; then
|
||||||
|
#
|
||||||
|
# Apple JDKs
|
||||||
|
#
|
||||||
|
export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then
|
if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then
|
||||||
#
|
#
|
||||||
# Apple JDKs
|
# Apple JDKs
|
||||||
|
@ -79,11 +86,6 @@ case "`uname`" in
|
||||||
#
|
#
|
||||||
export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
|
export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$YJP_HOME" ]; then
|
|
||||||
YJP_HOME=/Applications/YourKit_Java_Profiler_11.0.9.app
|
|
||||||
fi
|
|
||||||
YJPLIB=$YJP_HOME/bin/mac/libyjpagent.jnilib
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue