You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2012/06/17 22:52:46 UTC
git commit: Fixup automatic THANKS generation
Updated Branches:
refs/heads/master d93929fdc -> e64c05061
Fixup automatic THANKS generation
This avoids the need to use mktemp as well as fixes the removal of the
blank lines in THANKS that we want. This notably does not fix the
dependency issue for AUTHORS.gz on the Git history.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e64c0506
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e64c0506
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e64c0506
Branch: refs/heads/master
Commit: e64c05061c2bbd7bb2d5456e972e61f67486d989
Parents: d93929f
Author: Paul Joseph Davis <da...@apache.org>
Authored: Sun Jun 17 15:20:21 2012 -0500
Committer: Paul Joseph Davis <da...@apache.org>
Committed: Sun Jun 17 15:36:02 2012 -0500
----------------------------------------------------------------------
Makefile.am | 20 +++++++++-----------
THANKS | 2 --
2 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 3ffc3df..6646ac9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,17 +79,15 @@ README.gz: $(top_srcdir)/README
-gzip -9 < $< > $@
THANKS.gz: $(top_srcdir)/THANKS
- TMP1=`mktemp -t THANKS`
- TMP2=`mktemp -t THANKS`
- sed -e 's/^#.*//' $< > $TMP1 # strip comments
- sed -e '/^$$/d' $TMP1 > $TMP2 # strip empty lines
- git shortlog -se 6c976bd..HEAD \
- | grep -v @apache.org \
- | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
- >> $TMP2 # inject git authors
- echo '\nFor a list of authors see the `AUTHORS` file.\n' >> $TMP2
- -gzip -9 < $TMP2 > $@ # zip
- rm $TMP1 $TMP2 # cleanup
+ @sed -e '/^#.*/d' $< > $(top_builddir)/AUTHORS.tmp
+ @git shortlog -se 6c976bd..HEAD \
+ | grep -v @apache.org \
+ | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
+ >> $(top_builddir)/AUTHORS.tmp
+ @echo '\nFor a list of authors see the `AUTHORS` file.\n' \
+ >> $(top_builddir)/AUTHORS.tmp
+ -gzip -9 < $(top_builddir)/AUTHORS.tmp > $@
+ @rm $(top_builddir)/AUTHORS.tmp
check: dev check-js
$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/THANKS
----------------------------------------------------------------------
diff --git a/THANKS b/THANKS
index 1e065f8..fc4264d 100644
--- a/THANKS
+++ b/THANKS
@@ -91,10 +91,8 @@ suggesting improvements or submitting changes. Some of these people are:
* Simon Leblanc <si...@gmail.com>
* Rogutės Sparnuotos <ro...@googlemail.com>
* Gavin McDonald <gm...@apache.org>
-
# 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.
-
Re: git commit: Fixup automatic THANKS generation
Posted by Jan Lehnardt <ja...@apache.org>.
On Jun 18, 2012, at 00:12 , Paul Davis wrote:
> On Sun, Jun 17, 2012 at 4:35 PM, Jan Lehnardt <ja...@apache.org> wrote:
>>
>> On Jun 17, 2012, at 22:52 , davisp@apache.org wrote:
>>
>>> Updated Branches:
>>> refs/heads/master d93929fdc -> e64c05061
>>>
>>>
>>> Fixup automatic THANKS generation
>>>
>>> This avoids the need to use mktemp as well as fixes the removal of the
>>> blank lines in THANKS that we want. This notably does not fix the
>>> dependency issue for AUTHORS.gz on the Git history.
>>
>> Thanks for cleaning this up! :)
>>
>> Not to be overly pedantic, but did you mean THANKS.gz (and THANKS.tmp
>> in the patch). I don't see any connection to AUTHORS[.gz], but I may
>> be missing something very obvious.
>>
>> If it is THANKS.gz, can't we rm -f $@ as the first command in the target?
>>
>> Cheers
>> Jan
>> --
>>
>
> Oh good catch. I kept doing that s/AUTHORS/THANKS/ on the cli too.
> Also, no for the rm -f, because that's after Make decides whether or
> not to build it at all.
>
> I'm adding a .PHONY rule for that target to force it to build
> everytime which is correct enough if a bit of a hack. Pushing after I
> see make distcheck run.
Sounds good, thanks for tag-teaming this! :)
Cheers
Jan
--
>
>>
>>>
>>>
>>> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>>> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e64c0506
>>> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e64c0506
>>> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e64c0506
>>>
>>> Branch: refs/heads/master
>>> Commit: e64c05061c2bbd7bb2d5456e972e61f67486d989
>>> Parents: d93929f
>>> Author: Paul Joseph Davis <da...@apache.org>
>>> Authored: Sun Jun 17 15:20:21 2012 -0500
>>> Committer: Paul Joseph Davis <da...@apache.org>
>>> Committed: Sun Jun 17 15:36:02 2012 -0500
>>>
>>> ----------------------------------------------------------------------
>>> Makefile.am | 20 +++++++++-----------
>>> THANKS | 2 --
>>> 2 files changed, 9 insertions(+), 13 deletions(-)
>>> ----------------------------------------------------------------------
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/Makefile.am
>>> ----------------------------------------------------------------------
>>> diff --git a/Makefile.am b/Makefile.am
>>> index 3ffc3df..6646ac9 100644
>>> --- a/Makefile.am
>>> +++ b/Makefile.am
>>> @@ -79,17 +79,15 @@ README.gz: $(top_srcdir)/README
>>> -gzip -9 < $< > $@
>>>
>>> THANKS.gz: $(top_srcdir)/THANKS
>>> - TMP1=`mktemp -t THANKS`
>>> - TMP2=`mktemp -t THANKS`
>>> - sed -e 's/^#.*//' $< > $TMP1 # strip comments
>>> - sed -e '/^$$/d' $TMP1 > $TMP2 # strip empty lines
>>> - git shortlog -se 6c976bd..HEAD \
>>> - | grep -v @apache.org \
>>> - | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
>>> - >> $TMP2 # inject git authors
>>> - echo '\nFor a list of authors see the `AUTHORS` file.\n' >> $TMP2
>>> - -gzip -9 < $TMP2 > $@ # zip
>>> - rm $TMP1 $TMP2 # cleanup
>>> + @sed -e '/^#.*/d' $< > $(top_builddir)/AUTHORS.tmp
>>> + @git shortlog -se 6c976bd..HEAD \
>>> + | grep -v @apache.org \
>>> + | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
>>> + >> $(top_builddir)/AUTHORS.tmp
>>> + @echo '\nFor a list of authors see the `AUTHORS` file.\n' \
>>> + >> $(top_builddir)/AUTHORS.tmp
>>> + -gzip -9 < $(top_builddir)/AUTHORS.tmp > $@
>>> + @rm $(top_builddir)/AUTHORS.tmp
>>>
>>> check: dev check-js
>>> $(top_builddir)/test/etap/run $(top_srcdir)/test/etap
>>>
>>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/THANKS
>>> ----------------------------------------------------------------------
>>> diff --git a/THANKS b/THANKS
>>> index 1e065f8..fc4264d 100644
>>> --- a/THANKS
>>> +++ b/THANKS
>>> @@ -91,10 +91,8 @@ suggesting improvements or submitting changes. Some of these people are:
>>> * Simon Leblanc <si...@gmail.com>
>>> * Rogutės Sparnuotos <ro...@googlemail.com>
>>> * Gavin McDonald <gm...@apache.org>
>>> -
>>> # 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.
>>> -
>>>
>>
Re: git commit: Fixup automatic THANKS generation
Posted by Paul Davis <pa...@gmail.com>.
On Sun, Jun 17, 2012 at 4:35 PM, Jan Lehnardt <ja...@apache.org> wrote:
>
> On Jun 17, 2012, at 22:52 , davisp@apache.org wrote:
>
>> Updated Branches:
>> refs/heads/master d93929fdc -> e64c05061
>>
>>
>> Fixup automatic THANKS generation
>>
>> This avoids the need to use mktemp as well as fixes the removal of the
>> blank lines in THANKS that we want. This notably does not fix the
>> dependency issue for AUTHORS.gz on the Git history.
>
> Thanks for cleaning this up! :)
>
> Not to be overly pedantic, but did you mean THANKS.gz (and THANKS.tmp
> in the patch). I don't see any connection to AUTHORS[.gz], but I may
> be missing something very obvious.
>
> If it is THANKS.gz, can't we rm -f $@ as the first command in the target?
>
> Cheers
> Jan
> --
>
Oh good catch. I kept doing that s/AUTHORS/THANKS/ on the cli too.
Also, no for the rm -f, because that's after Make decides whether or
not to build it at all.
I'm adding a .PHONY rule for that target to force it to build
everytime which is correct enough if a bit of a hack. Pushing after I
see make distcheck run.
>
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e64c0506
>> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e64c0506
>> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e64c0506
>>
>> Branch: refs/heads/master
>> Commit: e64c05061c2bbd7bb2d5456e972e61f67486d989
>> Parents: d93929f
>> Author: Paul Joseph Davis <da...@apache.org>
>> Authored: Sun Jun 17 15:20:21 2012 -0500
>> Committer: Paul Joseph Davis <da...@apache.org>
>> Committed: Sun Jun 17 15:36:02 2012 -0500
>>
>> ----------------------------------------------------------------------
>> Makefile.am | 20 +++++++++-----------
>> THANKS | 2 --
>> 2 files changed, 9 insertions(+), 13 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/Makefile.am
>> ----------------------------------------------------------------------
>> diff --git a/Makefile.am b/Makefile.am
>> index 3ffc3df..6646ac9 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -79,17 +79,15 @@ README.gz: $(top_srcdir)/README
>> -gzip -9 < $< > $@
>>
>> THANKS.gz: $(top_srcdir)/THANKS
>> - TMP1=`mktemp -t THANKS`
>> - TMP2=`mktemp -t THANKS`
>> - sed -e 's/^#.*//' $< > $TMP1 # strip comments
>> - sed -e '/^$$/d' $TMP1 > $TMP2 # strip empty lines
>> - git shortlog -se 6c976bd..HEAD \
>> - | grep -v @apache.org \
>> - | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
>> - >> $TMP2 # inject git authors
>> - echo '\nFor a list of authors see the `AUTHORS` file.\n' >> $TMP2
>> - -gzip -9 < $TMP2 > $@ # zip
>> - rm $TMP1 $TMP2 # cleanup
>> + @sed -e '/^#.*/d' $< > $(top_builddir)/AUTHORS.tmp
>> + @git shortlog -se 6c976bd..HEAD \
>> + | grep -v @apache.org \
>> + | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
>> + >> $(top_builddir)/AUTHORS.tmp
>> + @echo '\nFor a list of authors see the `AUTHORS` file.\n' \
>> + >> $(top_builddir)/AUTHORS.tmp
>> + -gzip -9 < $(top_builddir)/AUTHORS.tmp > $@
>> + @rm $(top_builddir)/AUTHORS.tmp
>>
>> check: dev check-js
>> $(top_builddir)/test/etap/run $(top_srcdir)/test/etap
>>
>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/THANKS
>> ----------------------------------------------------------------------
>> diff --git a/THANKS b/THANKS
>> index 1e065f8..fc4264d 100644
>> --- a/THANKS
>> +++ b/THANKS
>> @@ -91,10 +91,8 @@ suggesting improvements or submitting changes. Some of these people are:
>> * Simon Leblanc <si...@gmail.com>
>> * Rogutės Sparnuotos <ro...@googlemail.com>
>> * Gavin McDonald <gm...@apache.org>
>> -
>> # 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.
>> -
>>
>
Re: git commit: Fixup automatic THANKS generation
Posted by Jan Lehnardt <ja...@apache.org>.
On Jun 17, 2012, at 22:52 , davisp@apache.org wrote:
> Updated Branches:
> refs/heads/master d93929fdc -> e64c05061
>
>
> Fixup automatic THANKS generation
>
> This avoids the need to use mktemp as well as fixes the removal of the
> blank lines in THANKS that we want. This notably does not fix the
> dependency issue for AUTHORS.gz on the Git history.
Thanks for cleaning this up! :)
Not to be overly pedantic, but did you mean THANKS.gz (and THANKS.tmp
in the patch). I don't see any connection to AUTHORS[.gz], but I may
be missing something very obvious.
If it is THANKS.gz, can't we rm -f $@ as the first command in the target?
Cheers
Jan
--
>
>
> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e64c0506
> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e64c0506
> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e64c0506
>
> Branch: refs/heads/master
> Commit: e64c05061c2bbd7bb2d5456e972e61f67486d989
> Parents: d93929f
> Author: Paul Joseph Davis <da...@apache.org>
> Authored: Sun Jun 17 15:20:21 2012 -0500
> Committer: Paul Joseph Davis <da...@apache.org>
> Committed: Sun Jun 17 15:36:02 2012 -0500
>
> ----------------------------------------------------------------------
> Makefile.am | 20 +++++++++-----------
> THANKS | 2 --
> 2 files changed, 9 insertions(+), 13 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/Makefile.am
> ----------------------------------------------------------------------
> diff --git a/Makefile.am b/Makefile.am
> index 3ffc3df..6646ac9 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -79,17 +79,15 @@ README.gz: $(top_srcdir)/README
> -gzip -9 < $< > $@
>
> THANKS.gz: $(top_srcdir)/THANKS
> - TMP1=`mktemp -t THANKS`
> - TMP2=`mktemp -t THANKS`
> - sed -e 's/^#.*//' $< > $TMP1 # strip comments
> - sed -e '/^$$/d' $TMP1 > $TMP2 # strip empty lines
> - git shortlog -se 6c976bd..HEAD \
> - | grep -v @apache.org \
> - | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
> - >> $TMP2 # inject git authors
> - echo '\nFor a list of authors see the `AUTHORS` file.\n' >> $TMP2
> - -gzip -9 < $TMP2 > $@ # zip
> - rm $TMP1 $TMP2 # cleanup
> + @sed -e '/^#.*/d' $< > $(top_builddir)/AUTHORS.tmp
> + @git shortlog -se 6c976bd..HEAD \
> + | grep -v @apache.org \
> + | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
> + >> $(top_builddir)/AUTHORS.tmp
> + @echo '\nFor a list of authors see the `AUTHORS` file.\n' \
> + >> $(top_builddir)/AUTHORS.tmp
> + -gzip -9 < $(top_builddir)/AUTHORS.tmp > $@
> + @rm $(top_builddir)/AUTHORS.tmp
>
> check: dev check-js
> $(top_builddir)/test/etap/run $(top_srcdir)/test/etap
>
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/THANKS
> ----------------------------------------------------------------------
> diff --git a/THANKS b/THANKS
> index 1e065f8..fc4264d 100644
> --- a/THANKS
> +++ b/THANKS
> @@ -91,10 +91,8 @@ suggesting improvements or submitting changes. Some of these people are:
> * Simon Leblanc <si...@gmail.com>
> * Rogutės Sparnuotos <ro...@googlemail.com>
> * Gavin McDonald <gm...@apache.org>
> -
> # 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.
> -
>