diff options
| author | Paul Joseph Davis <davisp@apache.org> | 2012-06-17 15:20:21 -0500 |
|---|---|---|
| committer | Paul Joseph Davis <davisp@apache.org> | 2012-06-17 15:36:02 -0500 |
| commit | e64c05061c2bbd7bb2d5456e972e61f67486d989 (patch) | |
| tree | f66b5fc6b39ca0367fca0b3fb61d32683d9f30bd | |
| parent | d93929fdccb6f0fe7b205a021558c219c7fbc146 (diff) | |
| download | couchdb-e64c05061c2bbd7bb2d5456e972e61f67486d989.tar.gz | |
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.
| -rw-r--r-- | Makefile.am | 20 | ||||
| -rw-r--r-- | THANKS | 2 |
2 files changed, 9 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 3ffc3dfa8..6646ac9ef 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 @@ -91,10 +91,8 @@ suggesting improvements or submitting changes. Some of these people are: * Simon Leblanc <sim.leblanc+apache@gmail.com> * Rogutės Sparnuotos <rogutes@googlemail.com> * Gavin McDonald <gmcdonald@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. - |