This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository javatools.
commit 27a85e36d569ebc67dae3bf9a9f5ec628b99ccbb
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Mon Dec 4 15:37:10 2017 +0100
jh_makepkg, jh_depend: Added OpenJDK 10 & 11 support
---
debian/changelog | 1 +
jh_depends | 28 ++++++++++++++++++++++------
jh_depends.1 | 2 +-
jh_makepkg | 30 ++++++++++++++++++++++++++++--
jh_makepkg.1 | 6 ++++--
5 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 97bae15..49c9ca3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ javatools (0.62) UNRELEASED; urgency=medium
* Team upload.
* Ignore the "unnamed package" generated by Java 9 in the javadoc
package-list
file when resolving the doc dependencies (Closes: #873252)
+ * jh_makepkg, jh_depend: Added OpenJDK 10 & 11 support
* Standards-Version updated to 4.1.2
-- Emmanuel Bourg <ebo...@apache.org> Mon, 04 Dec 2017 15:09:30 +0100
diff --git a/jh_depends b/jh_depends
index 18dd40e..f66394c 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, open,
open6, open7, open8 or open9. Can be a space-separated list."
+ echo -e "\t-j[<jvm>] --jvm[=<jvm>]: Options are: default, headless, open,
open6, open7, open8, open9, open10 or open11. 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. java8-runtime becomes"
@@ -47,15 +47,19 @@ getclassversion()
getalternatedepends()
{
if (( $1 < 50 )); then
- echo "| java5-runtime$2 | java6-runtime$2 | java7-runtime$2 |
java8-runtime$2 | java9-runtime$2"
+ echo "| java5-runtime$2 | java6-runtime$2 | java7-runtime$2 |
java8-runtime$2 | java9-runtime$2 | java10-runtime$2 | java11-runtime$2"
elif [ "$1" == "50" ]; then
- echo "| java6-runtime$2 | java7-runtime$2 | java8-runtime$2 |
java9-runtime$2"
+ echo "| java6-runtime$2 | java7-runtime$2 | java8-runtime$2 |
java9-runtime$2 | java10-runtime$2 | java11-runtime$2"
elif [ "$1" == "51" ]; then
- echo "| java7-runtime$2 | java8-runtime$2 | java9-runtime$2"
+ echo "| java7-runtime$2 | java8-runtime$2 | java9-runtime$2 |
java10-runtime$2 | java11-runtime$2"
elif [ "$1" == "52" ]; then
- echo "| java8-runtime$2 | java9-runtime$2"
+ echo "| java8-runtime$2 | java9-runtime$2 | java10-runtime$2 |
java11-runtime$2"
elif [ "$1" == "53" ]; then
- echo "| java9-runtime$2"
+ echo "| java9-runtime$2 | java10-runtime$2 | java11-runtime$2"
+ elif [ "$1" == "54" ]; then
+ echo "| java10-runtime$2 | java11-runtime$2"
+ elif [ "$1" == "55" ]; then
+ echo "| java11-runtime$2"
else
echo "Warning: Class version too new to recognise ($1), might
not run with any JVMs" 1>&2
fi
@@ -82,6 +86,12 @@ function home-to-jvm()
if echo $JHOME | grep 9-openjdk >/dev/null; then
JVM="$JVM open9"
fi
+ if echo $JHOME | grep 10-openjdk >/dev/null; then
+ JVM="$JVM open10"
+ fi
+ if echo $JHOME | grep 11-openjdk >/dev/null; then
+ JVM="$JVM open11"
+ fi
echo "$JVM"
}
@@ -230,6 +240,12 @@ for p in $PACKAGES; do
JVMDEPS="default-jre$headless $alternateversiondeps "
break
;;
+ "open11")
+ JVMDEPS="$JVMDEPS openjdk-11-jre$headless "
+ ;;
+ "open10")
+ JVMDEPS="$JVMDEPS openjdk-10-jre$headless "
+ ;;
"open9")
JVMDEPS="$JVMDEPS openjdk-9-jre$headless "
;;
diff --git a/jh_depends.1 b/jh_depends.1
index 6862ae0..fa965b0 100644
--- a/jh_depends.1
+++ b/jh_depends.1
@@ -24,6 +24,6 @@ Refer to the tutorials in /usr/share/doc/javahelper for more
detail
.HP
\fB\-n\fR \fB\-\-no\-act\fR: don't actually do anything, just print the results
.HP
-\fB\-j[\fR<jvm>] \fB\-\-jvm[=\fR<jvm>]: Options are: default, headless, open,
open6, open7, open8 or open9. May be a space-separated list
+\fB\-j[\fR<jvm>] \fB\-\-jvm[=\fR<jvm>]: Options are: default, headless, open,
open6, open7, open8, open9, open10 or open11. May be a space-separated list
.HP
\fB\-X[\fR<package>] \fB\-\-exclude[=\fR<package>]: Don't include this package
in depends
diff --git a/jh_makepkg b/jh_makepkg
index 9fadea7..c0ea59b 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -35,6 +35,8 @@ syntax()
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 "\t-o10 --openjdk10: Build with openjdk 10"
+ echo -e "\t-o11 --openjdk11: Build with openjdk 11"
echo -e "Environment Variables:"
echo -e "\tDEBEMAIL: Default maintainer email address"
echo -e "\tEMAIL: Default maintainer email address"
@@ -43,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 o openjdk o7 openjdk7 o8 openjdk8 o9 openjdk9 d default"
parseargs "$@"
+ARGS="c clean p package m maintainer e email v upstream l library a app t ant
k makefile n none o openjdk o7 openjdk7 o8 openjdk8 o9 openjdk9 o10 openjdk10
o11 openjdk11 d default" parseargs "$@"
BUILDDIR="`pwd`"
@@ -217,6 +219,10 @@ elif [ -n "`getarg o8 openjdk8`" ]; then
COMP="open8"
elif [ -n "`getarg o9 openjdk9`" ]; then
COMP="open9"
+elif [ -n "`getarg o10 openjdk10`" ]; then
+ COMP="open10"
+elif [ -n "`getarg o11 openjdk11`" ]; then
+ COMP="open11"
else
echo "Which Java runtime does it need? Which free runtime?"
echo "Select:"
@@ -225,7 +231,9 @@ else
echo -e "\t[o7] OpenJDK 7"
echo -e "\t[o8] OpenJDK 8"
echo -e "\t[o9] OpenJDK 9"
- echo -n "[FGoo7o8o9] $ "
+ echo -e "\t[o10] OpenJDK 10"
+ echo -e "\t[o11] OpenJDK 11"
+ echo -n "[FGoo7o8o9o10o11] $ "
read t
echo
case $t in
@@ -245,6 +253,14 @@ else
COMP="open9"
echo "Selected: OpenJDK 9"
;;
+ "O10"|"o10")
+ COMP="open10"
+ echo "Selected: OpenJDK 10"
+ ;;
+ "O11"|"o11")
+ COMP="open11"
+ echo "Selected: OpenJDK 11"
+ ;;
*)
COMP="default"
echo "Selected: Default Free compiler"
@@ -277,6 +293,16 @@ case $COMP in
JAVA_HOME="/usr/lib/jvm/java-9-openjdk-\$(shell dpkg-architecture
-qDEB_HOST_ARCH)"
JVM=open9
;;
+ "open10")
+ COMPILER=openjdk-10-jdk
+ JAVA_HOME="/usr/lib/jvm/java-10-openjdk-\$(shell dpkg-architecture
-qDEB_HOST_ARCH)"
+ JVM=open10
+ ;;
+ "open11")
+ COMPILER=openjdk-11-jdk
+ JAVA_HOME="/usr/lib/jvm/java-11-openjdk-\$(shell dpkg-architecture
-qDEB_HOST_ARCH)"
+ JVM=open11
+ ;;
esac
YEAR=$(date +%Y)
diff --git a/jh_makepkg.1 b/jh_makepkg.1
index c4144cb..ba1e8fe 100644
--- a/jh_makepkg.1
+++ b/jh_makepkg.1
@@ -33,8 +33,10 @@ Pick One:
\fB\-d\fR \fB\-\-default\fR: Build with default free compiler
\fB\-o\fR \fB\-\-openjdk\fR: Build with OpenJDK 6
\fB\-o7\fR \fB\-\-openjdk7\fR: Build with OpenJDK 7
-\fB\-o7\fR \fB\-\-openjdk8\fR: Build with OpenJDK 8
-\fB\-o7\fR \fB\-\-openjdk9\fR: Build with OpenJDK 9
+\fB\-o8\fR \fB\-\-openjdk8\fR: Build with OpenJDK 8
+\fB\-o9\fR \fB\-\-openjdk9\fR: Build with OpenJDK 9
+\fB\-o10\fR \fB\-\-openjdk10\fR: Build with OpenJDK 10
+\fB\-o11\fR \fB\-\-openjdk11\fR: Build with OpenJDK 11
.SS "Environment Variables:"
.IP
DEBEMAIL: Default maintainer email address
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/javatools.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
