couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject [5/5] git commit: Initial attempt at fixing THANKS bodge
Date Sun, 02 Dec 2012 02:13:22 GMT
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 <nslater@apache.org>
Authored: Sun Dec 2 00:30:32 2012 +0000
Committer: Noah Slater <nslater@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 <willbeh@gmail.com>
- * Dirk Schalge <dirk@epd-me.net>
- * Roger Leigh <rleigh@debian.org>
- * Sam Ruby <rubys@intertwingly.net>
- * Carlos Valiente <superdupont@gmail.com>
- * Till Klampaeckel <till@klampaeckel.de>
- * Jim Lindley <web@jimlindley.com>
- * Yoan Blanc <yoan.blanc@gmail.com>
- * Michael Gottesman <gottesmm@reed.edu>
- * Mark Baran <mebaran@gmail.com>
- * Michael Hendricks <michael@ndrix.org>
- * Antony Blakey <antony.blakey@gmail.com>
- * Paul Carey <paul.p.carey@gmail.com>
- * Hunter Morris <huntermorris@gmail.com>
- * Brian Palmer <jira@brian.codekitchen.net>
- * Maximillian Dornseif <md@hudora.de>
- * Eric Casteleijn <eric.casteleijn@canonical.com>
- * Maarten Thibaut <mthibaut@cisco.com>
- * Florian Ebeling <florian.ebeling@gmail.com>
- * Volker Mische <volker.mische@gmail.com>
- * Brian Candler <B.Candler@pobox.com>
- * Brad Anderson <brad@sankatygroup.com>
- * Nick Gerakines <nick@gerakines.net>
- * Kevin Ilchmann Jørgensen <kijmail@gmail.com>
- * Dirkjan Ochtman <dirkjan@ochtman.nl>
- * Sebastian Cohnen <sebastian.cohnen@gmx.net>
- * Sven Helmberger <sven.helmberger@gmx.de>
- * Dan Walters <dan@danwalters.net>
- * Curt Arnold <carnold@apache.org>
- * Gustavo Niemeyer
- * Joshua Bronson <jabronson@gmail.com>
- * Kostis Sagonas <kostis@cs.ntua.gr>
- * Matthew Hooker <mwhooker@gmail.com>
- * Ilia Cheishvili <ilia.cheishvili@gmail.com>
- * Lena Herrmann <lena@zeromail.org>
- * Jack Moffit <metajack@gmail.com>
- * Damjan Georgievski <gdamjan@gmail.com>
- * Jan Kassens <jan@kassens.net>
- * James Marca <jmarca@translab.its.uci.edu>
- * Matt Goodall <matt.goodall@gmail.com>
- * Joel Clark <unsigned_char@yahoo.com>
- * Matt Lyon <matt@flowerpowered.com>
- * mikeal <mikeal.rogers@gmail.com>
- * Joscha Feth <joscha@feth.com>
- * Jarrod Roberson <jarrod@vertigrated.com>
- * Jae Kwon <jkwon.work@gmail.com>
- * Gavin Sherry <swm@alcove.com.au>
- * Timothy Smith <tim@couch.io>
- * Martin Haaß <MartinHaass@gmx.net>
- * Hans Ulrich Niedermann <hun@n-dimensional.de>
- * Dmitry Unkovsky <oil.crayons@gmail.com>
- * Zachary Zolton <zachary.zolton@gmail.com>
- * Brian Jenkins <bonkydog@bonkydog.com>
- * Paul Bonser <pib@paulbonser.com>
- * Caleb Land <caleb.land@gmail.com>
- * Juhani Ränkimies <juhani@juranki.com>
- * Kev Jackson <foamdino@gmail.com>
- * Jonathan D. Knezek <jdknezek@gmail.com>
- * David Rose <doppler@gmail.com>
- * Lim Yue Chuan <shasderias@gmail.com>
- * David Davis <xantus@xantus.org>
- * Klaus Trainer <klaus.trainer@web.de>
- * Juuso Väänänen <juuso@vaananen.org>
- * Jeff Zellner <jeff.zellner@gmail.com>
- * Benjamin Young <byoung@bigbluehat.com>
- * Gabriel Farrell <gsf747@gmail.com>
- * Mike Leddy <mike@loop.com.br>
- * Wayne Conrad <wayne@databill.com>
- * Thomas Vander Stichele <thomas@apestaart.org>
- * Felix Hummel <apache@felixhummel.de>
- * Tim Smith <tim@couchbase.com>
- * Dipesh Patel <dipthegeezer.opensource@googlemail.com>
- * Sam Bisbee <sam@sbisbee.com>
- * Nathan Vander Wilt <natevw@yahoo.com>
- * Caolan McMahon <caolan.mcmahon@googlemail.com>
- * Andrey Somov <trophybase@gmail.com>
- * Chris Coulson <chrisccoulson.googlemail.com>
- * Trond Norbye <trond.norbye@gmail.com>
- * Alexander Shorin <kxepal@gmail.com>
- * Christopher Bonhage <queezey@me.com>
- * Christian Carter <cdcarter@gmail.com>
- * Lukasz Mielicki <mielicki@gmail.com>
- * Omar Yasin <omarkj@gmail.com
- * Matt Cooley <matt@mattcooley.net>
- * Simon Leblanc <sim.leblanc+apache@gmail.com>
- * Rogutės Sparnuotos <rogutes@googlemail.com>
- * Gavin McDonald <gmcdonald@apache.org>
- * Fedor Indutny <fedor@indutny.com>
- * Tim Blair
- * Tady Walsh <hello@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 <willbeh@gmail.com>
+ * Dirk Schalge <dirk@epd-me.net>
+ * Roger Leigh <rleigh@debian.org>
+ * Sam Ruby <rubys@intertwingly.net>
+ * Carlos Valiente <superdupont@gmail.com>
+ * Till Klampaeckel <till@klampaeckel.de>
+ * Jim Lindley <web@jimlindley.com>
+ * Yoan Blanc <yoan.blanc@gmail.com>
+ * Michael Gottesman <gottesmm@reed.edu>
+ * Mark Baran <mebaran@gmail.com>
+ * Michael Hendricks <michael@ndrix.org>
+ * Antony Blakey <antony.blakey@gmail.com>
+ * Paul Carey <paul.p.carey@gmail.com>
+ * Hunter Morris <huntermorris@gmail.com>
+ * Brian Palmer <jira@brian.codekitchen.net>
+ * Maximillian Dornseif <md@hudora.de>
+ * Eric Casteleijn <eric.casteleijn@canonical.com>
+ * Maarten Thibaut <mthibaut@cisco.com>
+ * Florian Ebeling <florian.ebeling@gmail.com>
+ * Volker Mische <volker.mische@gmail.com>
+ * Brian Candler <B.Candler@pobox.com>
+ * Brad Anderson <brad@sankatygroup.com>
+ * Nick Gerakines <nick@gerakines.net>
+ * Kevin Ilchmann Jørgensen <kijmail@gmail.com>
+ * Dirkjan Ochtman <dirkjan@ochtman.nl>
+ * Sebastian Cohnen <sebastian.cohnen@gmx.net>
+ * Sven Helmberger <sven.helmberger@gmx.de>
+ * Dan Walters <dan@danwalters.net>
+ * Curt Arnold <carnold@apache.org>
+ * Gustavo Niemeyer
+ * Joshua Bronson <jabronson@gmail.com>
+ * Kostis Sagonas <kostis@cs.ntua.gr>
+ * Matthew Hooker <mwhooker@gmail.com>
+ * Ilia Cheishvili <ilia.cheishvili@gmail.com>
+ * Lena Herrmann <lena@zeromail.org>
+ * Jack Moffit <metajack@gmail.com>
+ * Damjan Georgievski <gdamjan@gmail.com>
+ * Jan Kassens <jan@kassens.net>
+ * James Marca <jmarca@translab.its.uci.edu>
+ * Matt Goodall <matt.goodall@gmail.com>
+ * Joel Clark <unsigned_char@yahoo.com>
+ * Matt Lyon <matt@flowerpowered.com>
+ * mikeal <mikeal.rogers@gmail.com>
+ * Joscha Feth <joscha@feth.com>
+ * Jarrod Roberson <jarrod@vertigrated.com>
+ * Jae Kwon <jkwon.work@gmail.com>
+ * Gavin Sherry <swm@alcove.com.au>
+ * Timothy Smith <tim@couch.io>
+ * Martin Haaß <MartinHaass@gmx.net>
+ * Hans Ulrich Niedermann <hun@n-dimensional.de>
+ * Dmitry Unkovsky <oil.crayons@gmail.com>
+ * Zachary Zolton <zachary.zolton@gmail.com>
+ * Brian Jenkins <bonkydog@bonkydog.com>
+ * Paul Bonser <pib@paulbonser.com>
+ * Caleb Land <caleb.land@gmail.com>
+ * Juhani Ränkimies <juhani@juranki.com>
+ * Kev Jackson <foamdino@gmail.com>
+ * Jonathan D. Knezek <jdknezek@gmail.com>
+ * David Rose <doppler@gmail.com>
+ * Lim Yue Chuan <shasderias@gmail.com>
+ * David Davis <xantus@xantus.org>
+ * Klaus Trainer <klaus.trainer@web.de>
+ * Juuso Väänänen <juuso@vaananen.org>
+ * Jeff Zellner <jeff.zellner@gmail.com>
+ * Benjamin Young <byoung@bigbluehat.com>
+ * Gabriel Farrell <gsf747@gmail.com>
+ * Mike Leddy <mike@loop.com.br>
+ * Wayne Conrad <wayne@databill.com>
+ * Thomas Vander Stichele <thomas@apestaart.org>
+ * Felix Hummel <apache@felixhummel.de>
+ * Tim Smith <tim@couchbase.com>
+ * Dipesh Patel <dipthegeezer.opensource@googlemail.com>
+ * Sam Bisbee <sam@sbisbee.com>
+ * Nathan Vander Wilt <natevw@yahoo.com>
+ * Caolan McMahon <caolan.mcmahon@googlemail.com>
+ * Andrey Somov <trophybase@gmail.com>
+ * Chris Coulson <chrisccoulson.googlemail.com>
+ * Trond Norbye <trond.norbye@gmail.com>
+ * Alexander Shorin <kxepal@gmail.com>
+ * Christopher Bonhage <queezey@me.com>
+ * Christian Carter <cdcarter@gmail.com>
+ * Lukasz Mielicki <mielicki@gmail.com>
+ * Omar Yasin <omarkj@gmail.com
+ * Matt Cooley <matt@mattcooley.net>
+ * Simon Leblanc <sim.leblanc+apache@gmail.com>
+ * Rogutės Sparnuotos <rogutes@googlemail.com>
+ * Gavin McDonald <gmcdonald@apache.org>
+ * Fedor Indutny <fedor@indutny.com>
+ * Tim Blair
+ * Tady Walsh <hello@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 "$@"


Mime
View raw message