]> Savannah Git Hosting - gnulib.git/commitdiff
update-copyright: add code to handle more special cases
authorJim Meyering <meyering@fb.com>
Tue, 2 Jan 2018 00:12:39 +0000 (16:12 -0800)
committerJim Meyering <meyering@fb.com>
Tue, 2 Jan 2018 04:54:20 +0000 (20:54 -0800)
After running "make update-copyright" this year, five files
required additional manual changes.  Automate those adjustments
for next year.
* Makefile (_year_and_prev): Define.
(update-copyright): Add perl commands to induce this year's post-
update-copyright adjustments.

ChangeLog
Makefile

index d3cb40d53e489955d6f559397f4cde48358da737..b0f01dfef37aca76e6dbc8ca94aee556dbaf0837 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-01-01  Jim Meyering  <meyering@fb.com>
+
+       update-copyright: add code to handle more special cases
+       After running "make update-copyright" this year, five files
+       required additional manual changes.  Automate those adjustments
+       for next year.
+       * Makefile (_year_and_prev): Define.
+       (update-copyright): Add perl commands to induce this year's post-
+       update-copyright adjustments.
+
 2018-01-01  Paul Eggert  <eggert@cs.ucla.edu>
 
        version-etc: new year
index 786531b2dea30bcc82eda54337ee5260044945bc..aa5bf01c173b0f9c68f33c3e7af2b9cc90755a49 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -150,6 +150,9 @@ regen: MODULES.html
 MODULES.html: MODULES.html.sh
        ./MODULES.html.sh > MODULES.html
 
+# A perl BEGIN block to set Y to the current year number and W to Y-1.
+_year_and_prev = BEGIN{@t=localtime(time); $$y=$$t[5]+1900; $$w=$$y-1}
+
 # Run this rule once per year (usually early in January)
 # to update all FSF copyright year lists here.
 # We exclude the files listed in srclist.txt (maintained elsewhere)
@@ -157,6 +160,9 @@ MODULES.html: MODULES.html.sh
 # Also exclude any file that includes the "GENERATED AUTOMATICALLY" comment,
 # being careful not to exclude code that merely generates the comment.
 # Also exclude doc/INSTALL*, since they too are generated.
+# Also adjust template-style files that must start with a single
+# (the current) year number in some places.
+# Also adjust version-etc.c and and gendocs.sh.
 update-copyright:
        exempt=$$(mktemp);                                              \
        grep -v '^#' config/srclist.txt|grep -v '^$$'                   \
@@ -172,3 +178,10 @@ update-copyright:
          | UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79                         \
            UPDATE_COPYRIGHT_USE_INTERVALS=1                            \
              xargs build-aux/update-copyright
+       perl -pi -e '$(_year_and_prev) s/(copyright.*)\b$$w\b/$$1$$y/i' \
+         lib/version-etc.c doc/gnulib.texi build-aux/gendocs.sh
+       perl -pi -e '$(_year_and_prev) s/ $$w-$$y / $$y /g'             \
+         doc/gendocs_template* build-aux/gendocs.sh
+       perl -pi -e                                                     \
+          '$(_year_and_prev) s/^(scriptversion=)$$w.*/$$1$$y-01-01.00/i' \
+         build-aux/gendocs.sh