This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository javatools.
commit 6a7963c5df69484f2d190037f444e73fd97ab3db Author: Emmanuel Bourg <[email protected]> Date: Fri Jun 30 10:19:46 2017 +0200 Added OpenJDK 9 support to jh_makepkg and jh_depend --- debian/changelog | 1 + jh_depends | 24 ++++++++++++++++-------- jh_makepkg | 17 +++++++++++++++-- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1257b7b..650d89f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ javatools (0.60) UNRELEASED; urgency=medium * Team upload. * jh_build: Generate Java 7 bytecode by default + * jh_makepkg, jh_depend: Added OpenJDK 9 support * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 diff --git a/jh_depends b/jh_depends index 4d28f0f..ef56c15 100755 --- a/jh_depends +++ b/jh_depends @@ -19,11 +19,11 @@ 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, open7 or open8. Can be a space-separated list." + echo -e "\t-j[<jvm>] --jvm[=<jvm>]: Options are: default, headless, gcj, open, open6, open7, open8 or open9. 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" - echo -e " java7-runtime-headless) and \"default\" cannot be used with any other value except \"headless\"" + echo -e "Note: \"headless\" (for --jvm) affects other values and alternatives (e.g. java8-runtime becomes" + echo -e " java8-runtime-headless) and \"default\" cannot be used with any other value except \"headless\"" echo -e " If \"headless\" is the only value given then it is assumed to be \"headless default\"" exit 1 } @@ -47,13 +47,15 @@ getclassversion() getalternatedepends() { if (( $1 < 50 )); then - echo "| java5-runtime$2 | java6-runtime$2 | java7-runtime$2 | java8-runtime$2" + echo "| java5-runtime$2 | java6-runtime$2 | java7-runtime$2 | java8-runtime$2 | java9-runtime$2" elif [ "$1" == "50" ]; then - echo "| java6-runtime$2 | java7-runtime$2 | java8-runtime$2" + echo "| java6-runtime$2 | java7-runtime$2 | java8-runtime$2 | java9-runtime$2" elif [ "$1" == "51" ]; then - echo "| java7-runtime$2 | java8-runtime$2" + echo "| java7-runtime$2 | java8-runtime$2 | java9-runtime$2" elif [ "$1" == "52" ]; then - echo "| java8-runtime$2" + echo "| java8-runtime$2 | java9-runtime$2" + elif [ "$1" == "53" ]; then + echo "| java9-runtime$2" else echo "Warning: Class version too new to recognise ($1), might not run with any JVMs" 1>&2 fi @@ -80,6 +82,9 @@ function home-to-jvm() if echo $JHOME | grep 8-openjdk >/dev/null; then JVM="$JVM open8" fi + if echo $JHOME | grep 9-openjdk >/dev/null; then + JVM="$JVM open9" + fi echo "$JVM" } @@ -231,6 +236,9 @@ for p in $PACKAGES; do "gcj") JVMDEPS="$JVMDEPS gcj-jre$headles $alternateversiondeps " ;; + "open9") + JVMDEPS="$JVMDEPS openjdk-9-jre$headless " + ;; "open8") JVMDEPS="$JVMDEPS openjdk-8-jre$headless " ;; @@ -241,7 +249,7 @@ for p in $PACKAGES; do JVMDEPS="$JVMDEPS openjdk-6-jre$headless " ;; "open") - JVMDEPS="$JVMDEPS openjdk-8-jre$headless | openjdk-7-jre$headless " + JVMDEPS="$JVMDEPS openjdk-9-jre$headless | openjdk-8-jre$headless " ;; *) echo "Warning: unknown JVM type: $j" diff --git a/jh_makepkg b/jh_makepkg index c03f826..6d88a3d 100755 --- a/jh_makepkg +++ b/jh_makepkg @@ -36,6 +36,7 @@ syntax() echo -e "\t-o --openjdk: Build with openjdk 6" echo -e "\t-o7 --openjdk7: Build with openjdk 7" echo -e "\t-o8 --openjdk8: Build with openjdk 8" + echo -e "\t-o9 --openjdk9: Build with openjdk 9" echo -e "Environment Variables:" echo -e "\tDEBEMAIL: Default maintainer email address" echo -e "\tEMAIL: Default maintainer email address" @@ -44,7 +45,7 @@ syntax() exit 1 } -ARGS="c clean p package m maintainer e email v upstream l library a app t ant k makefile n none g gcj o openjdk o7 openjdk7 o8 openjdk8 d default" parseargs "$@" +ARGS="c clean p package m maintainer e email v upstream l library a app t ant k makefile n none g gcj o openjdk o7 openjdk7 o8 openjdk8 o9 openjdk9 d default" parseargs "$@" BUILDDIR="`pwd`" @@ -218,6 +219,8 @@ elif [ -n "`getarg o7 openjdk7`" ]; then COMP="open7" elif [ -n "`getarg o8 openjdk8`" ]; then COMP="open8" +elif [ -n "`getarg o9 openjdk9`" ]; then + COMP="open9" else echo "Which Java runtime does it need? Which free runtime?" echo "Select:" @@ -226,7 +229,8 @@ else echo -e "\t[o] OpenJDK 6" echo -e "\t[o7] OpenJDK 7" echo -e "\t[o8] OpenJDK 8" - echo -n "[FGoo7o8] $ " + echo -e "\t[o9] OpenJDK 9" + echo -n "[FGoo7o8o9] $ " read t echo case $t in @@ -242,6 +246,10 @@ else COMP="open8" echo "Selected: OpenJDK 8" ;; + "O9"|"o9") + COMP="open9" + echo "Selected: OpenJDK 9" + ;; "g"|"G") COMP="gcj" echo "Selected: GCJ" @@ -277,6 +285,11 @@ case $COMP in JAVA_HOME="/usr/lib/jvm/java-8-openjdk-\$(shell dpkg-architecture -qDEB_HOST_ARCH)" JVM=open8 ;; + "open9") + COMPILER=openjdk-9-jdk + JAVA_HOME="/usr/lib/jvm/java-9-openjdk-\$(shell dpkg-architecture -qDEB_HOST_ARCH)" + JVM=open9 + ;; esac YEAR=$(date +%Y) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javatools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
