You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2012/12/01 15:50:03 UTC
[35/50] git commit: MNG-5376: Account for changes between the Apple
and Oracle JDKs on OSX
MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413208 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9fc13b63
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9fc13b63
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9fc13b63
Branch: refs/heads/feature/colorized-console/log4j2
Commit: 9fc13b63ec12fab8f7cdc019478ffd45e25f75bf
Parents: 176ff96
Author: Jason van Zyl <jv...@apache.org>
Authored: Sat Nov 24 17:22:54 2012 +0000
Committer: Arnaud HeĢritier <ah...@exoplatform.com>
Committed: Sat Dec 1 13:51:02 2012 +0100
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 3 +--
apache-maven/src/bin/mvnDebug | 21 ++++++++++++++++-----
apache-maven/src/bin/mvnyjp | 26 +++++++++++++++++++-------
3 files changed, 36 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/9fc13b63/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 6dd9d5e..ecebe9f 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -53,8 +53,7 @@ mingw=false
case "`uname`" in
CYGWIN*) cygwin=true ;;
MINGW*) mingw=true;;
- Darwin*) darwin=true
-
+ Darwin*) darwin=true
#
# Look for the Apple JDKs first to preserve the existing behaviour, and then look
# for the new JDKs provided by Oracle.
http://git-wip-us.apache.org/repos/asf/maven/blob/9fc13b63/apache-maven/src/bin/mvnDebug
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index 04babaa..b7fffc7 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -58,12 +58,23 @@ case "`uname`" in
CYGWIN*) cygwin=true ;;
MINGW*) mingw=true;;
Darwin*) darwin=true
- if [ -z "$JAVA_VERSION" ] ; then
- JAVA_VERSION="CurrentJDK"
- fi
- if [ -z "$JAVA_HOME" ] ; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ #
+ # Look for the Apple JDKs first to preserve the existing behaviour, and then look
+ # for the new JDKs provided by Oracle.
+ #
+ if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then
+ #
+ # Apple JDKs
+ #
+ JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi
+
+ if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then
+ #
+ # Oracle JDKs
+ #
+ JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+ fi
;;
esac
http://git-wip-us.apache.org/repos/asf/maven/blob/9fc13b63/apache-maven/src/bin/mvnyjp
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index 4c22d51..99154db 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -61,15 +61,27 @@ mingw=false
case "`uname`" in
CYGWIN*) cygwin=true ;;
MINGW*) mingw=true;;
- Darwin*) darwin=true
- if [ -z "$JAVA_VERSION" ] ; then
- JAVA_VERSION="CurrentJDK"
- fi
- if [ -z "$JAVA_HOME" ] ; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ Darwin*) darwin=true
+ #
+ # Look for the Apple JDKs first to preserve the existing behaviour, and then look
+ # for the new JDKs provided by Oracle.
+ #
+ if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then
+ #
+ # Apple JDKs
+ #
+ JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
fi
+
+ if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then
+ #
+ # Oracle JDKs
+ #
+ JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+ fi
+
if [ -z "$YJP_HOME" ]; then
- YJP_HOME=/Applications/YourKit.app
+ YJP_HOME=/Applications/YourKit_Java_Profiler_11.0.9.app
fi
YJPLIB=$YJP_HOME/bin/mac/libyjpagent.jnilib
;;