couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jan Lehnardt <...@apache.org>
Subject Re: [1/2] git commit: fix make distcheck
Date Sun, 17 Jun 2012 19:46:08 GMT

On Jun 17, 2012, at 21:40 , Paul Davis wrote:

> Rather than the fancy footwork you could just store the tmp output in
> the final file.

I couldn't get that done reliably, maybe I'm doing it wrong. Any hints appreciated.

Cheers
Jan
-- 


> On Sun, Jun 17, 2012 at 2:37 PM, Jan Lehnardt <jan@apache.org> wrote:
>> Noah, is the use of mktemp okay with regards to the rules for building from source?
>> 
>> Dave, is mktemp portable in our Windows build system?
>> 
>> Cheers
>> Jan
>> --
>> 
>> On Jun 17, 2012, at 21:31 , jan@apache.org wrote:
>> 
>>> Updated Branches:
>>>  refs/heads/master 7646794ea -> d93929fdc
>>> 
>>> 
>>> fix make distcheck
>>> 
>>> 
>>> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>>> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d93929fd
>>> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d93929fd
>>> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d93929fd
>>> 
>>> Branch: refs/heads/master
>>> Commit: d93929fdccb6f0fe7b205a021558c219c7fbc146
>>> Parents: 7f93d33
>>> Author: Jan Lehnardt <jan@apache.org>
>>> Authored: Sun Jun 17 21:08:35 2012 +0200
>>> Committer: Jan Lehnardt <jan@apache.org>
>>> Committed: Sun Jun 17 21:08:35 2012 +0200
>>> 
>>> ----------------------------------------------------------------------
>>> Makefile.am |   14 ++++++++------
>>> 1 files changed, 8 insertions(+), 6 deletions(-)
>>> ----------------------------------------------------------------------
>>> 
>>> 
>>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/d93929fd/Makefile.am
>>> ----------------------------------------------------------------------
>>> diff --git a/Makefile.am b/Makefile.am
>>> index 1cbd865..3ffc3df 100644
>>> --- a/Makefile.am
>>> +++ b/Makefile.am
>>> @@ -79,15 +79,17 @@ README.gz: $(top_srcdir)/README
>>>       -gzip -9 < $< > $@
>>> 
>>> THANKS.gz: $(top_srcdir)/THANKS
>>> -     sed -e 's/^#.*//' $< > $<.tmp # strip comments
>>> -     sed -e '/^$$/d' $<.tmp > $<.tmp2  # strip empty lines
>>> +     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 $<.tmp $<.tmp2 # cleanup
>>> +      >> $TMP2 # inject git authors
>>> +     echo '\nFor a list of authors see the `AUTHORS` file.\n' >> $TMP2
>>> +     -gzip -9 < $TMP2 > $@ # zip
>>> +     rm $TMP1 $TMP2 # cleanup
>>> 
>>> check: dev check-js
>>>       $(top_builddir)/test/etap/run $(top_srcdir)/test/etap
>>> 
>> 


Mime
View raw message