maint: generate THANKS from THANKS.in

* THANKS.in: Renamed from THANKS, adjusted formatting
and added header.  Also remove from this list of names those
that are now generated automatically.
* THANKS: Removed, now that it's generated.
* thanks-gen: New file.
* Makefile.am (EXTRA_DIST): Add thanks-gen
(THANKS): New rule.
* .mailmap: New file.

5 files changed, 114 insertions, 60 deletions

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..be4db3d
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,9 @@
+# Map git author names and email addresses to canonical/preferred form.
+<jim@meyering.net> <meyering@fb.com>
+<jim@meyering.net> <meyering@redhat.com>
+<karl@gnu.org> <karl@tug.org>
+Paul Eggert <eggert@cs.ucla.edu> <eggert@penguin.cs.ucla.edu>
+Paul Eggert <eggert@cs.ucla.edu> <eggert@CS.UCLA.EDU>
+<eggert@cs.ucla.edu> <eggert@twinsun.com>
+<karl@gnu.org> <karl@freefriends.org>
+<bonzini@gnu.org> <pbonzini@redhat.com>
diff --git a/Makefile.am b/Makefile.am
index e6ee9b2..1553958 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,8 @@ noinst_HEADERS = basicdefs.h
 
 EXTRA_DIST = BUGS THANKS COPYING.DOC \
   ChangeLog-2014 po/ChangeLog-2014 \
-  bootstrap bootstrap.conf build-aux/texi2dvi build-aux/help2man
+  bootstrap bootstrap.conf build-aux/texi2dvi build-aux/help2man \
+  thanks-gen
 
 # Arrange so that .tarball-version appears only in the distribution
 # tarball, and never in a checked-out repository.
@@ -46,6 +47,28 @@ gen-ChangeLog:
 	      mv $(distdir)/cl-t $(distdir)/ChangeLog; }		\
 	fi
 
+# Sort in traditional ASCII order, regardless of the current locale;
+# otherwise we may get into trouble with distinct strings that the
+# current locale considers to be equal.
+ASSORT = LC_ALL=C sort
+
+# Extract all lines up to the first one starting with "##".
+prologue = perl -ne '/^\#\#/ and exit; print' $(srcdir)/THANKS.in
+
+THANKS: THANKS.in Makefile.am .mailmap thanks-gen
+	$(AM_V_GEN)rm -f $@-t $@;					\
+	{								\
+	  $(prologue); echo;						\
+	  { perl -ne '/^$$/.../^$$/ and print' $(srcdir)/THANKS.in	\
+	      | grep -v '^$$' | perl -pe 's/  +/\0/';			\
+	    git log --pretty=format:'%aN%x00%aE'			\
+	      | $(ASSORT) -u;						\
+	  } | $(srcdir)/thanks-gen					\
+	    | LC_ALL=en_US.UTF-8 sort -f;				\
+	  echo;								\
+	  printf ';; %s\n' 'Local Variables:' 'coding: utf-8' End:;	\
+	} > $@-t && chmod a-w $@-t && mv $@-t $@
+
 html:
 	cd doc && make html
 
diff --git a/THANKS b/THANKS
deleted file mode 100644
index 3a54613..0000000
--- a/THANKS
+++ /dev/null
@@ -1,59 +0,0 @@
-Akim Demaille <akim@epita.fr>
-Alan Modra <alan@spri.levels.unisa.edu.au>
-Arnold Robbins <arnold@skeeve.com>
-Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-Andrew Herbert <andrew@werple.apana.org.au>
-Bake Timmons <b3timmons@speedymail.org>
-Bruno Haible <haible@ilog.fr>
-Chip Salzenberg <chip@fin.uucp>
-Chris Weber <weber@bucknell.edu>
-Corinna Vinschen <vinschen@redhat.com>
-Daniel R. Grayson <dan@math.uiuc.edu>
-David Eckelkamp <eckelkamp@mcc.com>
-David J. MacKenzie <djm@nutrimat>
-David Schmidt <davids@isc-br.isc-br.com>
-Dietrich Kappe <kap1@tao.cpe.uchicago.edu>
-Doug McIlroy <doug@research.att.com>
-Eero Hakkinen <eero17@bigfoot.com>
-Eli Zaretskii <eliz@is.elta.co.il>
-Eric Pement <epement@moody.edu>
-Erick Branderhorst <Erick.Branderhorst@asml.nl>
-Francois Pinard <pinard@iro.umontreal.ca>
-Gaumond Pierre <gaumondp@ERE.UMontreal.CA>
-Greg Ubben <gsu@romulus.ncsc.mil>
-Isamu Hasegawa <isamu@yamato.ibm.com>
-J.T. Conklin <jtc@gain.com>
-Jakub Jelinek <jakub@redhat.com>
-Jari Aalto <jari.aalto@cante.net>
-Jason Molenda <crash@cygnus.com>
-Jim Meyering <meyering@ascend.com>
-Laurent Vogel <lvl@club-internet.fr>
-Karl Berry <karl@freefriends.org>
-Karl Heuer <kwzh@gnu.org>
-Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
-Kevin Buettner <kev@cujo.geg.mot.com>
-Maciej W. Rozycki <macro@linux-mips.org>
-Mark Kettenis <kettenis@phys.uva.nl>
-Michael De La Rue <delarue@NTCCSC01WA.ntc.nokia.com>
-Michel de Ruiter <mdruiter@cs.vu.nl>
-Padraig Brady <p@draigbrady.com>
-Paul Eggert <eggert@twinsun.com>
-Randall Cotton <recotton@earthlink.net>
-Robert A Bruce <rab@allspice.berkeley.edu>
-Ronnie Glasscock <Ronnie.N.Glasscock@bridge.bellsouth.com>
-Sergey Farbotka  <z8sergey8z@gmail.com>
-Simon Taylor <simon@unisolve.com.au>
-Stepan Kasal <kasal@ucw.cz>
-Stephen Davis <stephend@ksr.com>
-Steve Ingram <si@maps-r-us.com>
-Tapani Tarvainen <tarvaine@tukki.jyu.fi>
-Timothy J Luoma <luomat@peak.org>
-Timothy Baker <timothypaulbaker@gmail.com>
-Tom R.Hageman <tom@basil.icce.rug.nl>
-Ulrich Drepper <drepper@redhat.com>
-Vladimir Marek <vladimir.marek@sun.com>
-Vladimir Volovich <vvv@vvv.vsu.ru>
-Wichert Akkerman <wakkerma@debian.org>
-Zhongxing Xu <xuzhongxing@gmail.com>
-
-And the GNU translation teams.
diff --git a/THANKS.in b/THANKS.in
new file mode 100644
index 0000000..98f34a0
--- /dev/null
+++ b/THANKS.in
@@ -0,0 +1,65 @@
+These people have contributed to the GNU grep. Those contributions are
+described in the version control logs.  If your name has been left out,
+if you'd rather not be listed, or if you'd prefer a different address
+be used, please send a note to the bug-report mailing list (as seen at
+end of e.g., grep --help).
+##
+## There is no need to list here any name that appears as an Author in
+## "git log" output.  Those are automatically added when this template
+## is used to generate the THANKS file.  Note that numerous people listed
+## here would have been listed as commit authors if we had been using git
+## for version control when they contributed.
+
+Akim Demaille                       akim@epita.fr
+Alan Modra                          alan@spri.levels.unisa.edu.au
+Andreas Schwab                      schwab@issan.informatik.uni-dortmund.de
+Andrew Herbert                      andrew@werple.apana.org.au
+Arnold Robbins                      arnold@skeeve.com
+Bruno Haible                        haible@ilog.fr
+Chip Salzenberg                     chip@fin.uucp
+Chris Weber                         weber@bucknell.edu
+Corinna Vinschen                    vinschen@redhat.com
+Daniel R. Grayson                   dan@math.uiuc.edu
+David Eckelkamp                     eckelkamp@mcc.com
+David J. MacKenzie                  djm@nutrimat
+David Schmidt                       davids@isc-br.isc-br.com
+Dietrich Kappe                      kap1@tao.cpe.uchicago.edu
+Doug McIlroy                        doug@research.att.com
+Eero Hakkinen                       eero17@bigfoot.com
+Eli Zaretskii                       eliz@is.elta.co.il
+Eric Pement                         epement@moody.edu
+Erick Branderhorst                  Erick.Branderhorst@asml.nl
+Francois Pinard                     pinard@iro.umontreal.ca
+Gaumond Pierre                      gaumondp@ERE.UMontreal.CA
+Greg Ubben                          gsu@romulus.ncsc.mil
+Isamu Hasegawa                      isamu@yamato.ibm.com
+J.T. Conklin                        jtc@gain.com
+Jakub Jelinek                       jakub@redhat.com
+Jason Molenda                       crash@cygnus.com
+Karl Berry                          karl@freefriends.org
+Karl Heuer                          kwzh@gnu.org
+Kaveh R. Ghazi                      ghazi@caip.rutgers.edu
+Kevin Buettner                      kev@cujo.geg.mot.com
+Laurent Vogel                       lvl@club-internet.fr
+Maciej W. Rozycki                   macro@linux-mips.org
+Mark Kettenis                       kettenis@phys.uva.nl
+Michael De La Rue                   delarue@NTCCSC01WA.ntc.nokia.com
+Michel de Ruiter                    mdruiter@cs.vu.nl
+Padraig Brady                       p@draigbrady.com
+Randall Cotton                      recotton@earthlink.net
+Robert A Bruce                      rab@allspice.berkeley.edu
+Ronnie Glasscock                    Ronnie.N.Glasscock@bridge.bellsouth.com
+Sergey Farbotka                     z8sergey8z@gmail.com
+Simon Taylor                        simon@unisolve.com.au
+Stepan Kasal                        kasal@ucw.cz
+Stephen Davis                       stephend@ksr.com
+Steve Ingram                        si@maps-r-us.com
+Tapani Tarvainen                    tarvaine@tukki.jyu.fi
+Timothy Baker                       timothypaulbaker@gmail.com
+Timothy J Luoma                     luomat@peak.org
+Tom R.Hageman                       tom@basil.icce.rug.nl
+Ulrich Drepper                      drepper@redhat.com
+Vladimir Marek                      vladimir.marek@sun.com
+Vladimir Volovich                   vvv@vvv.vsu.ru
+Wichert Akkerman                    wakkerma@debian.org
+Zhongxing Xu                        xuzhongxing@gmail.com
diff --git a/thanks-gen b/thanks-gen
new file mode 100755
index 0000000..f1c11b3
--- /dev/null
+++ b/thanks-gen
@@ -0,0 +1,16 @@
+#!/usr/bin/perl -nl
+# Use Perl's multi-byte alignment code, via sprintf, while
+# performing a rudimentary check for duplicate names and
+# removing duplicate name,email pairs.
+use Encode;
+
+BEGIN { my (%seen, %name) }
+
+chomp;
+my ($name, $email) = split '\0', decode ('UTF-8', $_);
+
+$seen{$name}++
+  and warn "$0: THANKS.in: duplicate name: $name\n";
+
+print encode ('UTF-8', sprintf ('%-36s', $name)), $email
+  unless $seen{"$name\0$email"}++;