From 7b21981cdb4f5d6c492edb2face8a8159dcc212e Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Fri, 12 Oct 2012 19:50:19 -0400 Subject: [PATCH] Autogenerate AUTHORS AUTHORS.in tracks the maintainers, as well as some folks who were previously in AUTHORS but don't have a git commit with proper attribution. Generated output is sorted alphabetically and lacks pretty spacing, so tweak AUTHORS.in to follow the same format. Additionally, drop the syntax-check rule that previously validated AUTHORS against git log. --- .gitignore | 1 + .mailmap | 15 ++- AUTHORS | 279 ------------------------------------------------- AUTHORS.in | 90 ++++++++++++++++ Makefile.am | 12 ++- bootstrap.conf | 4 +- cfg.mk | 16 +-- 7 files changed, 119 insertions(+), 298 deletions(-) delete mode 100644 AUTHORS create mode 100644 AUTHORS.in diff --git a/.gitignore b/.gitignore index c185cbcc44..804eda4a78 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ .memdump .sc-start-sc_* /ABOUT-NLS +/AUTHORS /COPYING /ChangeLog /GNUmakefile diff --git a/.mailmap b/.mailmap index 98ff6dc8d6..c430200ebe 100644 --- a/.mailmap +++ b/.mailmap @@ -3,7 +3,6 @@ # Email consolidation: # - @@ -35,6 +34,8 @@ + + # Name consolidation: # Preferred author spelling @@ -43,3 +44,15 @@ Royce Lv Daniel J Walsh Ján Tomko Gerd von Egidy +MATSUDA Daiki +Tang Chen +Peng Zhou +Dirk Herrendoerfer +Thibault VINCENT +Aurelien Rougemont +Serge E. Hallyn +Henrik Persson E +Philipp Hahn +Marco Bozzolan +Marco Bozzolan +Pritesh Kothari diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 27c4eda775..0000000000 --- a/AUTHORS +++ /dev/null @@ -1,279 +0,0 @@ - libvirt Authors - =============== - -The libvirt project was initiated by: - - Daniel Veillard or - -The primary maintainers and people with commit access rights: - - Daniel Veillard - Daniel Berrange - Richard W.M. Jones - Mark McLoughlin - Anthony Liguori - Jim Meyering - Jim Fehlig - Chris Lalancette - Cole Robinson - Guido Günther - John Levon - Matthias Bolte - Jiří Denemark - Dave Allan - Laine Stump - Stefan Berger - Eric Blake - Justin Clift - Osier Yang - Wen Congyang - Michal Prívozník - Peter Krempa - Christophe Fergeau - Alex Jia - Martin Kletzander - -Previous maintainers: - Karel Zak - Atsushi SAKAI - Dave Leskovec - Dan Smith - -Patches have also been contributed by: - - David Lutterkort - Andrew Puch - Philippe Berthault - Hugh Brock - Michel Ponceau - Jeremy Katz - Pete Vetere - Kazuki Mizushima - Saori Fukuta - Tatsuro Enokura - Takahashi Tomohiro - Nobuhiro Itou - Masayuki Sunou - Mark Johnson - Christian Ehrhardt - Shuveb Hussain - Jim Paris - Daniel Hokka Zakrisson - Mads Chr. Olesen - Anton Protopopov - Stefan de Konink - Kaitlin Rupert - Evgeniy Sokolov - David Lively - Charles Duffy - Nguyen Anh Quynh - James Morris - Chris Wright - Ben Guthro - Shigeki Sakamoto - Gerd von Egidy - Itamar Heim - Markus Armbruster - Ryota Ozaki - Daniel J Walsh - Maximilian Wilhelm - Pritesh Kothari - Amit Shah - Florian Vichot - Serge E. Hallyn - Soren Hansen - Abel Míguez Rodríguez - Doug Goldstein - Javier Fontan - Federico Simoncelli - Amy Griffis - Henrik Persson E - Satoru SATOH - Paolo Bonzini - Miloslav Trmač - Jamie Strandboge - Gerhard Stenzel - Matthew Booth - Diego Elio Pettenò - Adam Litke - Steve Yarmie - Dan Kenigsberg - Yuji NISHIDA - Dustin Xiong - Rolf Eike Beer - Wolfgang Mauerer - Philipp Hahn - Ed Swierk - Paolo Smiraglia - Sharadha Prabhakar - Chris Wong - Daniel Berteaud - Dustin Kirkland - Luiz Capitulino - Ryan Harper - Spencer Shimko - Marco Bozzolan - Alex Williamson - Ersek Laszlo - Kenneth Nagin - Klaus Ethgen - Bryan Kearney - Darry L. Pierce - David Jorm - Eduardo Otubo - Garry Dolley - Harshavardhana - Jonas Eriksson - Jun Koi - Olivier Fourdan - Ron Yorston - Shahar Klein - Taizo ITO - Thomas Treutner - Jean-Baptiste Rouault - Марк Коренберг - Alan Pevec - Aurelien Rougemont - Patrick Dignan - Serge Hallyn - Nikunj A. Dadhania - Lai Jiangshan - Harsh Prateek Bora - John Morrissey - KAMEZAWA Hiroyuki - Hu Tao - Laurent Léonard - MORITA Kazutaka - Josh Durgin - Roopa Prabhu - Paweł Krześniak - Kay Schubert - Marc-André Lureau - Juerg Haefliger - Matthias Dahl - Niels de Vos - Davidlohr Bueso - Alon Levy - Hero Phương - Zdenek Styblik - Gui Jianfeng - Michal Novotny - Markus Groß - Phil Petty - Taku Izumi - Minoru Usui - Tiziano Mueller - Thibault VINCENT - Naoya Horiguchi - Jesse Cook - Alexander Todorov - Richard Laager - Mark Wu - Yufang Zhang - Supriya Kannery - Dirk Herrendoerfer - Taisuke Yamada - Heath Petersen - Neil Wilson - Ohad Levy - Michael Chapman - Daniel Gollub - David S. Wang - Ruben Kerkhof - Scott Moser - Guannan Ren - John Williams - Michael Santos - Oskari Saarenmaa - Nan Zhang - Wieland Hoffmann - Douglas Schilling Landgraf - Tom Vijlbrief - Shradha Shah - Steve Hodgson - Xu He Jie - Lei Li - Matthias Witte - Tang Chen - Dan Horák - Sage Weil - David L Stevens - Tyler Coumbes - Royce Lv - Patrice LACHANCE - Eli Qiao - Michael Wood - Bharata B Rao - Srivatsa S. Bhat - Chang Liu - Lorin Hochstein - Christian Franke - Prerna Saxena - Michael Ellerman - Rommer - Yuri Chornoivan - Deepak C Shetty - Laszlo Ersek - Zeeshan Ali (Khattak) - Marcelo Cerri - Hendrik Schwartke - Ansis Atteka - Dan Wendlandt - Kyle Mestery - Lincoln Myers - Peter Robinson - Benjamin Cama - Duncan Rance - Peng Zhou - Li Zhang - Stef Walter - Christian Benvenuti - Ilja Livenson - Stefan Bader - MATSUDA Daiki - Jan Kiszka - Ryan Woodsmall - Wido den Hollander - Eugen Feller - Dmitry Guryanov - William Jon McCann - David Weber - Marti Raudsepp - Radu Caragea - Beat Jörg - Gao feng - Dipankar Sarma - Gerd Hoffmann - Viktor Mihajlovski - Thang Pham - Eiichi Tsukata - Sascha Peilicke - Chuck Short - Sebastian Wiedenroth - Ata E Husain Bohra - Ján Tomko - Richa Marwaha - Peter Feiner - Frido Roose - Asad Saeed - Sukadev Bhattiprolu - Thomas Woerner - J.B. Joret - Stefan Hajnoczi - Gene Czarcinski - Nishank Trivedi - Jasper Lievisse Adriaanse - Paul Eggert - Dwight Engen - liguang - Chuck Short - Alexander Larsson - - [....send patches to get your name here....] - -The libvirt Logo was designed by Diana Fong - --- End -;; Local Variables: -;; coding: utf-8 -;; End: diff --git a/AUTHORS.in b/AUTHORS.in new file mode 100644 index 0000000000..01339f2a32 --- /dev/null +++ b/AUTHORS.in @@ -0,0 +1,90 @@ + libvirt Authors + =============== + +The libvirt project was initiated by: + +Daniel Veillard or + +The primary maintainers and people with commit access rights: + +Alex Jia +Martin Kletzander +Alex Jia +Anthony Liguori +Chris Lalancette +Christophe Fergeau +Cole Robinson +Daniel Berrange +Daniel Veillard +Dave Allan +Eric Blake +Guido Günther +Jim Fehlig +Jim Meyering +Jiří Denemark +John Levon +Justin Clift +Laine Stump +Mark McLoughlin +Martin Kletzander +Matthias Bolte +Michal Prívozník +Osier Yang +Peter Krempa +Richard W.M. Jones +Stefan Berger +Wen Congyang + +Previous maintainers: + +Atsushi SAKAI +Dan Smith +Dave Leskovec +Karel Zak + +Patches have also been contributed by: + +Abel Míguez Rodríguez +Amit Shah +Andrew Puch +Anton Protopopov +Ben Guthro +Christian Ehrhardt +Daniel Hokka Zakrisson +Dan Wendlandt +David Lively +David Lutterkort +Evgeniy Sokolov +Hugh Brock +Itamar Heim +James Morris +Javier Fontan +Jeremy Katz +Kaitlin Rupert +Kazuki Mizushima +Mads Chr. Olesen +Mark Johnson +Markus Armbruster +Masayuki Sunou +Matthias Witte +Michel Ponceau +Nobuhiro Itou +Pete Vetere +Philippe Berthault +Saori Fukuta +Shigeki Sakamoto +Shuveb Hussain +Stefan de Konink +Takahashi Tomohiro +Tatsuro Enokura + +#authorslist# + +[....send patches to get your name here....] + +The libvirt logo was designed by Diana Fong + +-- End +;; Local Variables: +;; coding: utf-8 +;; End: diff --git a/Makefile.am b/Makefile.am index 333e30086a..7b3a33517a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = \ cfg.mk \ examples/domain-events/events-python \ run.in \ + AUTHORS.in \ $(XML_EXAMPLES) pkgconfigdir = $(libdir)/pkgconfig @@ -78,7 +79,7 @@ MAINTAINERCLEANFILES = .git-module-status # disable this check distuninstallcheck: -dist-hook: gen-ChangeLog +dist-hook: gen-ChangeLog gen-AUTHORS # Generate the ChangeLog file (with all entries since the switch to git) # and insert it into the directory we're about to use to create a tarball. @@ -91,3 +92,12 @@ gen-ChangeLog: rm -f $(distdir)/ChangeLog; \ mv $(distdir)/cl-t $(distdir)/ChangeLog; \ fi + +.PHONY: gen-AUTHORS +gen-AUTHORS: + if test -d .git; then \ + out="`git log --pretty=format:'%aN <%aE>' | sort -u`" && \ + cat $(srcdir)/AUTHORS.in | perl -p -e "s/#authorslist#/$$out/" > \ + $(distdir)/AUTHORS-tmp && \ + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ + fi diff --git a/bootstrap.conf b/bootstrap.conf index f8b7c4d65d..5d391fdadc 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -223,8 +223,8 @@ if `(${PYTHON_CONFIG-python-config} --version; PYTHON_CONFIG=true fi -# Automake requires that ChangeLog exist. -touch ChangeLog || exit 1 +# Automake requires that ChangeLog and AUTHORS exist. +touch AUTHORS ChangeLog || exit 1 # Override bootstrap's list - we don't use mdate-sh or texinfo.tex. gnulib_extra_files=" diff --git a/cfg.mk b/cfg.mk index e1fbf4f1a0..d3c96bafc4 100644 --- a/cfg.mk +++ b/cfg.mk @@ -43,7 +43,6 @@ _test_script_regex = \<\(init\|test-lib\)\.sh\> # Tests not to run as part of "make distcheck". local-checks-to-skip = \ changelog-check \ - check-AUTHORS \ makefile-check \ makefile_path_separator_check \ patch-check \ @@ -700,6 +699,7 @@ ifeq (0,$(MAKELEVEL)) _clean_requested = $(filter %clean,$(MAKECMDGOALS)) ifeq (1,$(_update_required)$(_clean_requested)) $(info INFO: gnulib update required; running ./autogen.sh first) + $(shell touch $(srcdir)/AUTHORS $(srcdir)/ChangeLog) maint.mk Makefile: _autogen endif endif @@ -711,20 +711,6 @@ _autogen: $(srcdir)/autogen.sh ./config.status -# Give credit where due: -# Ensure that each commit author email address (possibly mapped via -# git log's .mailmap) appears in our AUTHORS file. -sc_check_author_list: - @fail=0; \ - for i in $$(git log --pretty=format:%aE%n|sort -u|grep -v '^$$'); do \ - sanitized=$$(echo "$$i"|LC_ALL=C sed 's/\([^a-zA-Z0-9_@-]\)/\\\1/g'); \ - grep -iq "<$$sanitized>" $(srcdir)/AUTHORS \ - || { printf '%s\n' "$$i" >&2; fail=1; }; \ - done; \ - test $$fail = 1 \ - && echo '$(ME): committer(s) not listed in AUTHORS' >&2; \ - test $$fail = 0 - # regenerate HACKING as part of the syntax-check syntax-check: $(top_srcdir)/HACKING