diff options
| author | Joel E. Denny <jdenny@clemson.edu> | 2009-08-14 17:05:06 -0400 |
|---|---|---|
| committer | Joel E. Denny <jdenny@clemson.edu> | 2009-08-14 18:50:49 -0400 |
| commit | 585935e895126be36585a2c0684c38f66fa0ada7 (patch) | |
| tree | 288f98a90e9db9054edb8c1fc858a02e936f9eb8 | |
| parent | 83b60c97ee1f98bb1f15ffa38acdc4cc765515f5 (diff) | |
| download | bison-585935e895126be36585a2c0684c38f66fa0ada7.tar.gz | |
maint: fix use of copyright year intervals.
* gnulib: Update.
* bootstrap.conf (gnulib_modules): Update getopt to getopt-gnu
as now recommended in gnulib/NEWS.
* build-aux/update-b4-copyright: Fix.
* cfg.mk (update-copyright-env): Configure update-copyright.
(cherry picked from commit 75ac158b82be1fab5157b140287368165a50ec82)
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | bootstrap.conf | 2 | ||||
| -rwxr-xr-x | build-aux/update-b4-copyright | 32 | ||||
| -rw-r--r-- | cfg.mk | 2 | ||||
| m--------- | gnulib | 0 | ||||
| -rw-r--r-- | lib/.cvsignore | 1 | ||||
| -rw-r--r-- | lib/.gitignore | 1 | ||||
| -rw-r--r-- | m4/.cvsignore | 1 | ||||
| -rw-r--r-- | m4/.gitignore | 1 |
9 files changed, 33 insertions, 16 deletions
@@ -1,3 +1,12 @@ +2009-08-14 Joel E. Denny <jdenny@clemson.edu> + + maint: fix use of copyright year intervals. + * gnulib: Update. + * bootstrap.conf (gnulib_modules): Update getopt to getopt-gnu + as now recommended in gnulib/NEWS. + * build-aux/update-b4-copyright: Fix. + * cfg.mk (update-copyright-env): Configure update-copyright. + 2009-08-13 Joel E. Denny <jdenny@clemson.edu> Make it easier to write deterministic tests. diff --git a/bootstrap.conf b/bootstrap.conf index ee7b8733..1cef2f0d 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -18,7 +18,7 @@ # gnulib modules used by this package. gnulib_modules=' announce-gen argmatch config-h c-strcase configmake dirname error - extensions fopen-safer gendocs getopt gettext git-version-gen hash + extensions fopen-safer gendocs getopt-gnu gettext git-version-gen hash inttypes javacomp-script javaexec-script maintainer-makefile malloc mbswidth obstack quote quotearg stdbool stpcpy strerror strtoul strverscmp unistd unistd-safer unlocked-io update-copyright unsetenv diff --git a/build-aux/update-b4-copyright b/build-aux/update-b4-copyright index af43407d..30c38013 100755 --- a/build-aux/update-b4-copyright +++ b/build-aux/update-b4-copyright @@ -42,7 +42,7 @@ my $old_re = <<'EOF' (?: ,\s* ( - \[\s* (?:\d{4}(,\s*|-))* (\d{4}) \s*] + \[\s* (?:\d{4}(?:,\s*|-))* (\d{4}) \s*] ) )? \) @@ -54,8 +54,7 @@ while (/($old_re)/gx) my $start = pos() - length ($1); my $b4_copyright_line = $2; my $year_lines = $3; - my $sep = $4 ? $4 : ""; - my $final_year = $5; + my $final_year = $4; $year_lines .= ')'; # If there was a second argument, it contains years, so update them. @@ -65,18 +64,7 @@ while (/($old_re)/gx) if ($final_year != $this_year) { # Update the year. - if ($sep eq '-' && $final_year + 1 == $this_year) - { - $year_lines =~ s/$final_year/$this_year/; - } - elsif ($sep ne '-' && $final_year + 1 == $this_year) - { - $year_lines =~ s/$final_year/$final_year-$this_year/; - } - else - { - $year_lines =~ s/$final_year/$final_year, $this_year/; - } + $year_lines =~ s/$final_year/$final_year, $this_year/; } # Normalize all whitespace. @@ -85,6 +73,20 @@ while (/($old_re)/gx) # Put spaces after commas. $year_lines =~ s/, ?/, /g; + # Compress to intervals. + $year_lines =~ + s/ + (\d{4}) + (?: + (,\ |-) + ((??{ + if ($2 eq '-') { '\d{4}'; } + elsif (!$3) { $1 + 1; } + else { $3 + 1; } + })) + )+ + /$1-$3/gx; + # Format within margin. my $year_lines_new; my $indent = index ($b4_copyright_line, '['); @@ -44,3 +44,5 @@ gnulib_dir = $(srcdir)/../../gnulib bootstrap-tools = autoconf,automake,flex,gnulib update-copyright-local = update-b4-copyright +update-copyright-env = \ + UPDATE_COPYRIGHT_FORCE=1 UPDATE_COPYRIGHT_USE_INTERVALS=1 diff --git a/gnulib b/gnulib -Subproject 109f2942075bba4454bd92141b1803cf1b79684 +Subproject e98f3a0b6bb91ab0a1bc71b66b92611f9c3d954 diff --git a/lib/.cvsignore b/lib/.cvsignore index a9d58230..9cf8ec51 100644 --- a/lib/.cvsignore +++ b/lib/.cvsignore @@ -64,6 +64,7 @@ stamp-h1 stdbool.h stdbool.in.h stdbool_.h +stddef.in.h stdint.h stdint.in.h stdint_.h diff --git a/lib/.gitignore b/lib/.gitignore index d3f4a0ac..61afc481 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -67,6 +67,7 @@ /stdbool.h /stdbool.in.h /stdbool_.h +/stddef.in.h /stdint.h /stdint.in.h /stdint_.h diff --git a/m4/.cvsignore b/m4/.cvsignore index eb2f1732..e8cf4d85 100644 --- a/m4/.cvsignore +++ b/m4/.cvsignore @@ -50,6 +50,7 @@ quote.m4 quotearg.m4 setenv.m4 stdbool.m4 +stddef_h.m4 stdint.m4 stdint_h.m4 stdio-safer.m4 diff --git a/m4/.gitignore b/m4/.gitignore index 16ced35a..810868c1 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -50,6 +50,7 @@ /quotearg.m4 /setenv.m4 /stdbool.m4 +/stddef_h.m4 /stdint.m4 /stdint_h.m4 /stdio-safer.m4 |