Initial attempt at fixing THANKS bodge
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/3f699a0b Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/3f699a0b Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/3f699a0b Branch: refs/heads/docs Commit: 3f699a0b83f49801c1a39095e19dfbb21e21abde Parents: bbd1fdf Author: Noah Slater <nsla...@apache.org> Authored: Sun Dec 2 00:30:32 2012 +0000 Committer: Noah Slater <nsla...@apache.org> Committed: Sun Dec 2 02:13:14 2012 +0000 ---------------------------------------------------------------------- .gitignore | 2 +- Makefile.am | 13 +------ THANKS | 101 ------------------------------------------------------ THANKS.in | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++ bootstrap | 16 +++++++-- 5 files changed, 115 insertions(+), 116 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/3f699a0b/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 6e55209..378f701 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ *.beam *.diff *.gz -*.in *.la *.lo *.o @@ -16,6 +15,7 @@ .* INSTALL Makefile +Makefile.in acinclude.m4 aclocal.m4 apache-couchdb-* http://git-wip-us.apache.org/repos/asf/couchdb/blob/3f699a0b/Makefile.am ---------------------------------------------------------------------- diff --git a/Makefile.am b/Makefile.am index 9521514..afeea73 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,17 +80,8 @@ NOTICE.gz: NOTICE README.gz: README gzip -9 < $< > $@ -# Huge bodge that will be fixed with COUCHDB-1618 -THANKS.gz: $(top_srcdir)/THANKS - sed -e '/^#.*/d' $< > $(top_builddir)/THANKS.tmp - -git shortlog -se 6c976bd..HEAD \ - | grep -v @apache.org \ - | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \ - >> $(top_builddir)/THANKS.tmp - echo '\nFor a list of authors see the `AUTHORS` file.\n' \ - >> $(top_builddir)/THANKS.tmp - gzip -9 < $(top_builddir)/THANKS.tmp > $@ - rm $(top_builddir)/THANKS.tmp +THANKS.gz: THANKS + gzip -9 < $< > $@ check: dev check-js if TESTS http://git-wip-us.apache.org/repos/asf/couchdb/blob/3f699a0b/THANKS ---------------------------------------------------------------------- diff --git a/THANKS b/THANKS deleted file mode 100644 index 2aced28..0000000 --- a/THANKS +++ /dev/null @@ -1,101 +0,0 @@ -Apache CouchDB THANKS -===================== - -A number of people have contributed to Apache CouchDB by reporting problems, -suggesting improvements or submitting changes. Some of these people are: - - * William Beh <will...@gmail.com> - * Dirk Schalge <d...@epd-me.net> - * Roger Leigh <rle...@debian.org> - * Sam Ruby <ru...@intertwingly.net> - * Carlos Valiente <superdup...@gmail.com> - * Till Klampaeckel <t...@klampaeckel.de> - * Jim Lindley <w...@jimlindley.com> - * Yoan Blanc <yoan.bl...@gmail.com> - * Michael Gottesman <gotte...@reed.edu> - * Mark Baran <meba...@gmail.com> - * Michael Hendricks <mich...@ndrix.org> - * Antony Blakey <antony.bla...@gmail.com> - * Paul Carey <paul.p.ca...@gmail.com> - * Hunter Morris <huntermor...@gmail.com> - * Brian Palmer <j...@brian.codekitchen.net> - * Maximillian Dornseif <m...@hudora.de> - * Eric Casteleijn <eric.castele...@canonical.com> - * Maarten Thibaut <mthib...@cisco.com> - * Florian Ebeling <florian.ebel...@gmail.com> - * Volker Mische <volker.mis...@gmail.com> - * Brian Candler <b.cand...@pobox.com> - * Brad Anderson <b...@sankatygroup.com> - * Nick Gerakines <n...@gerakines.net> - * Kevin Ilchmann Jørgensen <kijm...@gmail.com> - * Dirkjan Ochtman <dirk...@ochtman.nl> - * Sebastian Cohnen <sebastian.coh...@gmx.net> - * Sven Helmberger <sven.helmber...@gmx.de> - * Dan Walters <d...@danwalters.net> - * Curt Arnold <carn...@apache.org> - * Gustavo Niemeyer - * Joshua Bronson <jabron...@gmail.com> - * Kostis Sagonas <kos...@cs.ntua.gr> - * Matthew Hooker <mwhoo...@gmail.com> - * Ilia Cheishvili <ilia.cheishv...@gmail.com> - * Lena Herrmann <l...@zeromail.org> - * Jack Moffit <metaj...@gmail.com> - * Damjan Georgievski <gdam...@gmail.com> - * Jan Kassens <j...@kassens.net> - * James Marca <jma...@translab.its.uci.edu> - * Matt Goodall <matt.good...@gmail.com> - * Joel Clark <unsigned_c...@yahoo.com> - * Matt Lyon <m...@flowerpowered.com> - * mikeal <mikeal.rog...@gmail.com> - * Joscha Feth <jos...@feth.com> - * Jarrod Roberson <jar...@vertigrated.com> - * Jae Kwon <jkwon.w...@gmail.com> - * Gavin Sherry <s...@alcove.com.au> - * Timothy Smith <t...@couch.io> - * Martin Haaà <martinha...@gmx.net> - * Hans Ulrich Niedermann <h...@n-dimensional.de> - * Dmitry Unkovsky <oil.cray...@gmail.com> - * Zachary Zolton <zachary.zol...@gmail.com> - * Brian Jenkins <bonky...@bonkydog.com> - * Paul Bonser <p...@paulbonser.com> - * Caleb Land <caleb.l...@gmail.com> - * Juhani Ränkimies <juh...@juranki.com> - * Kev Jackson <foamd...@gmail.com> - * Jonathan D. Knezek <jdkne...@gmail.com> - * David Rose <dopp...@gmail.com> - * Lim Yue Chuan <shasder...@gmail.com> - * David Davis <xan...@xantus.org> - * Klaus Trainer <klaus.trai...@web.de> - * Juuso Väänänen <ju...@vaananen.org> - * Jeff Zellner <jeff.zell...@gmail.com> - * Benjamin Young <byo...@bigbluehat.com> - * Gabriel Farrell <gsf...@gmail.com> - * Mike Leddy <m...@loop.com.br> - * Wayne Conrad <wa...@databill.com> - * Thomas Vander Stichele <tho...@apestaart.org> - * Felix Hummel <apa...@felixhummel.de> - * Tim Smith <t...@couchbase.com> - * Dipesh Patel <dipthegeezer.opensou...@googlemail.com> - * Sam Bisbee <s...@sbisbee.com> - * Nathan Vander Wilt <nat...@yahoo.com> - * Caolan McMahon <caolan.mcma...@googlemail.com> - * Andrey Somov <trophyb...@gmail.com> - * Chris Coulson <chrisccoulson.googlemail.com> - * Trond Norbye <trond.nor...@gmail.com> - * Alexander Shorin <kxe...@gmail.com> - * Christopher Bonhage <quee...@me.com> - * Christian Carter <cdcar...@gmail.com> - * Lukasz Mielicki <mieli...@gmail.com> - * Omar Yasin <oma...@gmail.com - * Matt Cooley <m...@mattcooley.net> - * Simon Leblanc <sim.leblanc+apa...@gmail.com> - * RogutÄs Sparnuotos <rogu...@googlemail.com> - * Gavin McDonald <gmcdon...@apache.org> - * Fedor Indutny <fe...@indutny.com> - * Tim Blair - * Tady Walsh <he...@tady.me> -# Dear committer who merges a commit from a non-committer: -# You don't have to manually maintain the THANKS file anymore (yay!). -# Non-committer authors get automatically appended to THANKS and -# moved into THANKS.gz by `make`. This note will be stripped as well. -# Authors from commit 6c976bd and onwards are auto-inserted. http://git-wip-us.apache.org/repos/asf/couchdb/blob/3f699a0b/THANKS.in ---------------------------------------------------------------------- diff --git a/THANKS.in b/THANKS.in new file mode 100644 index 0000000..4ebf3f0 --- /dev/null +++ b/THANKS.in @@ -0,0 +1,99 @@ +Apache CouchDB THANKS +===================== + +A number of people have contributed to Apache CouchDB by reporting problems, +suggesting improvements or submitting changes. Some of these people are: + + * William Beh <will...@gmail.com> + * Dirk Schalge <d...@epd-me.net> + * Roger Leigh <rle...@debian.org> + * Sam Ruby <ru...@intertwingly.net> + * Carlos Valiente <superdup...@gmail.com> + * Till Klampaeckel <t...@klampaeckel.de> + * Jim Lindley <w...@jimlindley.com> + * Yoan Blanc <yoan.bl...@gmail.com> + * Michael Gottesman <gotte...@reed.edu> + * Mark Baran <meba...@gmail.com> + * Michael Hendricks <mich...@ndrix.org> + * Antony Blakey <antony.bla...@gmail.com> + * Paul Carey <paul.p.ca...@gmail.com> + * Hunter Morris <huntermor...@gmail.com> + * Brian Palmer <j...@brian.codekitchen.net> + * Maximillian Dornseif <m...@hudora.de> + * Eric Casteleijn <eric.castele...@canonical.com> + * Maarten Thibaut <mthib...@cisco.com> + * Florian Ebeling <florian.ebel...@gmail.com> + * Volker Mische <volker.mis...@gmail.com> + * Brian Candler <b.cand...@pobox.com> + * Brad Anderson <b...@sankatygroup.com> + * Nick Gerakines <n...@gerakines.net> + * Kevin Ilchmann Jørgensen <kijm...@gmail.com> + * Dirkjan Ochtman <dirk...@ochtman.nl> + * Sebastian Cohnen <sebastian.coh...@gmx.net> + * Sven Helmberger <sven.helmber...@gmx.de> + * Dan Walters <d...@danwalters.net> + * Curt Arnold <carn...@apache.org> + * Gustavo Niemeyer + * Joshua Bronson <jabron...@gmail.com> + * Kostis Sagonas <kos...@cs.ntua.gr> + * Matthew Hooker <mwhoo...@gmail.com> + * Ilia Cheishvili <ilia.cheishv...@gmail.com> + * Lena Herrmann <l...@zeromail.org> + * Jack Moffit <metaj...@gmail.com> + * Damjan Georgievski <gdam...@gmail.com> + * Jan Kassens <j...@kassens.net> + * James Marca <jma...@translab.its.uci.edu> + * Matt Goodall <matt.good...@gmail.com> + * Joel Clark <unsigned_c...@yahoo.com> + * Matt Lyon <m...@flowerpowered.com> + * mikeal <mikeal.rog...@gmail.com> + * Joscha Feth <jos...@feth.com> + * Jarrod Roberson <jar...@vertigrated.com> + * Jae Kwon <jkwon.w...@gmail.com> + * Gavin Sherry <s...@alcove.com.au> + * Timothy Smith <t...@couch.io> + * Martin Haaà <martinha...@gmx.net> + * Hans Ulrich Niedermann <h...@n-dimensional.de> + * Dmitry Unkovsky <oil.cray...@gmail.com> + * Zachary Zolton <zachary.zol...@gmail.com> + * Brian Jenkins <bonky...@bonkydog.com> + * Paul Bonser <p...@paulbonser.com> + * Caleb Land <caleb.l...@gmail.com> + * Juhani Ränkimies <juh...@juranki.com> + * Kev Jackson <foamd...@gmail.com> + * Jonathan D. Knezek <jdkne...@gmail.com> + * David Rose <dopp...@gmail.com> + * Lim Yue Chuan <shasder...@gmail.com> + * David Davis <xan...@xantus.org> + * Klaus Trainer <klaus.trai...@web.de> + * Juuso Väänänen <ju...@vaananen.org> + * Jeff Zellner <jeff.zell...@gmail.com> + * Benjamin Young <byo...@bigbluehat.com> + * Gabriel Farrell <gsf...@gmail.com> + * Mike Leddy <m...@loop.com.br> + * Wayne Conrad <wa...@databill.com> + * Thomas Vander Stichele <tho...@apestaart.org> + * Felix Hummel <apa...@felixhummel.de> + * Tim Smith <t...@couchbase.com> + * Dipesh Patel <dipthegeezer.opensou...@googlemail.com> + * Sam Bisbee <s...@sbisbee.com> + * Nathan Vander Wilt <nat...@yahoo.com> + * Caolan McMahon <caolan.mcma...@googlemail.com> + * Andrey Somov <trophyb...@gmail.com> + * Chris Coulson <chrisccoulson.googlemail.com> + * Trond Norbye <trond.nor...@gmail.com> + * Alexander Shorin <kxe...@gmail.com> + * Christopher Bonhage <quee...@me.com> + * Christian Carter <cdcar...@gmail.com> + * Lukasz Mielicki <mieli...@gmail.com> + * Omar Yasin <oma...@gmail.com + * Matt Cooley <m...@mattcooley.net> + * Simon Leblanc <sim.leblanc+apa...@gmail.com> + * RogutÄs Sparnuotos <rogu...@googlemail.com> + * Gavin McDonald <gmcdon...@apache.org> + * Fedor Indutny <fe...@indutny.com> + * Tim Blair + * Tady Walsh <he...@tady.me> +# Authors from commit 6c976bd and onwards are auto-inserted. If you are merging +# a commit from a non-committer, you should not add an entry to this file. When +# `bootstrap` is run, the actual THANKS file will be generated. http://git-wip-us.apache.org/repos/asf/couchdb/blob/3f699a0b/bootstrap ---------------------------------------------------------------------- diff --git a/bootstrap b/bootstrap index 854a237..4ee6bf8 100755 --- a/bootstrap +++ b/bootstrap @@ -34,17 +34,27 @@ get () { if test -z "$REVISION"; then if test -d .git; then REVISION=`git describe --always`-git - else - # default to svn - REVISION=`\`which svn\` info . 2> /dev/null | awk "/Revision:/{print \\$2}"` fi fi + if test -z "`get LOCAL_VERSION_STAGE`" -o -z "$REVISION"; then sed "s/%release%//" < acinclude.m4.in > acinclude.m4 else sed "s/%release%/$REVISION/" < acinclude.m4.in > acinclude.m4 fi +if test -d .git; then + sed -e "/^#.*/d" $< > $(top_builddir)/THANKS + git shortlog -se 6c976bd..HEAD \ + | grep -v @apache.org \ + | sed -E "s/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /" \ + >> $(top_builddir)/THANKS + echo "\nFor a list of authors see the `AUTHORS` file.\n" \ + >> $(top_builddir)/THANKS +fi + +# Huge bodge that will be fixed with COUCHDB-1618 + find_program() { set +e for f in "$@"
