On 04/18/2014 06:46 PM, Assaf Gordon wrote:
> Hello,
>
> A minor nit-pick for GnuLib's "make syntax-check",
> where "maint.mk" has the following rule:
> ===
> sc_copyright_check:
> <...>
> @require='Copyright @copyright\{\} .*'$$(date +%Y)' Free' \
> in_vc_files=$(texi) \
> halt='out of date copyright in $(texi); update it' \
> $(_sc_search_regexp)
> ===
>
> This assumes the copyright year is followed by the word "Free" (implicitly:
> "Free Software Foundation") in the texinfo file.
>
> If one is to use Gnulib on a non FSF project, "make syntax-check" fails on
> this rule.
>
> (This might be intentional, if Gnulib, or just gnulib's syntax-check, is
> assume to be used mainly on FSF projects - if so, not worth changing).
gnulib is not restricted to GNU projects:
http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=users.txt;hb=HEAD
Originally that check came from coreutils.
http://git.sv.gnu.org/gitweb/?p=coreutils.git;a=commitdiff;h=9e450601
I guess it could be made more general for gnulib by just removing the " Free"
suffix.
The attached does that.
I've also seen complaints about that syntax check,
that it needs the current year on the same line as "@copyright",
so some just disable the test for their project
by adding the texi file name to .x-sc_copyright_check for example.
thanks,
Pádraig.
>From f9e08f7447ba8c7ca6e50e75ffc7d22f64cbed9e Mon Sep 17 00:00:00 2001
From: Assaf Gordon <agor...@wi.mit.edu>
Date: Fri, 18 Apr 2014 19:34:45 +0100
Subject: [PATCH] maint.mk: Relax the copyright check to cater for non FSF
projects
* top/maint.mk (sc_copyright_check): Relax the check for $PACKAGE.texi
to not require the "Free" suffix after the copyright years.
---
ChangeLog | 6 ++++++
top/maint.mk | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fb25112..918a3fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-18 Assaf Gordon <agor...@wi.mit.edu>
+
+ maint.mk: Relax the copyright check to cater for non FSF projects
+ * top/maint.mk (sc_copyright_check): Relax the check for $PACKAGE.texi
+ to not require the "Free" suffix after the copyright years.
+
2014-04-17 Paul Eggert <egg...@cs.ucla.edu>
regex: do not depend on malloc-gnu
diff --git a/top/maint.mk b/top/maint.mk
index 30f2e8e..b6cd5a2 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1192,7 +1192,7 @@ sc_copyright_check:
in_vc_files=$(sample-test) \
halt='out of date copyright in $(sample-test); update it' \
$(_sc_search_regexp)
- @require='Copyright @copyright\{\} .*'$$(date +%Y)' Free' \
+ @require='Copyright @copyright\{\} .*'$$(date +%Y) \
in_vc_files=$(texi) \
halt='out of date copyright in $(texi); update it' \
$(_sc_search_regexp)
--
1.7.7.6
