You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2012/11/24 18:22:55 UTC
svn commit: r1413208 - in /maven/maven-3/trunk/apache-maven/src/bin: mvn
mvnDebug mvnyjp
Author: jvanzyl
Date: Sat Nov 24 17:22:54 2012
New Revision: 1413208
URL: http://svn.apache.org/viewvc?rev=1413208&view=rev
Log:
MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX
Modified:
maven/maven-3/trunk/apache-maven/src/bin/mvn
maven/maven-3/trunk/apache-maven/src/bin/mvnDebug
maven/maven-3/trunk/apache-maven/src/bin/mvnyjp
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvn
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvn?rev=1413208&r1=1413207&r2=1413208&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvn (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvn Sat Nov 24 17:22:54 2012
@@ -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.
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvnDebug
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvnDebug?rev=1413208&r1=1413207&r2=1413208&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvnDebug (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvnDebug Sat Nov 24 17:22:54 2012
@@ -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
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvnyjp
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvnyjp?rev=1413208&r1=1413207&r2=1413208&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvnyjp (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvnyjp Sat Nov 24 17:22:54 2012
@@ -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
;;