This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository javatools.
commit b64d0978713dd96802de8e9043466e3900546993 Author: Emmanuel Bourg <[email protected]> Date: Fri Jun 30 10:25:14 2017 +0200 Removed GCJ support --- debian/changelog | 1 + jh_build | 2 -- jh_depends | 8 +------- jh_depends.1 | 2 +- jh_makepkg | 15 +-------------- jh_makepkg.1 | 1 - 6 files changed, 4 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index ac91f48..1ab1e0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ javatools (0.60) UNRELEASED; urgency=medium * jh_makepkg, jh_depend: Added OpenJDK 9 support * jh_makepkg: Use DH compat level 10 and Standards-Version 4.0.0 for the generated packages + * Removed GCJ support * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 diff --git a/jh_build b/jh_build index 074734a..191a23f 100755 --- a/jh_build +++ b/jh_build @@ -41,8 +41,6 @@ if [ -n "`getarg j java-home`" ]; then elif [ -z "$JAVA_HOME" ]; then if [ -d /usr/lib/jvm/default-java ]; then JAVA_HOME=/usr/lib/jvm/default-java - elif [ -d /usr/lib/jvm/java-gcj ]; then - JAVA_HOME=/usr/lib/jvm/java-gcj else JAVA_HOME=invalid fi diff --git a/jh_depends b/jh_depends index ef56c15..18dd40e 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, 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 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. java8-runtime becomes" @@ -70,9 +70,6 @@ function home-to-jvm() if echo $JHOME | grep default >/dev/null; then JVM="$JVM default" fi - if echo $JHOME | grep gcj >/dev/null; then - JVM="$JVM gcj" - fi if echo $JHOME | grep 6-openjdk >/dev/null; then JVM="$JVM open6" fi @@ -233,9 +230,6 @@ for p in $PACKAGES; do JVMDEPS="default-jre$headless $alternateversiondeps " break ;; - "gcj") - JVMDEPS="$JVMDEPS gcj-jre$headles $alternateversiondeps " - ;; "open9") JVMDEPS="$JVMDEPS openjdk-9-jre$headless " ;; diff --git a/jh_depends.1 b/jh_depends.1 index 86b0e84..0f49ef4 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, gcj, open. May be a space-separated list +\fB\-j[\fR<jvm>] \fB\-\-jvm[=\fR<jvm>]: Options are: default, headless, open. 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 cb10b72..9fadea7 100755 --- a/jh_makepkg +++ b/jh_makepkg @@ -3,7 +3,6 @@ # options: # make, ant, byhand # app, library -# gcj COMPAT=10 STANDARDS=4.0.0 @@ -31,7 +30,6 @@ syntax() echo -e "\t-k --makefiles: Builds with make" echo -e "\t-n --none: Create own buildsystem" echo -e "\tPick One:" - echo -e "\t-g --gcj: Build with gcj" 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" @@ -45,7 +43,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 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 d default" parseargs "$@" BUILDDIR="`pwd`" @@ -211,8 +209,6 @@ esac if [ -n "`getarg d default`" ]; then COMP="default" -elif [ -n "`getarg g gcj`" ]; then - COMP="gcj" elif [ -n "`getarg o openjdk`" ]; then COMP="open" elif [ -n "`getarg o7 openjdk7`" ]; then @@ -225,7 +221,6 @@ else echo "Which Java runtime does it need? Which free runtime?" echo "Select:" echo -e "\t[F] Default Free compiler/runtime (Default)" - echo -e "\t[G] GCJ" echo -e "\t[o] OpenJDK 6" echo -e "\t[o7] OpenJDK 7" echo -e "\t[o8] OpenJDK 8" @@ -250,10 +245,6 @@ else COMP="open9" echo "Selected: OpenJDK 9" ;; - "g"|"G") - COMP="gcj" - echo "Selected: GCJ" - ;; *) COMP="default" echo "Selected: Default Free compiler" @@ -262,10 +253,6 @@ else fi case $COMP in - "gcj") - COMPILER=gcj-jdk - JAVA_HOME=/usr/lib/jvm/java-gcj - ;; "default") COMPILER=default-jdk JAVA_HOME=/usr/lib/jvm/default-java diff --git a/jh_makepkg.1 b/jh_makepkg.1 index 846c4dc..862c38f 100644 --- a/jh_makepkg.1 +++ b/jh_makepkg.1 @@ -30,7 +30,6 @@ Pick One: \fB\-k\fR \fB\-\-makefiles\fR: Build with make \fB\-n\fR \fB\-\-none\fR: Create own buildsystem Pick One: -\fB\-g\fR \fB\-\-gcj\fR: Build with gcj \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 -- 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
