You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2012/12/02 03:13:22 UTC
[5/5] git commit: Initial attempt at fixing THANKS bodge
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 <ns...@apache.org>
Authored: Sun Dec 2 00:30:32 2012 +0000
Committer: Noah Slater <ns...@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 <wi...@gmail.com>
- * Dirk Schalge <di...@epd-me.net>
- * Roger Leigh <rl...@debian.org>
- * Sam Ruby <ru...@intertwingly.net>
- * Carlos Valiente <su...@gmail.com>
- * Till Klampaeckel <ti...@klampaeckel.de>
- * Jim Lindley <we...@jimlindley.com>
- * Yoan Blanc <yo...@gmail.com>
- * Michael Gottesman <go...@reed.edu>
- * Mark Baran <me...@gmail.com>
- * Michael Hendricks <mi...@ndrix.org>
- * Antony Blakey <an...@gmail.com>
- * Paul Carey <pa...@gmail.com>
- * Hunter Morris <hu...@gmail.com>
- * Brian Palmer <ji...@brian.codekitchen.net>
- * Maximillian Dornseif <md...@hudora.de>
- * Eric Casteleijn <er...@canonical.com>
- * Maarten Thibaut <mt...@cisco.com>
- * Florian Ebeling <fl...@gmail.com>
- * Volker Mische <vo...@gmail.com>
- * Brian Candler <B....@pobox.com>
- * Brad Anderson <br...@sankatygroup.com>
- * Nick Gerakines <ni...@gerakines.net>
- * Kevin Ilchmann Jørgensen <ki...@gmail.com>
- * Dirkjan Ochtman <di...@ochtman.nl>
- * Sebastian Cohnen <se...@gmx.net>
- * Sven Helmberger <sv...@gmx.de>
- * Dan Walters <da...@danwalters.net>
- * Curt Arnold <ca...@apache.org>
- * Gustavo Niemeyer
- * Joshua Bronson <ja...@gmail.com>
- * Kostis Sagonas <ko...@cs.ntua.gr>
- * Matthew Hooker <mw...@gmail.com>
- * Ilia Cheishvili <il...@gmail.com>
- * Lena Herrmann <le...@zeromail.org>
- * Jack Moffit <me...@gmail.com>
- * Damjan Georgievski <gd...@gmail.com>
- * Jan Kassens <ja...@kassens.net>
- * James Marca <jm...@translab.its.uci.edu>
- * Matt Goodall <ma...@gmail.com>
- * Joel Clark <un...@yahoo.com>
- * Matt Lyon <ma...@flowerpowered.com>
- * mikeal <mi...@gmail.com>
- * Joscha Feth <jo...@feth.com>
- * Jarrod Roberson <ja...@vertigrated.com>
- * Jae Kwon <jk...@gmail.com>
- * Gavin Sherry <sw...@alcove.com.au>
- * Timothy Smith <ti...@couch.io>
- * Martin Haaß <Ma...@gmx.net>
- * Hans Ulrich Niedermann <hu...@n-dimensional.de>
- * Dmitry Unkovsky <oi...@gmail.com>
- * Zachary Zolton <za...@gmail.com>
- * Brian Jenkins <bo...@bonkydog.com>
- * Paul Bonser <pi...@paulbonser.com>
- * Caleb Land <ca...@gmail.com>
- * Juhani Ränkimies <ju...@juranki.com>
- * Kev Jackson <fo...@gmail.com>
- * Jonathan D. Knezek <jd...@gmail.com>
- * David Rose <do...@gmail.com>
- * Lim Yue Chuan <sh...@gmail.com>
- * David Davis <xa...@xantus.org>
- * Klaus Trainer <kl...@web.de>
- * Juuso Väänänen <ju...@vaananen.org>
- * Jeff Zellner <je...@gmail.com>
- * Benjamin Young <by...@bigbluehat.com>
- * Gabriel Farrell <gs...@gmail.com>
- * Mike Leddy <mi...@loop.com.br>
- * Wayne Conrad <wa...@databill.com>
- * Thomas Vander Stichele <th...@apestaart.org>
- * Felix Hummel <ap...@felixhummel.de>
- * Tim Smith <ti...@couchbase.com>
- * Dipesh Patel <di...@googlemail.com>
- * Sam Bisbee <sa...@sbisbee.com>
- * Nathan Vander Wilt <na...@yahoo.com>
- * Caolan McMahon <ca...@googlemail.com>
- * Andrey Somov <tr...@gmail.com>
- * Chris Coulson <chrisccoulson.googlemail.com>
- * Trond Norbye <tr...@gmail.com>
- * Alexander Shorin <kx...@gmail.com>
- * Christopher Bonhage <qu...@me.com>
- * Christian Carter <cd...@gmail.com>
- * Lukasz Mielicki <mi...@gmail.com>
- * Omar Yasin <omarkj@gmail.com
- * Matt Cooley <ma...@mattcooley.net>
- * Simon Leblanc <si...@gmail.com>
- * Rogutės Sparnuotos <ro...@googlemail.com>
- * Gavin McDonald <gm...@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 <wi...@gmail.com>
+ * Dirk Schalge <di...@epd-me.net>
+ * Roger Leigh <rl...@debian.org>
+ * Sam Ruby <ru...@intertwingly.net>
+ * Carlos Valiente <su...@gmail.com>
+ * Till Klampaeckel <ti...@klampaeckel.de>
+ * Jim Lindley <we...@jimlindley.com>
+ * Yoan Blanc <yo...@gmail.com>
+ * Michael Gottesman <go...@reed.edu>
+ * Mark Baran <me...@gmail.com>
+ * Michael Hendricks <mi...@ndrix.org>
+ * Antony Blakey <an...@gmail.com>
+ * Paul Carey <pa...@gmail.com>
+ * Hunter Morris <hu...@gmail.com>
+ * Brian Palmer <ji...@brian.codekitchen.net>
+ * Maximillian Dornseif <md...@hudora.de>
+ * Eric Casteleijn <er...@canonical.com>
+ * Maarten Thibaut <mt...@cisco.com>
+ * Florian Ebeling <fl...@gmail.com>
+ * Volker Mische <vo...@gmail.com>
+ * Brian Candler <B....@pobox.com>
+ * Brad Anderson <br...@sankatygroup.com>
+ * Nick Gerakines <ni...@gerakines.net>
+ * Kevin Ilchmann Jørgensen <ki...@gmail.com>
+ * Dirkjan Ochtman <di...@ochtman.nl>
+ * Sebastian Cohnen <se...@gmx.net>
+ * Sven Helmberger <sv...@gmx.de>
+ * Dan Walters <da...@danwalters.net>
+ * Curt Arnold <ca...@apache.org>
+ * Gustavo Niemeyer
+ * Joshua Bronson <ja...@gmail.com>
+ * Kostis Sagonas <ko...@cs.ntua.gr>
+ * Matthew Hooker <mw...@gmail.com>
+ * Ilia Cheishvili <il...@gmail.com>
+ * Lena Herrmann <le...@zeromail.org>
+ * Jack Moffit <me...@gmail.com>
+ * Damjan Georgievski <gd...@gmail.com>
+ * Jan Kassens <ja...@kassens.net>
+ * James Marca <jm...@translab.its.uci.edu>
+ * Matt Goodall <ma...@gmail.com>
+ * Joel Clark <un...@yahoo.com>
+ * Matt Lyon <ma...@flowerpowered.com>
+ * mikeal <mi...@gmail.com>
+ * Joscha Feth <jo...@feth.com>
+ * Jarrod Roberson <ja...@vertigrated.com>
+ * Jae Kwon <jk...@gmail.com>
+ * Gavin Sherry <sw...@alcove.com.au>
+ * Timothy Smith <ti...@couch.io>
+ * Martin Haaß <Ma...@gmx.net>
+ * Hans Ulrich Niedermann <hu...@n-dimensional.de>
+ * Dmitry Unkovsky <oi...@gmail.com>
+ * Zachary Zolton <za...@gmail.com>
+ * Brian Jenkins <bo...@bonkydog.com>
+ * Paul Bonser <pi...@paulbonser.com>
+ * Caleb Land <ca...@gmail.com>
+ * Juhani Ränkimies <ju...@juranki.com>
+ * Kev Jackson <fo...@gmail.com>
+ * Jonathan D. Knezek <jd...@gmail.com>
+ * David Rose <do...@gmail.com>
+ * Lim Yue Chuan <sh...@gmail.com>
+ * David Davis <xa...@xantus.org>
+ * Klaus Trainer <kl...@web.de>
+ * Juuso Väänänen <ju...@vaananen.org>
+ * Jeff Zellner <je...@gmail.com>
+ * Benjamin Young <by...@bigbluehat.com>
+ * Gabriel Farrell <gs...@gmail.com>
+ * Mike Leddy <mi...@loop.com.br>
+ * Wayne Conrad <wa...@databill.com>
+ * Thomas Vander Stichele <th...@apestaart.org>
+ * Felix Hummel <ap...@felixhummel.de>
+ * Tim Smith <ti...@couchbase.com>
+ * Dipesh Patel <di...@googlemail.com>
+ * Sam Bisbee <sa...@sbisbee.com>
+ * Nathan Vander Wilt <na...@yahoo.com>
+ * Caolan McMahon <ca...@googlemail.com>
+ * Andrey Somov <tr...@gmail.com>
+ * Chris Coulson <chrisccoulson.googlemail.com>
+ * Trond Norbye <tr...@gmail.com>
+ * Alexander Shorin <kx...@gmail.com>
+ * Christopher Bonhage <qu...@me.com>
+ * Christian Carter <cd...@gmail.com>
+ * Lukasz Mielicki <mi...@gmail.com>
+ * Omar Yasin <omarkj@gmail.com
+ * Matt Cooley <ma...@mattcooley.net>
+ * Simon Leblanc <si...@gmail.com>
+ * Rogutės Sparnuotos <ro...@googlemail.com>
+ * Gavin McDonald <gm...@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 "$@"