maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aherit...@apache.org
Subject [17/50] git commit: - Look for older setups as well, thanks to @mcculls for spotting this
Date Sat, 01 Dec 2012 14:50:02 GMT
- 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


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f5277fc9
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f5277fc9
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f5277fc9

Branch: refs/heads/feature/colorized-console/log4j2
Commit: f5277fc993a4ea6aadca641148397c3256f7716c
Parents: 1f5069e
Author: Jason van Zyl <jvanzyl@apache.org>
Authored: Mon Nov 26 03:50:32 2012 +0000
Committer: Arnaud HeĢritier <aheritier@exoplatform.com>
Committed: Sat Dec 1 13:51:04 2012 +0100

----------------------------------------------------------------------
 apache-maven/src/bin/mvn      |    7 +++++++
 apache-maven/src/bin/mvnDebug |    7 +++++++
 apache-maven/src/bin/mvnyjp   |   12 +++++++-----
 3 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/f5277fc9/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index d9a2d75..f535d38 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -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

http://git-wip-us.apache.org/repos/asf/maven/blob/f5277fc9/apache-maven/src/bin/mvnDebug
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index 14f76b1..43a09cc 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -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

http://git-wip-us.apache.org/repos/asf/maven/blob/f5277fc9/apache-maven/src/bin/mvnyjp
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index d42bc87..ec2f7e0 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -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