This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository java-wrappers.
commit 518862582ccf26c7a74a792f507ef3712be8f2a4 Author: Vincent Fourmond <fourm...@debian.org> Date: Sat Jul 19 21:46:25 2008 +0000 [java-wrappers] Added a JAVA_FLAVOR customization + openjdk --- debian/changelog | 8 ++++++++ debian/control | 2 +- java-wrappers.7 | 18 ++++++++++++++++++ java-wrappers.sh | 54 ++++++++++++++++++++++++++++++++++-------------------- 4 files changed, 61 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index 289ddf6..001c83f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +java-wrappers (0.1.6) unstable; urgency=low + + * Add openjdk6 to the list of runtime flavors + * java-wrappers.sh now understands a JAVA_FLAVOR environment variable. + * Already conforms to policy 3.8.0 + + -- Vincent Fourmond <fourm...@debian.org> Sat, 19 Jul 2008 22:59:31 +0200 + java-wrappers (0.1.5) unstable; urgency=low * Fix the pattern for conjuring up a JAVA_HOME when it is missing. diff --git a/debian/control b/debian/control index 80b5f4f..6e9903e 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Vincent Fourmond <fourm...@debian.org> Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Package: java-wrappers Architecture: all diff --git a/java-wrappers.7 b/java-wrappers.7 index cfdcf6d..337cce5 100644 --- a/java-wrappers.7 +++ b/java-wrappers.7 @@ -69,6 +69,18 @@ executable is found in the path, the command is used. .TP +.B JAVA_FLAVOR +A probably more easy-to-use version of the +.I JAVA_HOME +variable: instead of specifying the full path of the java runtime, you +name it. Relevant code names can be found in the comments of the function +.I find_java_runtime +in the file +.IR /usr/lib/java-wrappers/java-wrappers.sh . +See examples below. + + +.TP .B JAVA_DEBUGGER If this is set, the wrapper will try to pick up a java debugger rather than a java interpreter. This will fail if the @@ -134,6 +146,12 @@ The same, but using .I JAVA_BINDIR=/usr/lib/kaffe/bin rasterizer +Force rasterizer to run with +.BR openjdk : + +.I JAVA_FLAVOR=openjdk rasterizer + + Debug rasterizer with Sun's debugger, while printing debugging information from the wrapper: diff --git a/java-wrappers.sh b/java-wrappers.sh index 485d855..2ee7bfa 100644 --- a/java-wrappers.sh +++ b/java-wrappers.sh @@ -33,25 +33,6 @@ java_fail() { exit 1; } -# Some initializations: -if [ "$JAVA_CLASSPATH" ]; then - java_debug "Building classpath on JAVA_CLASSPATH = '$JAVA_CLASSPATH'" -else - JAVA_CLASSPATH= -fi -if [ "$DESTDIR" ]; then - java_debug "Using DESTDIR = '$DESTDIR'" -else - DESTDIR="" -fi - -if [ "$JAVA_JARPATH" ]; then - java_debug "Jar lookup is done in JAVA_JARPATH = '$JAVA_JARPATH'" -else - JAVA_JARPATH=$DESTDIR/usr/share/java -fi - - # Try to find a Java runtime and set JAVA_HOME and JAVA_CMD accordingly. # If JAVA_CMD exists, nothing is done. If JAVA_HOME exists, only that # is searched. @@ -65,9 +46,10 @@ fi # * sun: sun's JVM, for stuff depending on the infamous com.sun classes # * sun6: sun's JVM version 6 # * icedtea: icedtea +# * openjdk: openjdk6 # # More than one argument can be specified; they will be taken into account -# in that order. +# in that order; the first one found will be selected. # # If JAVA_DEBUGGER is set, we try to use jdb rather than java, if it is # present. @@ -87,6 +69,8 @@ find_java_runtime() { kaffe="/usr/lib/kaffe /usr/lib/kaffe/pthreads /usr/lib/kaffe/jthreads" icedtea="/usr/lib/jvm/java-7-icedtea" cacao="/usr/lib/jvm/cacao" + + openjdk6="/usr/lib/jvm/java-6-openjdk" # IBM, coming from argouml.sh ibm="/usr/lib/j2*1.[456]-ibm" @@ -154,6 +138,8 @@ find_java_runtime() { ;; icedtea) DIRS="$icedtea" ;; + openjdk) DIRS="$openjdk6" + ;; *) ;; esac shift @@ -187,6 +173,34 @@ find_java_runtime() { fi } + +# Some initializations: +if [ "$JAVA_CLASSPATH" ]; then + java_debug "Building classpath on JAVA_CLASSPATH = '$JAVA_CLASSPATH'" +else + JAVA_CLASSPATH= +fi +if [ "$DESTDIR" ]; then + java_debug "Using DESTDIR = '$DESTDIR'" +else + DESTDIR="" +fi + +if [ "$JAVA_JARPATH" ]; then + java_debug "Jar lookup is done in JAVA_JARPATH = '$JAVA_JARPATH'" +else + JAVA_JARPATH=$DESTDIR/usr/share/java +fi + + +# If the user provides a JAVA_FLAVOR environment variable, we +# force the runtime to be the given flavor, such as for fund_java_runtime +if [ "$JAVA_FLAVOR" ]; then + find_java_runtime "$JAVA_FLAVOR" || \ + java_warning "Could not find runtime for user-supplied flavor '${JAVA_FLAVOR}" +fi + + # Same as find_java_runtime, but fails with an error if # nothing is found. require_java_runtime() { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-wrappers.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits