This is an automated email from the git hooks/post-receive script. nthykier pushed a commit to branch master in repository javatools.
commit 40861082dcccad9ede93dd6271ed6bc7be430f4f Author: Niels Thykier <[email protected]> Date: Tue Sep 24 14:01:18 2013 +0200 jh_makepkg: Advise people to use mh_make for maven pkgs Signed-off-by: Niels Thykier <[email protected]> --- debian/changelog | 3 +++ jh_makepkg | 20 ++++++++++++++++---- tutorial.txt | 3 +++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f7bfeb1..c27b1c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,9 @@ javatools (0.44) UNRELEASED; urgency=low insert a default value for the "Author"-field when no author is provided. Also fix a typo in the generated doc-base file. (Closes: #625945) + * jh_makepkg: Advise people to use mk_make for packges + with a maven based build system. Thanks to Hilko + Bengen for the suggestion. (Closes: #703376) -- Niels Thykier <[email protected]> Wed, 20 Mar 2013 14:40:31 +0100 diff --git a/jh_makepkg b/jh_makepkg index c83dfce..4d964e5 100755 --- a/jh_makepkg +++ b/jh_makepkg @@ -28,7 +28,7 @@ syntax() echo -e "\t-a --app: This is an application package" echo -e "\tPick One:" echo -e "\t-t --ant: Builds with ant" - echo -e "\t-M --maven: Builds with maven2" + echo -e "\t-M --maven: Builds with maven (deprecated, use mh_make instead)" echo -e "\t-k --makefiles: Builds with make" echo -e "\t-n --none: Create own buildsystem" echo -e "\tPick One:" @@ -44,8 +44,22 @@ syntax() exit 1 } +maven_not_supported() +{ + echo "Sorry, but jh_makepkg is not good at generating package templates" >&2 + echo "for maven based packages." >&2 + echo >&2 + echo "Please consider using mh_make instead" >&2 + + exit 1 +} + ARGS="p package m maintainer e email v upstream l library a app t ant k makefile n none g gcj o openjdk o7 openjdk7 M maven d default" parseargs "$@" +if [ -n "`getarg M maven`" ]; then + maven_not_supported +fi + BUILDDIR="`pwd`" if [ -z "`getarg v upstream`" ]; then @@ -170,8 +184,6 @@ esac if [ -n "`getarg t ant`" ]; then BUILD="ant" -elif [ -n "`getarg M maven`" ]; then - BUILD="maven" elif [ -n "`getarg k makefiles`" ]; then BUILD="make" elif [ -n "`getarg n none`" ]; then @@ -212,7 +224,7 @@ case $BUILD in DEPENDS="$DEPENDS, ant" ;; "maven") - DEPENDS="$DEPENDS, maven2, maven-debian-helper" + maven_not_supported ;; "byhand") ;; diff --git a/tutorial.txt b/tutorial.txt index d34a1b6..c9f8848 100644 --- a/tutorial.txt +++ b/tutorial.txt @@ -214,6 +214,9 @@ and it will create the orig.tar.gz and most of the files in the Debian directory, which need only small changes neccessary to build the package. +Note that `jh_makepkg` is *not* suitable for packages using the +`maven` build system. Please consider using `mh_make` intead. + jh_repack --------- -- 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
