This is basically taken from libvirt repo. I'm creating .mailmap to avoid doubled entries in the AUTHORS file. Also, AUTHORS is no longer tracked by git. Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- .gitignore | 1 + .mailmap | 13 +++++++++++++ AUTHORS => AUTHORS.in | 21 +++++---------------- Makefile.am | 13 ++++++++++++- autogen.sh | 3 +++ 5 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 .mailmap rename AUTHORS => AUTHORS.in (45%) diff --git a/.gitignore b/.gitignore index 8c52e3f..c622359 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ /tests/*.trs /tests/functions.phpt /test-driver +/AUTHORS /INSTALL Makefile Makefile.in diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..213131d --- /dev/null +++ b/.mailmap @@ -0,0 +1,13 @@ +# 'git shortlog --help' and look for mailmap for the format of each line + +# Email consolidation: +# <Preferred address in AUTHORS> <other alias used by same author> +<liyong@xxxxxxxxxxxxx> <4179e1@xxxxxxxxx> +<dzamirski@xxxxxxxxx> <dzamirski@xxxxxxxxxxxxxxx> +<Remi@xxxxxxxxxxxxxxxxx> <fedora@xxxxxxxxxxxxxxxxx> +<mignov@xxxxxxxxx> <minovotn@xxxxxxxxxx> + +# Name consolidation: +# Preferred author spelling <preferred email> +Tiziano Müller <dev-zero@xxxxxxxxxx> +Stefan Kuhn <stefan.kuhn@xxxxxxxxxxxxx> diff --git a/AUTHORS b/AUTHORS.in similarity index 45% rename from AUTHORS rename to AUTHORS.in index 4004b20..87e619b 100644 --- a/AUTHORS +++ b/AUTHORS.in @@ -3,30 +3,19 @@ Libvirt-php extension Libvirt-php extension is currently maintained and developed by: - Michal Prívozník <mprivozn@xxxxxxxxxx> + Michal Prívozník <mprivozn@xxxxxxxxxx> The original project, called php-libvirt, has been originally developed and maintained by: - Radek Hladik <r.hladik@xxxxxxxxxxxxx> + Radek Hladik <r.hladik@xxxxxxxxxxxxx> who is still contributing to the project with his patches. There are also other people that have contributed to the project: - David King <e-mail@xxxxxxxxxxx> - Jan-Paul van Burgsteden <e-mail@xxxxxxxxxxx> - Lyre <liyong@xxxxxxxxxxxxx> (or <4179e1@xxxxxxxxx>) - Daniel P. Berrange <berrange@xxxxxxxxxx> - Tiziano Mueller <dev-zero@xxxxxxxxxx> - Yukihiro Kawada <warp.kawada@xxxxxxxxx> - Remi Collet <Remi@xxxxxxxxxxxxxxxxx> - Ivo van den Abeelen <ivovandenabeelen@xxxxxxxxx> - Tiziano Müller <dev-zero@xxxxxxxxxx> - Pavel Odintsov <pavel.odintsov@xxxxxxxxx> - Tugdual Saunier <tugdual.saunier@xxxxxxxxx> - Stefan Kuhn <stefan.kuhn@xxxxxxxxxxxxx> - Dawid Zamirski <dzrudy@xxxxxxxxx> - Michal Novotny <minovotn@xxxxxxxxxx> + David King <e-mail@xxxxxxxxxxx> + Jan-Paul van Burgsteden <e-mail@xxxxxxxxxxx> +#authorslist# Thanks goes to all of them with big thanks to Tugdual Saunier for various fixes and OS-X compilation support. diff --git a/Makefile.am b/Makefile.am index e28a96f..4633f43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,20 @@ SUBDIRS = tools src docs tests ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = libvirt-php.spec libvirt-php.spec.in winsrc +EXTRA_DIST = libvirt-php.spec libvirt-php.spec.in winsrc AUTHORS.in AM_DISTCHECK_CONFIGURE_FLAGS = --with-distcheck rpm: clean @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz) + +dist-hook: gen-AUTHORS + +.PHONY: gen-AUTHORS +gen-AUTHORS: + $(AM_V_GEN)if test -d $(srcdir)/.git; then \ + out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u | sed 's/^/\t/'`" && \ + perl -p -e "s/#authorslist#// and print '$$out'" \ + < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ + fi diff --git a/autogen.sh b/autogen.sh index 2d8179c..4234d1e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,5 +2,8 @@ test -n "$srcdir" || srcdir=`dirname "$0"` test -n "$srcdir" || srcdir=. +# Automake requires that ChangeLog and AUTHORS exist. +touch AUTHORS ChangeLog || exit 1 + autoreconf --force --install --verbose "$srcdir" test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" -- 2.13.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
