From cb361c968d771304ab68ed5cb8016a6b0c1b8cf2 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 6 Jan 2010 20:47:08 -0700 Subject: [PATCH] maint.mk: detect incorrect GFDL usage Similar to the existing sc_GPL_version. Fortunately, the two licenses have enough distinction in wording so that neither regexp is a false positive for the other license. This won't catch files that line wrap differently than expected; as it was, the GFDL needed two regexp to handle the use of GFDL in the m4 project. * top/maint.mk (_GFDL_regexp, sc_GFDL_version): New rule. Signed-off-by: Eric Blake --- ChangeLog | 5 +++++ top/maint.mk | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index d9e6c447ba..92973cbe38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-01-06 Eric Blake + + maint.mk: detect incorrect GFDL usage + * top/maint.mk (_GFDL_regexp, sc_GFDL_version): New rule. + 2010-01-06 Jim Meyering and Eric Blake diff --git a/top/maint.mk b/top/maint.mk index 084a177990..d1f0ccd073 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -495,6 +495,13 @@ sc_GPL_version: @re='either ''version [^3]' msg='GPL vN, N!=3' \ $(_prohibit_regexp) +# Require the latest GFDL. Two regexp, since some .texi files end up +# line wrapping between 'Free Documentation License,' and 'Version'. +_GFDL_regexp = (Free ''Documentation.*Version 1\.[^3]|Version 1\.[^3] or any) +sc_GFDL_version: + @re='$(_GFDL_regexp)' msg='GFDL vN, N!=3' \ + $(_prohibit_regexp) + cvs_keywords = \ Author|Date|Header|Id|Name|Locker|Log|RCSfile|Revision|Source|State -- 2.30.2