[pkg-java] r6713 - in trunk/java-wrappers: . debian

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2008-07-19 21:46:25 +0000 (Sat, 19 Jul 2008)
New Revision: 6713

Modified:
   trunk/java-wrappers/debian/changelog
   trunk/java-wrappers/debian/control
   trunk/java-wrappers/java-wrappers.7
   trunk/java-wrappers/java-wrappers.sh
Log:
[java-wrappers] Added a JAVA_FLAVOR customization + openjdk

Modified: trunk/java-wrappers/debian/changelog
===================================================================
--- trunk/java-wrappers/debian/changelog	2008-07-18 09:15:07 UTC (rev 6712)
+++ trunk/java-wrappers/debian/changelog	2008-07-19 21:46:25 UTC (rev 6713)
@@ -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 <fourmond at 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. 

Modified: trunk/java-wrappers/debian/control
===================================================================
--- trunk/java-wrappers/debian/control	2008-07-18 09:15:07 UTC (rev 6712)
+++ trunk/java-wrappers/debian/control	2008-07-19 21:46:25 UTC (rev 6713)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Vincent Fourmond <fourmond at debian.org>
 Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: java-wrappers
 Architecture: all

Modified: trunk/java-wrappers/java-wrappers.7
===================================================================
--- trunk/java-wrappers/java-wrappers.7	2008-07-18 09:15:07 UTC (rev 6712)
+++ trunk/java-wrappers/java-wrappers.7	2008-07-19 21:46:25 UTC (rev 6713)
@@ -69,6 +69,18 @@
 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 @@
 
 .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:
 

Modified: trunk/java-wrappers/java-wrappers.sh
===================================================================
--- trunk/java-wrappers/java-wrappers.sh	2008-07-18 09:15:07 UTC (rev 6712)
+++ trunk/java-wrappers/java-wrappers.sh	2008-07-19 21:46:25 UTC (rev 6713)
@@ -33,25 +33,6 @@
     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 @@
 #  * 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 @@
     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 @@
 		    ;;
 		icedtea) DIRS="$icedtea"
 		    ;;
+		openjdk) DIRS="$openjdk6"
+		    ;;
 		*) ;;
 	    esac
 	    shift
@@ -187,6 +173,34 @@
     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() {