maint: make update-b4-copyright easier to use

* build-aux/update-b4-copyright: In warnings, report line
numbers rather than character positions.
* cfg.mk (update-copyright-local): Set to update-b4-copyright so
that update-copyright runs it.
* gnulib: Update.
(cherry picked from commit a1a9422d4a2f70ff89e06318ba154851c3700f60)

diff --git a/ChangeLog b/ChangeLog
index 7028cc6fcfad690cfbfecbd8514a237d6f37942c..252cadb321ac1430f1fe17f1bdae3894e52f0f0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-06  Joel E. Denny  <jdenny@clemson.edu>
+
+       maint: make update-b4-copyright easier to use
+       * build-aux/update-b4-copyright: In warnings, report line
+       numbers rather than character positions.
+       * cfg.mk (update-copyright-local): Set to update-b4-copyright so
+       that update-copyright runs it.
+       * gnulib: Update.
+

 2009-08-05  Joel E. Denny  <jdenny@clemson.edu>
 
        maint: clean up update-b4-copyright code
 2009-08-05  Joel E. Denny  <jdenny@clemson.edu>
 
        maint: clean up update-b4-copyright code

diff --git a/build-aux/update-b4-copyright b/build-aux/update-b4-copyright
index 06d3cb76da896cc35aa14f5419c8d1a1241280dd..af43407d71c7ee584122cce8e102ac355cae3f51 100755 (executable)
--- a/build-aux/update-b4-copyright
+++ b/build-aux/update-b4-copyright
@@ -117,29 +117,34 @@ while (/($old_re)/gx)
 
 while (/(\bb4_copyright\()/g)
   {
 
 while (/(\bb4_copyright\()/g)
   {

-    my $pos = pos ();
-    pos () -= length ($1);
+    my $start = pos () - length ($1);
+    my $end = pos ();

     my $re = $old_re;
     my $re = $old_re;

+    pos () = $start;

     $re =~ s/\#BEFORE/\\G/;
     if (!/$re/x)
       {
     $re =~ s/\#BEFORE/\\G/;
     if (!/$re/x)
       {

+        my $line = (substr ($_, 0, $start) =~ s/\n/\n/g) + 1;

         print STDERR
         print STDERR

-          "$ARGV: warning: failed to update a b4_copyright before char"
-          . " $pos\n";
+          "$ARGV:$line: warning: failed to update a b4_copyright\n";

       }
       }

-    pos () = $pos;
+    pos () = $end;

   }
 
   }
 

-while (/\[b4_copyright_years]/g)
+while (/(\[b4_copyright_years])/g)

   {
   {

-    my $pos = pos ();
+    my $start = pos () - length ($1);
+    my $end = pos ();

     my $re = $old_re;
     $re =~ s/\#AFTER/\\G/;
     if (!/$re/x)
       {
     my $re = $old_re;
     $re =~ s/\#AFTER/\\G/;
     if (!/$re/x)
       {

+        # The substr operation blows away pos (), so restoring pos ()
+        # at the end is necessary.
+        my $line = (substr ($_, 0, $start) =~ s/\n/\n/g) + 1;

         print STDERR
         print STDERR

-          "$ARGV: warning: failed to update a b4_copyright_years before"
-          . " char $pos\n";
+          "$ARGV:$line: warning: failed to update a"
+          . " b4_copyright_years\n";

       }
       }

-    pos () = $pos;
+    pos () = $end;

   }
   }

diff --git a/cfg.mk b/cfg.mk
index 2b6041accd8b957608ae8d6e90f43a26d2e0b343..66a2bc6fc059176053089617f1df1e8db4b8039f 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -42,3 +42,5 @@ local-checks-to-skip = changelog-check
 gnulib_dir = $(srcdir)/../../gnulib
 
 bootstrap-tools = autoconf,automake,flex,gnulib
 gnulib_dir = $(srcdir)/../../gnulib
 
 bootstrap-tools = autoconf,automake,flex,gnulib

+
+update-copyright-local = update-b4-copyright

diff --git a/gnulib b/gnulib
index 8bdaa78f311ff9e5e03ff37ee5f546af14913802..109f2942075bba4454bd92141b1803cf1b79684c 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 8bdaa78f311ff9e5e03ff37ee5f546af14913802
+Subproject commit 109f2942075bba4454bd92141b1803cf1b79684c