Re: [PATCH 1/2] maint: new rule to update copyright year ranges

[Jim Meyering]

Bruno Haible wrote:
> Hi Jim,
>
>>  doc/INSTALL                                        |    3 +--
>>  doc/INSTALL.ISO                                    |    3 +--
>>  doc/INSTALL.UTF-8                                  |    3 +--
>
> These are automatically generated from doc/install.texi. I think Karl would
> need to update the master copy of doc/install.texi accordingly?

Hi Bruno,

Thanks.  Those are probably worth excluding manually.
Let's hear what Karl has to say.

>> The entire patch was over 30K lines.
>
> Can you show the part that affects the files

I'll include the full patch, but first...

Examining the files in a temporary commit, I found several
that were changed in spite of a comment saying that they are
generated automatically:

  $ git diff --name-only 'HEAD^!'|xargs grep '^/\*.*GENERATED AUTOMATICALLY'
  lib/unilbrk/lbrkprop1.h:/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
  lib/unilbrk/lbrkprop2.h:/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
  lib/uninorm/composition-table.gperf:/* DO NOT EDIT! GENERATED
  AUTOMATICALLY! */
  lib/uniwbrk/wbrkprop.h:/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
  tests/unicase/test-cased.c:/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
  tests/unicase/test-ignorable.c:/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
  tests/unicase/test-uc_tolower.c:/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
  tests/unicase/test-uc_totitle.c:/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
  tests/unicase/test-uc_toupper.c:/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
  tests/unigbrk/test-uc-gbrk-prop.h:/* DO NOT EDIT! GENERATED
  AUTOMATICALLY! */

So I've adjusted the Makefile rule to exclude those, too:

>From 1109937d44ce8e3897e1dae14f0adb39bff87f91 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 1 Jan 2011 20:13:03 +0100
Subject: [PATCH] maint: refine the update-copyright rule

* Makefile (update-copyright): Also exclude any file that includes
the "GENERATED AUTOMATICALLY" comment, being careful not to exclude
code that merely generates the comment.
---
 ChangeLog |    7 +++++++
 Makefile  |    3 +++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7acf4b6..dc8bd40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-01  Jim Meyering  <address@hidden>
+
+       maint: refine the update-copyright rule
+       * Makefile (update-copyright): Also exclude any file that includes
+       the "GENERATED AUTOMATICALLY" comment, being careful not to exclude
+       code that merely generates the comment.
+
 2010-12-31  Ben Pfaff  <address@hidden>

        New module 'u8-grapheme-len'.
diff --git a/Makefile b/Makefile
index 8bccbe8..745c603 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,8 @@ MODULES.html: MODULES.html.sh
 # to update all FSF copyright year lists here.
 # We exclude the files listed in srclist.txt (maintained elsewhere)
 # as well as those in tests/unictype (generated).
+# Also exclude any file that includes the "GENERATED AUTOMATICALLY" comment,
+# being careful not to exclude code that merely generates the comment.
 update-copyright:
        exempt=$$(mktemp);                                              \
        grep -v '^#' config/srclist.txt|grep -v '^$$'                   \
@@ -68,6 +70,7 @@ update-copyright:
            done > $$exempt;                                            \
        git ls-files tests/unictype >> $$exempt;                        \
        git ls-files | grep -vFf $$exempt                               \
+         | xargs grep -L '^/\*.*GENERATED AUTOMATICALLY'               \
          | UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79                         \
            UPDATE_COPYRIGHT_USE_INTERVALS=1                            \
              xargs build-aux/update-copyright
--
1.7.3.4


I've rebased and rerun it to update also the newly-added files.
Here's the whole thing:

k.xz
Description: Binary data