This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven2.
commit 78dfb7d37ff6a13605762fb2ba0cd579b64cf46d Author: Paul Cager <[email protected]> Date: Sun Aug 12 22:21:56 2007 +0000 Set up JAVA_HOME correctly (not yet tested). --- debian/patches/mvn-cmd.patch | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/debian/patches/mvn-cmd.patch b/debian/patches/mvn-cmd.patch index ca1dbb5..7c02c21 100644 --- a/debian/patches/mvn-cmd.patch +++ b/debian/patches/mvn-cmd.patch @@ -1,18 +1,29 @@ diff -Nur maven/maven-core/src/bin/mvn maven.new/maven-core/src/bin/mvn ---- maven/maven-core/src/bin/mvn 2007-07-18 11:52:45.000000000 +0100 -+++ maven.new/maven-core/src/bin/mvn 2007-07-18 11:54:56.000000000 +0100 -@@ -37,6 +37,10 @@ - # ---------------------------------------------------------------------------- - +--- maven/maven-core/src/bin/mvn 2007-08-12 17:51:18.000000000 +0100 ++++ maven.new/maven-core/src/bin/mvn 2007-08-12 21:17:51.000000000 +0100 +@@ -72,9 +72,21 @@ + ;; + esac +if [ -z "$M2_HOME" ] ; then + M2_HOME="/usr/share/maven2" +fi + if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME="/usr" + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` ++ else ++ # Debian patch - search for suitable iinstalled JRE, favouring a SUN implementation. ++ for jre in /usr/lib/jvm/*-sun-* /usr/lib/jvm/* /usr/share/kaffe-common ; do ++ if [ -x $jre/bin/java ] ; then ++ JAVA_HOME=$jre ++ break ++ fi ++ done + fi fi -@@ -164,7 +168,7 @@ + +@@ -160,7 +172,7 @@ exec "$JAVACMD" \ $MAVEN_OPTS \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
