Re: update-copyright local hook

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Jim Meyering on 8/14/2009 1:11 PM:
>> Hmm.  VC_LIST_EXCEPT excludes ChangeLog by default, but this is one case 
>> where
>> we WANT ChangeLog's copyright updated along with everything else.  Also, I
>> think we should be exempting all forms of COPYING (such as COPYING.LIB).  And
>> the use of .x-update-copyright seems cleaner than trying to write a sane 
>> regexp
>> replacement in update-copyright-exclude-regexp (after all, I just got that
>> wrong in autoconf[1]).  Would it be better to just do the following patch?
>>
>> [1] 
>> http://thread.gmane.org/gmane.comp.sysutils.autoconf.patches/6772/focus=6773
> 
> Yes.  Good ideas, all.
> Thanks.

It changed a bit due to the merge; here's what I'm pushing.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkqGD+MACgkQ84KuGfSFAYAM4QCfa0IuNi1MSp2Aa3T/4tkDZj5E
9csAn0jgEklgPbb2idA/gjRjyVXTuceX
=5OiM
-----END PGP SIGNATURE-----

>From 284c3066bb305ced359bdc5df7095a53c71f619a Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Fri, 14 Aug 2009 09:40:53 -0600
Subject: [PATCH] maint.mk: simplify update-copyright rule

* top/maint.mk (update-copyright-local): Delete, and document how
to do it in cfg.mk instead.
(update-copyright-exclude-regexp): Delete, and document how to do
it in .x-update-copyright instead.
(update-copyright): Simplify, thanks to VC_LIST_EXCEPT.  Don't
exclude ChangeLog.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog    |   10 ++++++++++
 top/maint.mk |   14 +++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7c47443..ebcee41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-08-14  Eric Blake  <address@hidden>
+
+       maint.mk: simplify update-copyright rule
+       * top/maint.mk (update-copyright-local): Delete, and document how
+       to do it in cfg.mk instead.
+       (update-copyright-exclude-regexp): Delete, and document how to do
+       it in .x-update-copyright instead.
+       (update-copyright): Simplify, thanks to VC_LIST_EXCEPT.  Don't
+       exclude ChangeLog.
+
 2009-08-14  Bruno Haible  <address@hidden>

        * m4/wchar.m4 (gl_WCHAR_H): Undo invalid optimization in last commit.
diff --git a/top/maint.mk b/top/maint.mk
index 5d7c45e..3f9c8ff 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -772,19 +772,19 @@ INDENT_SOURCES ?= $(C_SOURCES)
 indent:
        indent $(INDENT_SOURCES)

-# If you have an additional project-specific rule,
-# define it in cfg.mk and set this variable to its name.
-update-copyright-local ?=
-
 # If you want to set UPDATE_COPYRIGHT_* environment variables,
 # put the assignments in this variable.
 update-copyright-env ?=

 # Run this rule once per year (usually early in January)
 # to update all FSF copyright year lists in your project.
-update-copyright-exclude-regexp ?= (^|/)COPYING$$
+# If you have an additional project-specific rule,
+# add it in cfg.mk along with a line 'update-copyright: prereq'.
+# By default, exclude all variants of COPYING; you can also
+# add exemptions (such as ChangeLog..* for rotated change logs)
+# in the file .x-update-copyright.
 .PHONY: update-copyright
-update-copyright: $(update-copyright-local)
+update-copyright:
        grep -l -w Copyright $$($(VC_LIST_EXCEPT))              \
-         | grep -v -E '$(update-copyright-exclude-regexp)'     \
+               $(srcdir)/ChangeLog | grep -v COPYING           \
          | $(update-copyright-env) xargs $(build_aux)/$@
-- 
1.6.3.3.334.g916e1