diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/contributors.sh | 22 | ||||
| -rwxr-xr-x | scripts/contrithanks.sh | 21 | ||||
| -rwxr-xr-x | scripts/delta | 18 | ||||
| -rwxr-xr-x | scripts/singleuse.pl | 19 |
4 files changed, 61 insertions, 19 deletions
diff --git a/scripts/contributors.sh b/scripts/contributors.sh index a826595c9..6a6d34484 100755 --- a/scripts/contributors.sh +++ b/scripts/contributors.sh @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2013-2019, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 2013-2020, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -29,10 +29,19 @@ start=$1 -if test -z "$start"; then +if test "$start" = "-h"; then echo "Usage: $0 <since this tag/hash> [--releasenotes]" exit fi +if test -z "$start"; then + start=`git tag --sort=taggerdate | tail -1`; + echo "Since $start:" +fi + +# We also include curl-www if possible. Override by setting CURLWWW +if [ -z "$CURLWWW" ] ; then + CURLWWW=../curl-www +fi # filter out Author:, Commit: and *by: lines # cut off the email parts @@ -43,8 +52,15 @@ fi # only count names with a space (ie more than one word) # sort all unique names # awk them into RELEASE-NOTES format + ( -git log --pretty=full --use-mailmap $start..HEAD | \ + ( + git log --pretty=full --use-mailmap $start..HEAD + if [ -d "$CURLWWW" ] + then + git -C ../curl-www log --pretty=full --use-mailmap $start..HEAD + fi + ) | \ egrep -ai '(^Author|^Commit|by):' | \ cut -d: -f2- | \ cut '-d(' -f1 | \ diff --git a/scripts/contrithanks.sh b/scripts/contrithanks.sh index 85af71038..44e461455 100755 --- a/scripts/contrithanks.sh +++ b/scripts/contrithanks.sh @@ -28,14 +28,31 @@ start=$1 -if test -z "$start"; then +if test "$start" = "-h"; then echo "Usage: $0 <since this tag/hash>" + exit +fi +if test -z "$start"; then + start=`git tag --sort=taggerdate | tail -1`; +fi + + +# We also include curl-www if possible. Override by setting CURLWWW +if [ -z "$CURLWWW" ] ; then + CURLWWW=../curl-www fi cat ./docs/THANKS ( -git log --use-mailmap $start..HEAD | \ + ( + git log --use-mailmap $start..HEAD + if [ -d "$CURLWWW" ] + then + git -C ../curl-www log --use-mailmap $start..HEAD + fi + ) | \ + egrep -ai '(^Author|^Commit|by):' | \ cut -d: -f2- | \ cut '-d(' -f1 | \ diff --git a/scripts/delta b/scripts/delta index 63cc1522b..28642aab0 100755 --- a/scripts/delta +++ b/scripts/delta @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2018-2019, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 2018-2020, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -30,10 +30,14 @@ $start = $ARGV[0]; -if($start eq "") { +if($start eq "-h") { print "Usage: summary [tag]\n"; exit; } +elsif($start eq "") { + $start = `git tag --sort=taggerdate | tail -1`; + chomp $start; +} $commits = `git log --oneline $start.. | wc -l`; $committers = `git shortlog -s $start.. | wc -l`; @@ -45,16 +49,16 @@ $acommitters = `git shortlog -s | wc -l`; # delta from now compared to before $ncommitters = $acommitters - $bcommitters; -# number of contributors right now (according to THANKS) -$acontribs = `cat docs/THANKS | grep -c '^[^ ]'`; +# number of contributors right now +$acontribs = `./scripts/contrithanks.sh | grep -c '^[^ ]'`; # number when the tag tag was set $bcontribs = `git show $start:docs/THANKS | grep -c '^[^ ]'`; # delta $contribs = $acontribs - $bcontribs; # number of setops: -$asetopts=`grep "^ CINIT" include/gnurl/curl.h | grep -cv OBSOLETE`; -$bsetopts=`git show $start:include/gnurl/curl.h | grep "^ CINIT" | grep -cv OBSOLETE`; +$asetopts=`grep '^ CURLOPT(' include/gnurl/curl.h | grep -cv OBSOLETE`; +$bsetopts=`git show $start:include/gnurl/curl.h | grep '^ CURLOPT(' | grep -cv OBSOLETE`; $nsetopts = $asetopts - $bsetopts; # Number of command line options: @@ -118,7 +122,7 @@ printf "Commit authors: %d out of which %d are new (out of %d)\n", $committers, $ncommitters, $acommitters; printf "Contributors in RELEASE-NOTES: %d\n", $numcontributors; -printf "New contributors (in THANKS): %d (out of %d)\n", +printf "New contributors: %d (out of %d)\n", $contribs, $acontribs; printf "New curl_easy_setopt() options: %d (out of %d)\n", $nsetopts, $asetopts; diff --git a/scripts/singleuse.pl b/scripts/singleuse.pl index 10b9e27cd..ce77fdf05 100755 --- a/scripts/singleuse.pl +++ b/scripts/singleuse.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2019, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 2019 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -116,9 +116,11 @@ my %api = ( 'curl_multi_socket' => 'API', 'curl_multi_socket_action' => 'API', 'curl_multi_socket_all' => 'API', + 'curl_multi_poll' => 'API', 'curl_multi_strerror' => 'API', 'curl_multi_timeout' => 'API', 'curl_multi_wait' => 'API', + 'curl_multi_wakeup' => 'API', 'curl_mvaprintf' => 'API', 'curl_mvfprintf' => 'API', 'curl_mvprintf' => 'API', @@ -179,16 +181,16 @@ for(sort keys %exist) { #printf "%s is defined in %s, used by: %s\n", $_, $exist{$_}, $uses{$_}; if(!$uses{$_}) { # this is a symbol with no "global" user - if($_ =~ /^curl_/) { + if($_ =~ /^curl_dbg_/) { + # we ignore the memdebug symbols + } + elsif($_ =~ /^curl_/) { if(!$api{$_}) { # not present in the API, or for debug-builds print STDERR "Bad curl-prefix: $_\n"; $err++; } } - elsif($_ =~ /^curl_dbg_/) { - # we ignore the memdebug symbols - } elsif($wl{$_}) { #print "$_ is WL\n"; } @@ -201,8 +203,11 @@ for(sort keys %exist) { # global prefix, make sure it is "blessed" if(!$api{$_}) { # not present in the API, or for debug-builds - print STDERR "Bad curl-prefix $_\n"; - $err++; + if($_ !~ /^curl_dbg_/) { + # ignore the memdebug symbols + print STDERR "Bad curl-prefix $_\n"; + $err++; + } } } } |