[commit-womb] gnumaint gm gm-read.pl

[Brandon Invergo]

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Brandon Invergo <brandon>       18/11/12 17:31:33

Modified files:
        .              : gm gm-read.pl 

Log message:
        Update gm-read to support the Recutils version of gnupackages.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm?cvsroot=womb&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-read.pl?cvsroot=womb&r1=1.23&r2=1.24

Patches:
Index: gm
===================================================================
RCS file: /sources/womb/gnumaint/gm,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- gm  14 Oct 2013 19:17:18 -0000      1.59
+++ gm  12 Nov 2018 22:31:31 -0000      1.60
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: gm,v 1.59 2013/10/14 19:17:18 karl Exp $
+# $Id: gm,v 1.60 2018/11/12 22:31:31 brandon Exp $
 # GNU maintainer-related operations.
 # 
 # Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software
@@ -21,7 +21,7 @@
 # Originally written by Karl Berry.
 
 $DEBUG = 0;
-my $ver = '$Id: gm,v 1.59 2013/10/14 19:17:18 karl Exp $';
+my $ver = '$Id: gm,v 1.60 2018/11/12 22:31:31 brandon Exp $';
 
 # In this particular case, using require seemed better than setting up
 # modules.  It's certainly simpler.
@@ -43,7 +43,7 @@
   # maintained here:
 $DOC_CATEGORIES_FILE = "doc-categories.txt";
   # maintained here:
-$GNUPACKAGES_FILE = "gnupackages.txt";
+$GNUPACKAGES_FILE = "rec/gnupackages.rec";
   # http://ftp.gnu.org/gnu/texinfo/htmlxref.cnf
 $HTMLXREF_FILE = "htmlxref.cnf";
   # fp:/gd/gnuorg/maintainers

Index: gm-read.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-read.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gm-read.pl  12 Nov 2018 22:21:39 -0000      1.23
+++ gm-read.pl  12 Nov 2018 22:31:33 -0000      1.24
@@ -1,4 +1,4 @@
-# $Id: gm-read.pl,v 1.23 2018/11/12 22:21:39 brandon Exp $
+# $Id: gm-read.pl,v 1.24 2018/11/12 22:31:33 brandon Exp $
 # Subroutines for gm script that read various external data file.
 # 
 # Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
@@ -424,6 +424,7 @@
   my %pkg;
   while (<GNUPACKAGES_FILE>) {
     next if /^#/;  # ignore comments
+    next if /^%/;  # ignore Recutils annotation
     s/ +$//; # remove trailing spaces
     chomp;
     
@@ -452,6 +453,13 @@
       next;
     }
 
+    # check for a line continuation
+    if (/^\+ /){
+       my $contval = substr $_, 2;
+       $key{$val} = $key{$val} . $contval;
+       next;
+    }
+
     # key is everything before the first colon.
     # value is everything after the first colon and whitespace.
     my ($key,$val) = split (/:\s*/, $_, 2);