incubator-couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Robert Newson <rnew...@apache.org>
Subject Re: git commit: A portable way to populate THANKS.
Date Fri, 04 Jan 2013 16:37:32 GMT
+1

On 4 January 2013 16:34, Jan Lehnardt <jan@apache.org> wrote:
> On Jan 4, 2013, at 17:28 , jan@apache.org wrote:
>
>> Updated Branches:
>>  refs/heads/master 0d6fba2e6 -> 4b2041839
>>
>>
>> A portable way to populate THANKS.
>
> This should go into 1.3.x as it is only broken there (and master, before this commit).
>
> I tested it on Mac, Ubuntu and Windows 8.
>
> Robert Newson: Can I get your ACK for a merge to 1.3.x? (in your capacity as the 1.3.x
Release Master)
>
> Everybody: If you spot anything icky with this one, let us know :)
>
> Best
> Jan
> --
>
>>
>
>> In particular:
>> - BSD sed and GNU sed dosagree on commandline options.
>> - echo "\n" >> FILE or "\r\n" for that matter, does not create a
>>   newline in FILE on Windows.
>>
>> Original patch by Christopher Bonhage, applied with slight modification.
>>
>> Closes COUCHDB-1628.
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4b204183
>> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4b204183
>> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4b204183
>>
>> Branch: refs/heads/master
>> Commit: 4b20418391a9a77012ff74c8064f3da910c310fb
>> Parents: 0d6fba2
>> Author: Jan Lehnardt <jan@apache.org>
>> Authored: Fri Jan 4 16:54:10 2013 +0100
>> Committer: Jan Lehnardt <jan@apache.org>
>> Committed: Fri Jan 4 17:28:42 2013 +0100
>>
>> ----------------------------------------------------------------------
>> bootstrap |   16 ++++++++++++++--
>> 1 files changed, 14 insertions(+), 2 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/4b204183/bootstrap
>> ----------------------------------------------------------------------
>> diff --git a/bootstrap b/bootstrap
>> index b7c949a..1e5bdf1 100755
>> --- a/bootstrap
>> +++ b/bootstrap
>> @@ -44,11 +44,23 @@ else
>> fi
>>
>> if test -d .git; then
>> +    OS=`uname -s`
>> +    case "$OS" in
>> +    Linux|CYGWIN*) # GNU sed
>> +        SED_ERE_FLAG=-r
>> +    ;;
>> +    *) # BSD sed
>> +        SED_ERE_FLAG=-E
>> +    ;;
>> +    esac
>> +
>>     sed -e "/^#.*/d" THANKS.in > THANKS
>> +    CONTRIB_EMAIL_SED_COMMAND="s/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /"
>>     git shortlog -se 6c976bd..HEAD \
>>         | grep -v @apache.org \
>> -        | sed -E "s/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /" >> THANKS
>> -    echo "\nFor a list of authors see the \`AUTHORS\` file." >> THANKS
>> +        | sed $SED_ERE_FLAG -e "$CONTRIB_EMAIL_SED_COMMAND" >> THANKS
>> +    echo "" >> THANKS # simplest portable newline
>> +    echo "For a list of authors see the \`AUTHORS\` file." >> THANKS
>> fi
>>
>> find_program() {
>>
>

Mime
View raw message