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 <mpriv...@redhat.com>
---
.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>
+<liy...@skybility.com> <417...@gmail.com>
+<dzamir...@datto.com> <dzamir...@dattobackup.com>
+<r...@famillecollet.com> <fed...@famillecollet.com>
+<mig...@gmail.com> <minov...@redhat.com>
+
+# Name consolidation:
+# Preferred author spelling <preferred email>
+Tiziano Müller <dev-z...@gentoo.org>
+Stefan Kuhn <stefan.k...@foss-group.ch>
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 <mpriv...@redhat.com>
+ Michal Prívozník <mpriv...@redhat.com>
The original project, called php-libvirt, has been originally developed and
maintained by:
- Radek Hladik <r.hla...@cybersales.cz>
+ Radek Hladik <r.hla...@cybersales.cz>
who is still contributing to the project with his patches.
There are also other people that have contributed to the project:
- David King <e-m...@unknown.tld>
- Jan-Paul van Burgsteden <e-m...@unknown.tld>
- Lyre <liy...@skybility.com> (or <417...@gmail.com>)
- Daniel P. Berrange <berra...@redhat.com>
- Tiziano Mueller <dev-z...@gentoo.org>
- Yukihiro Kawada <warp.kaw...@gmail.com>
- Remi Collet <r...@famillecollet.com>
- Ivo van den Abeelen <ivovandenabee...@gmail.com>
- Tiziano Müller <dev-z...@gentoo.org>
- Pavel Odintsov <pavel.odint...@gmail.com>
- Tugdual Saunier <tugdual.saun...@gmail.com>
- Stefan Kuhn <stefan.k...@foss-group.ch>
- Dawid Zamirski <dzr...@gmail.com>
- Michal Novotny <minov...@redhat.com>
+ David King <e-m...@unknown.tld>
+ Jan-Paul van Burgsteden <e-m...@unknown.tld>
+#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@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
