maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r1413474 - in /maven/maven-3/trunk/apache-maven/src/bin: mvn mvnDebug mvnyjp
Date Mon, 26 Nov 2012 03:50:33 GMT
Author: jvanzyl
Date: Mon Nov 26 03:50:32 2012
New Revision: 1413474

URL: http://svn.apache.org/viewvc?rev=1413474&view=rev
Log:
- Look for older setups as well, thanks to @mcculls for spotting this

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=1413474&r1=1413473&r2=1413474&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvn (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvn Mon Nov 26 03:50:32 2012
@@ -58,6 +58,13 @@ case "`uname`" in
            # 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/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
              #
              # Apple JDKs

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=1413474&r1=1413473&r2=1413474&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvnDebug (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvnDebug Mon Nov 26 03:50:32 2012
@@ -62,6 +62,13 @@ case "`uname`" in
            # 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/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
              #
              # Apple JDKs

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=1413474&r1=1413473&r2=1413474&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvnyjp (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvnyjp Mon Nov 26 03:50:32 2012
@@ -66,6 +66,13 @@ case "`uname`" in
            # 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/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
              #
              # Apple JDKs
@@ -79,11 +86,6 @@ case "`uname`" in
              #
              export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
            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
 



Mime
View raw message