[javatools] 05/08: jh_makepkg: Added OpenJDK 8 support
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jul 27 08:35:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository javatools.
commit b3eda9a835d55262b2ab052251838d4fa31ab9c1
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jul 22 19:21:52 2016 +0200
jh_makepkg: Added OpenJDK 8 support
---
debian/changelog | 1 +
jh_makepkg | 17 +++++++++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d9860b7..ead9c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ javatools (0.56) UNRELEASED; urgency=medium
* jh_repack: Added support for xz compressed tarballs
* jh_makepkg: Use DH compat level 9 and Standards-Version 3.9.8
for the generated packages
+ * jh_makepkg: Added OpenJDK 8 support
-- Emmanuel Bourg <ebourg at apache.org> Fri, 22 Jul 2016 19:00:43 +0200
diff --git a/jh_makepkg b/jh_makepkg
index c37e2a7..c03f826 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -35,6 +35,7 @@ syntax()
echo -e "\t-d --default: Build with default free platform compiler"
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 "Environment Variables:"
echo -e "\tDEBEMAIL: Default maintainer email address"
echo -e "\tEMAIL: Default maintainer email address"
@@ -43,7 +44,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 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 d default" parseargs "$@"
BUILDDIR="`pwd`"
@@ -215,6 +216,8 @@ elif [ -n "`getarg o openjdk`" ]; then
COMP="open"
elif [ -n "`getarg o7 openjdk7`" ]; then
COMP="open7"
+elif [ -n "`getarg o8 openjdk8`" ]; then
+ COMP="open8"
else
echo "Which Java runtime does it need? Which free runtime?"
echo "Select:"
@@ -222,7 +225,8 @@ else
echo -e "\t[G] GCJ"
echo -e "\t[o] OpenJDK 6"
echo -e "\t[o7] OpenJDK 7"
- echo -n "[FGoo7] $ "
+ echo -e "\t[o8] OpenJDK 8"
+ echo -n "[FGoo7o8] $ "
read t
echo
case $t in
@@ -234,6 +238,10 @@ else
COMP="open7"
echo "Selected: OpenJDK 7"
;;
+ "O8"|"o8")
+ COMP="open8"
+ echo "Selected: OpenJDK 8"
+ ;;
"g"|"G")
COMP="gcj"
echo "Selected: GCJ"
@@ -264,6 +272,11 @@ case $COMP in
JAVA_HOME="/usr/lib/jvm/java-7-openjdk-\$(shell dpkg-architecture -qDEB_HOST_ARCH)"
JVM=open7
;;
+ "open8")
+ COMPILER=openjdk-8-jdk
+ JAVA_HOME="/usr/lib/jvm/java-8-openjdk-\$(shell dpkg-architecture -qDEB_HOST_ARCH)"
+ JVM=open8
+ ;;
esac
YEAR=$(date +%Y)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javatools.git
More information about the pkg-java-commits
mailing list