Re: update use of gnulib-tool

[Eric Blake]

[trimming m4 lists out of reply]

Eric Blake <ebb9 <at> byu.net> writes:

> > 3) Commit ltdl/m4/gnulib-cache.m4 into the CVS.
> 
> Hmm.  gnulib-tool created it with a copyright date of 2004.  We should
> update gnulib-tool to have a single location for copyright dates (it
> currently has 6 separate copyright notices, encompassing 4 different date
> ranges).

This patch consolidates the copyright notices in gnulib-tool, reducing from 6
locations to 2 the number of places that need to be updated in 2007.  It also
changes the --version output to only display the most recent year, as opposed to
a range of years, per Gnu coding standards.  Okay to apply?

2006-05-06  Eric Blake  <address@hidden>

        * gnulib-tool (func_version): Base copyright year on CVS date.
        (func_emit_header): New function.
        (func_emit_lib_Makefile_am): Use it.
        (func_emit_tests_Makefile_am): Likewise.
        (func_import): Likewise.

Index: gnulib-tool
===================================================================
RCS file: /sources/gnulib/gnulib/gnulib-tool,v
retrieving revision 1.111
diff -u -p -r1.111 gnulib-tool
--- gnulib-tool 2 May 2006 14:31:00 -0000       1.111
+++ gnulib-tool 6 May 2006 19:38:22 -0000
@@ -136,13 +136,29 @@ Report bugs to <address@hidden>."
 # outputs to stdout the --version message.
 func_version ()
 {
+  year=`echo "$last_checkin_date" | sed -e 's,/.*$,,'`
   echo "$progname (GNU $package) $version"
-  echo "Copyright (C) 2002-2005 Free Software Foundation, Inc.
+  echo "Copyright (C) $year Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
   echo "Written by" "Bruno Haible" "and" "Simon Josefsson"
 }
 
+# func_emit_header
+# outputs to stdout a header for a generated file.
+func_emit_header ()
+{
+  echo "# Copyright (C) 2004-2006 Free Software Foundation, Inc."
+  echo "#"
+  echo "# This file is free software, distributed under the terms of the GNU"
+  echo "# General Public License.  As a special exception to the GNU General"
+  echo "# Public License, this file may be distributed as part of a program"
+  echo "# that contains a configuration script generated by Automake, under"
+  echo "# the same distribution terms as the rest of that program."
+  echo "#"
+  echo "# Generated by gnulib-tool."
+}
+
 # func_tmpdir
 # creates a temporary directory.
 # Sets variable
@@ -716,15 +732,7 @@ func_emit_lib_Makefile_am ()
     perhapsLT=
   fi
   echo "## Process this file with automake to produce Makefile.in."
-  echo "# Copyright (C) 2004 Free Software Foundation, Inc."
-  echo "#"
-  echo "# This file is free software, distributed under the terms of the GNU"
-  echo "# General Public License.  As a special exception to the GNU General"
-  echo "# Public License, this file may be distributed as part of a program"
-  echo "# that contains a configuration script generated by Automake, under"
-  echo "# the same distribution terms as the rest of that program."
-  echo "#"
-  echo "# Generated by gnulib-tool."
+  func_emit_header
   if test -n "$actioncmd"; then
     echo "# Reproduce by: $actioncmd"
   fi
@@ -790,15 +798,7 @@ func_emit_tests_Makefile_am ()
   fi
   testsbase_inverse=`echo "$testsbase" | sed -e 's,/$,,' | sed -e
's,[^/][^/]*,..,g'`
   echo "## Process this file with automake to produce Makefile.in."
-  echo "# Copyright (C) 2004-2005 Free Software Foundation, Inc."
-  echo "#"
-  echo "# This file is free software, distributed under the terms of the GNU"
-  echo "# General Public License.  As a special exception to the GNU General"
-  echo "# Public License, this file may be distributed as part of a program"
-  echo "# that contains a configuration script generated by Automake, under"
-  echo "# the same distribution terms as the rest of that program."
-  echo "#"
-  echo "# Generated by gnulib-tool."
+  func_emit_header
   echo
   # Generate dependencies here, since it eases the debugging of test failures.
   echo "AUTOMAKE_OPTIONS = 1.5 foreign"
@@ -1248,14 +1248,7 @@ func_import ()
   # Create m4/gnulib-cache.m4.
   func_dest_tmpfilename $m4base/gnulib-cache.m4
   (
-    echo "# Copyright (C) 2004 Free Software Foundation, Inc."
-    echo "# This file is free software, distributed under the terms of the GNU"
-    echo "# General Public License.  As a special exception to the GNU General"
-    echo "# Public License, this file may be distributed as part of a program"
-    echo "# that contains a configuration script generated by Autoconf, under"
-    echo "# the same distribution terms as the rest of that program."
-    echo "#"
-    echo "# Generated by gnulib-tool."
+    func_emit_header
     echo "#"
     echo "# This file represents the specification of how gnulib-tool is used."
     echo "# It acts as a cache: It is written and read by gnulib-tool."
@@ -1309,14 +1302,7 @@ func_import ()
   # Create m4/gnulib-comp.m4.
   func_dest_tmpfilename $m4base/gnulib-comp.m4
   (
-    echo "# Copyright (C) 2004 Free Software Foundation, Inc."
-    echo "# This file is free software, distributed under the terms of the GNU"
-    echo "# General Public License.  As a special exception to the GNU General"
-    echo "# Public License, this file may be distributed as part of a program"
-    echo "# that contains a configuration script generated by Autoconf, under"
-    echo "# the same distribution terms as the rest of that program."
-    echo "#"
-    echo "# Generated by gnulib-tool."
+    func_emit_header
     echo "#"
     echo "# This file represents the compiled summary of the specification in"
     echo "# gnulib-cache.m4. It lists the computed macro invocations that need"