[javatools] 01/08: jh_depend: Added support for Java 8

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository javatools.

commit 668c573f3a122fd50a198bf1f298cd064e9fd91a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 22 18:29:10 2016 +0200

    jh_depend: Added support for Java 8
---
 debian/changelog |  7 +++++++
 jh_depends       | 18 +++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19b65e4..7138c76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+javatools (0.56) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * jh_depend: Added support for Java 8
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 22 Jul 2016 19:00:43 +0200
+
 javatools (0.55) unstable; urgency=medium
 
   * Team upload.
diff --git a/jh_depends b/jh_depends
index 5d2786c..8b0d755 100755
--- a/jh_depends
+++ b/jh_depends
@@ -19,7 +19,7 @@ syntax()
    echo -e "\t-a --arch: work on all arch-specific packages"
    echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
    echo -e "\t-n --no-act: don't actually do anything, just print the results"
-   echo -e "\t-j[<jvm>] --jvm[=<jvm>]: Options are: default, headless, gcj, open, open6 or open7. Can be a space-separated list."
+   echo -e "\t-j[<jvm>] --jvm[=<jvm>]: Options are: default, headless, gcj, open, open6, open7 or open8. Can be a space-separated list."
    echo -e "\t-X<package> --exclude=<package>: don't add this package to depends"  
    echo -e ""
    echo -e "Note: \"headless\" (for --jvm) affects other values and alternatives (e.g. java7-runtime becomes"
@@ -47,11 +47,13 @@ getclassversion()
 getalternatedepends()
 {
 	if (( $1 < 50 )); then
-		echo "| java5-runtime$2 | java6-runtime$2 | java7-runtime$2"
+		echo "| java5-runtime$2 | java6-runtime$2 | java7-runtime$2 | java8-runtime$2"
 	elif [ "$1" == "50" ]; then
-		echo "| java6-runtime$2 | java7-runtime$2"
+		echo "| java6-runtime$2 | java7-runtime$2 | java8-runtime$2"
 	elif [ "$1" == "51" ]; then
-		echo "| java7-runtime$2"
+		echo "| java7-runtime$2 | java8-runtime$2"
+	elif [ "$1" == "52" ]; then
+		echo "| java8-runtime$2"
 	else
 		echo "Warning: Class version too new to recognise ($1), might not run with any JVMs" 1>&2
 	fi
@@ -75,6 +77,9 @@ function home-to-jvm()
 	if echo $JHOME | grep 7-openjdk >/dev/null; then
 		JVM="$JVM open7"
 	fi
+	if echo $JHOME | grep 8-openjdk >/dev/null; then
+		JVM="$JVM open8"
+	fi
 	echo "$JVM"
 }
 
@@ -226,6 +231,9 @@ for p in $PACKAGES; do
             "gcj")
                JVMDEPS="$JVMDEPS gcj-jre$headles $alternateversiondeps "
                ;;
+            "open8")
+               JVMDEPS="$JVMDEPS openjdk-8-jre$headless "
+               ;;
             "open7")
                JVMDEPS="$JVMDEPS openjdk-7-jre$headless "
                ;;
@@ -233,7 +241,7 @@ for p in $PACKAGES; do
                JVMDEPS="$JVMDEPS openjdk-6-jre$headless "
                ;;
             "open")
-               JVMDEPS="$JVMDEPS openjdk-7-jre$headless | openjdk-6-jre$headless "
+               JVMDEPS="$JVMDEPS openjdk-8-jre$headless | openjdk-7-jre$headless "
                ;;
             *)
                echo "Warning: unknown JVM type: $j"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javatools.git