coreutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] maint: sort contributors in THANKS.in


From: Bernhard Voelker
Subject: [PATCH] maint: sort contributors in THANKS.in
Date: Sun, 8 Feb 2015 20:40:59 +0100

* Makefile.am (sort-THANKS.in): Add target to sort the name/email pair
list in 'THANKS.in'.
* THANKS.in: Sort via the above new target.
* cfg.mk (sc_THANKS_in_sorted): Add rule to ensure that 'THANKS.in'
remains sorted.
---
 Makefile.am | 15 +++++++++++++++
 THANKS.in   | 56 ++++++++++++++++++++++++++++----------------------------
 cfg.mk      | 11 +++++++++++
 3 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index cf0c8a0..e3a4354 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -172,6 +172,21 @@ THANKS: THANKS.in Makefile.am .mailmap thanks-gen .version
          printf ';; %s\n' 'Local Variables:' 'coding: utf-8' End:;     \
        } > $@-t && chmod a-w $@-t && mv $@-t $@
 
+# Sort the contributor name/email pair list in 'THANKS.in'.
+# See sc_THANKS_in_sorted ... which uses the same sort options.
+.PHONY: sort-THANKS.in
+sort-THANKS.in: Makefile.am
+       $(AM_V_GEN)rm -f $@-t;                                          \
+       {                                                               \
+         sed '/^$$/q' THANKS.in                                        \
+           && { sed '/^$$/,/^$$/!d;/^$$/d' THANKS.in                   \
+                  | LC_ALL='en_US.UTF-8' sort -f -k1,1; }              \
+           && echo                                                     \
+           && sed '0,/^$$/d;0,/^$$/d' THANKS.in;                       \
+       } > $@-t                                                        \
+         && test "$$(wc < THANKS.in)" = "$$(wc < $@-t)"                \
+         && mv $@-t THANKS.in
+
 # Some of our git hook scripts are supposed to be identical to git's samples.
 # See if they are still in sync.
 .PHONY: check-git-hook-script-sync
diff --git a/THANKS.in b/THANKS.in
index 1621012..e738d63 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -33,12 +33,11 @@ aldomel                             address@hidden
 Alen Muzinic                        address@hidden
 Alexander Nguyen                    address@hidden
 Alexander V. Lukyanov               address@hidden
-Allen Hewes                         address@hidden
-Axel Dörfler                        address@hidden
 Alexandre Duret-Lutz                address@hidden
 Alexey Solovyov                     address@hidden
 Alexey Vyskubov                     address@hidden
 Alfred M. Szmidt                    address@hidden
+Allen Hewes                         address@hidden
 Ambrose Feinstein                   address@hidden
 Amr Ali                             address@hidden
 Anders Kaseorg                      address@hidden
@@ -72,6 +71,7 @@ Arun Sharma                         address@hidden
 Arvind Autar                        address@hidden
 Augey Mikus                         address@hidden
 Austin Donnelly                     address@hidden
+Axel Dörfler                        address@hidden
 Axel Kittenberger                   address@hidden
 Barry Kelly                         http://barrkel.blogspot.com/
 Bauke Jan Douma                     address@hidden
@@ -110,6 +110,7 @@ Charles Karney                      address@hidden
 Charles Randall                     address@hidden
 Chas. Owens                         address@hidden
 Chip Salzenberg                     address@hidden
+Choi Jongu                          address@hidden
 Chris Clayton                       address@hidden
 Chris Faylor                        address@hidden
 Chris J. Bednar                     address@hidden
@@ -142,7 +143,6 @@ Daniel Mach                         address@hidden
 Daniel P. Berrangé                  address@hidden
 Daniel Stavrovski                   address@hidden
 Daniel Tschinder                    address@hidden
-Dániel Varga                        address@hidden
 Danny Levinson                      address@hidden
 Darrel Francis                      address@hidden
 Darren Salt                         address@hidden
@@ -164,8 +164,8 @@ Dean Gaudet                         address@hidden
 Deepak Goel                         address@hidden
 Denis Excoffier                     address@hidden
 Denis McKeon                        address@hidden
-Dennis Henriksen                    address@hidden
 Dennis Clarke                       address@hidden
+Dennis Henriksen                    address@hidden
 Dennis Smit                         address@hidden
 Derek Clegg                         address@hidden
 Dick Streefland                     address@hidden
@@ -178,6 +178,7 @@ Doug Coleman                        address@hidden
 Doug McLaren                        address@hidden
 Dragos Harabor                      address@hidden
 Duncan Roe                          address@hidden
+Dániel Varga                        address@hidden
 Edward Schwartz                     address@hidden
 Edzer Pebesma                       address@hidden
 Egmont Koblinger                    address@hidden
@@ -203,19 +204,19 @@ Florent Bayle                       address@hidden
 Florian Schlichting                 address@hidden
 Florin Iucha                        address@hidden
 Francesco Montorsi                  address@hidden
-François Pinard                     address@hidden
 Frank Adler                         address@hidden
 Frank T Lofaro                      address@hidden
+François Pinard                     address@hidden
 Fred Fish                           address@hidden
-Frédéric L. W. Meunier              address@hidden
 Frederik Eaton                      address@hidden
+Frédéric L. W. Meunier              address@hidden
 Gabor Z. Papp                       address@hidden
-Gaël Quéri                          address@hidden
 Galen Hazelwood                     address@hidden
 Gary Anderson                       address@hidden
 Gary Johnson                        address@hidden
 Gary V. Vaughan                     address@hidden
 Gaute Hvoslef Kvalnes               address@hidden
+Gaël Quéri                          address@hidden
 Geoff Collyer                       geoff at collyer.net
 Geoff Kuenning                      address@hidden
 Geoff Odhner                        address@hidden
@@ -224,8 +225,6 @@ Gerald Pfeifer                      address@hidden
 Gerhard Poul                        address@hidden
 Germano Leichsenring                address@hidden
 Glen Lenker                         address@hidden
-Göran Uddeborg                      address@hidden
-Guochun Shi                         address@hidden
 GOTO Masanori                       address@hidden
 Greg Louis                          address@hidden
 Greg McGary                         address@hidden
@@ -236,6 +235,8 @@ Greg Wooledge                       address@hidden
 Gregory Leblanc                     address@hidden
 Guido Leenders                      address@hidden
 Guntram Blohm                       address@hidden
+Guochun Shi                         address@hidden
+Göran Uddeborg                      address@hidden
 H. J. Lu                            address@hidden
 Hans Ginzel                         address@hidden
 Hans Lermen                         address@hidden
@@ -250,8 +251,8 @@ Herbert Xu                          address@hidden
 Holger Berger                       address@hidden
 Hon-Yin Kok                         address@hidden
 Hugh Daniel                         address@hidden
-Ian Bruce                           address@hidden
 Iain Calder                         address@hidden
+Ian Bruce                           address@hidden
 Ian Jackson                         address@hidden
 Ian Kent                            address@hidden
 Ian Lance Taylor                    address@hidden
@@ -264,8 +265,8 @@ Ivo Timmermans                      address@hidden
 Jacky Fong                          address@hidden
 James                               address@hidden
 James Antill                        address@hidden
-James Lemley                        address@hidden
 James Hunt                          address@hidden
+James Lemley                        address@hidden
 James Ralston                       address@hidden
 James Sneeringer                    address@hidden
 James Tanis                         address@hidden
@@ -288,9 +289,7 @@ Jens Elkner                         address@hidden
 Jens Schmidt                        address@hidden
 Jeph Cowan                          address@hidden
 Jeremy Maitin-Shepard               address@hidden
-Jérémy Magrin                       address@hidden
 Jerome Abela                        address@hidden
-Jérôme Zago                         address@hidden
 Jesse Kornblum                      address@hidden
 Jesse Thilo                         address@hidden
 Jie Xu                              address@hidden
@@ -326,11 +325,13 @@ Juan F. Codagnone                   address@hidden
 Juan M. Guerrero                    address@hidden
 Julian Bradfield                    address@hidden
 Jungshik Shin                       address@hidden
-Jürgen Fluk                         address@hidden
 Juraj Marko                         address@hidden
 Jurriaan                            address@hidden
 Justin Pryzby                       address@hidden
 jvogel                              address@hidden
+Jérémy Magrin                       address@hidden
+Jérôme Zago                         address@hidden
+Jürgen Fluk                         address@hidden
 Kai Henningsen                      address@hidden
 Kai-Uwe Rommel                      address@hidden
 Kalle Olavi Niemitalo               address@hidden
@@ -346,9 +347,9 @@ Ken Irving                          address@hidden
 Ken Pizzini                         address@hidden
 Kevin Mudrick                       address@hidden
 Kirk Kelsey                         address@hidden
+Kjetil Torgrim Homme                address@hidden
 Konrad Wróblewski                   address@hidden
 Kristin E Thomas                    address@hidden
-Kjetil Torgrim Homme                address@hidden
 Kristoffer Rose                     address@hidden
 Ladislav Hagara                     address@hidden
 Larry McVoy                         address@hidden
@@ -365,11 +366,10 @@ M. P. Suzuki                        address@hidden
 Maciej Kwapulinski                  address@hidden
 Manas Garg                          address@hidden
 Manfred Hollstein                   address@hidden
-Марк Коренберг                      address@hidden
 Marc Boucher                        address@hidden
 Marc Haber                          address@hidden
-Marc Mengel                         address@hidden
 Marc Lehman                         address@hidden
+Marc Mengel                         address@hidden
 Marc Olzheim                        address@hidden
 Marcel Böhme                        http://www.comp.nus.edu.sg/~mboehme
 Marco Franzen                       address@hidden
@@ -400,6 +400,7 @@ Marty Leisner                       address@hidden
 Masami Takikawa                     address@hidden
 Mate Wierdl                         address@hidden
 Matej Vela                          address@hidden
+Mathias Brodala                     address@hidden
 Matias A. Fonzo                     address@hidden
 Matt Kraai                          address@hidden
 Matt McCutchen                      address@hidden
@@ -408,15 +409,14 @@ Matt Pham                           address@hidden
 Matt Schalit                        address@hidden
 Matt Swift                          address@hidden
 Matthew Arnison                     address@hidden
-Matthew M. Boedicker                address@hidden
 Matthew Braun                       address@hidden
 Matthew Clarke                      address@hidden
+Matthew M. Boedicker                address@hidden
 Matthew S. Levine                   address@hidden
 Matthew Smith                       address@hidden
 Matthew Swift                       address@hidden
 Matthias Urlichs                    address@hidden
 Matti Aarnio                        address@hidden
-Mathias Brodala                     address@hidden
 Mattias Wadenstein                  address@hidden
 Max Chang                           address@hidden
 Meelis Roos                         address@hidden
@@ -438,8 +438,8 @@ Michael Price                       address@hidden
 Michael Steffens                    address@hidden
 Michael Stummvoll                   address@hidden
 Michael Stutz                       address@hidden
-Michael van Elst                    address@hidden
 Michael Veksler                     address@hidden
+Michael van Elst                    address@hidden
 Michail Litvak                      address@hidden
 Michal Politowski                   address@hidden
 Michal Svec                         address@hidden
@@ -476,7 +476,6 @@ Olav Morkrid                        address@hidden
 Ole Laursen                         address@hidden
 Oliver Kiddle                       address@hidden
 Olivier Fourdan                     address@hidden
-Ørn E. Hansen                       address@hidden
 Oskar Liljeblad                     address@hidden
 Otavio Salvador                     address@hidden
 Patrick Mauritz                     address@hidden
@@ -507,11 +506,11 @@ Petr Uzel                           address@hidden
 Petter Reinholdtsen                 address@hidden
 Phelippe Neveu                      address@hidden
 Phil Richards                       address@hidden
+Philipp Gortan                      address@hidden
+Philipp Thomas                      address@hidden
 Philippe De Muyter                  address@hidden
 Philippe Schnoebelen                address@hidden
 Phillip Jones                       address@hidden
-Philipp Gortan                      address@hidden
-Philipp Thomas                      address@hidden
 Piergiorgio Sartor                  address@hidden
 Pieter Bowman                       address@hidden
 Piotr Gackiewicz                    address@hidden
@@ -560,7 +559,6 @@ Santiago Vila Doncel                address@hidden
 Savochkin Andrey Vladimirovich      address@hidden
 Scott Harrison                      address@hidden
 Scott Lurndal                       address@hidden
-Sébastien Maret                     address@hidden
 Sergei Steshenko                    address@hidden
 Sergey Vlasov                       address@hidden
 Shing-Shong Shei                    address@hidden
@@ -569,7 +567,6 @@ Solar Designer                      address@hidden
 Stanislav Ievlev                    address@hidden
 Stavros Passas                      address@hidden
 Stefan Vargyas                      address@hidden
-Stéphane Chazelas                   address@hidden
 Stephen Depooter                    address@hidden
 Stephen Eglen                       address@hidden
 Stephen Gildea                      address@hidden
@@ -581,18 +578,20 @@ Steve Ward                          address@hidden
 Steven Drake                        address@hidden
 Steven G. Johnson                   address@hidden
 Steven Mocking                      address@hidden
+Steven P Watson                     address@hidden
 Steven Parkes                       address@hidden
 Steven Schveighoffer                address@hidden
-Steven P Watson                     address@hidden
 Stuart Citrin                       address@hidden
 Stuart Kemp                         address@hidden
 Stuart Shelton                      address@hidden
+Stéphane Chazelas                   address@hidden
 Sven Breuner                        address@hidden
 Szakacsits Szabolcs                 address@hidden
+Sébastien Maret                     address@hidden
 Tadayoshi Funaba                    address@hidden
 TAKAI Kousuke                       address@hidden
-Theodore Ts'o                       address@hidden
 The Wanderer                        address@hidden
+Theodore Ts'o                       address@hidden
 Thomas Bushnell                     address@hidden
 Thomas Goerlich                     address@hidden
 Thomas Hood                         address@hidden
@@ -660,8 +659,9 @@ Yang Ren                            address@hidden
 Yanko Kaneti                        address@hidden
 Yann Dirson                         address@hidden
 Youngjun Song                       address@hidden
-Choi Jongu                          address@hidden
 Yutaka Amanai                       address@hidden
+Ørn E. Hansen                       address@hidden
+Марк Коренберг                      address@hidden
 
 ;; Local Variables:
 ;; coding: utf-8
diff --git a/cfg.mk b/cfg.mk
index f5be6de..26df247 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -611,6 +611,17 @@ sc_THANKS_in_duplicates:
            && { echo '$(ME): remove the above names from THANKS.in'    \
                  1>&2; exit 1; } || :
 
+# Ensure the contributor list stays sorted.  The sort order can be fixed
+# with 'make sort-THANKS.in' ... which uses the same sort options.
+sc_THANKS_in_sorted:
+       @sed '/^$$/,/^$$/!d;/^$$/d' THANKS.in > $@.1;                   \
+       LC_ALL='en_US.UTF-8' sort -f -k1,1 $@.1 > $@.2
+       @diff -u $@.1 $@.2; diff=$$?;                                   \
+       rm -f $@.1 $@.2;                                                \
+       test "$$diff" = 0                                               \
+         || { echo '$(ME): THANKS.in is unsorted; please run'          \
+                'make sort-THANKS.in' 1>&2; exit 1; }
+
 # Look for developer diagnostics that are marked for translation.
 # This won't find any for which devmsg's format string is on a separate line.
 sc_marked_devdiagnostics:
-- 
2.1.4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]