commit-womb
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commit-womb] gnumaint Makefile doc-categories.txt gm gnupack...


From: Karl Berry
Subject: [commit-womb] gnumaint Makefile doc-categories.txt gm gnupack...
Date: Mon, 15 Nov 2010 20:04:15 +0000

CVSROOT:        /sources/womb
Module name:    gnumaint
Changes by:     Karl Berry <karl>       10/11/15 20:04:15

Modified files:
        .              : Makefile doc-categories.txt gm gnupackages.txt 

Log message:
        alphabetize, separate out generate operations

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/Makefile?cvsroot=womb&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnumaint/doc-categories.txt?cvsroot=womb&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm?cvsroot=womb&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnupackages.txt?cvsroot=womb&r1=1.72&r2=1.73

Patches:
Index: Makefile
===================================================================
RCS file: /sources/womb/gnumaint/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- Makefile    11 Nov 2010 00:32:25 -0000      1.24
+++ Makefile    15 Nov 2010 20:04:15 -0000      1.25
@@ -1,4 +1,5 @@
-# Copyright 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# $Id: Makefile,v 1.25 2010/11/15 20:04:15 karl Exp $
+# Copyright 2007-2010 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -6,12 +7,15 @@
 
 default: test-savannah
 
+test-genhtml html:  # result included from www.gnu.org/software/software.html
+       gm generate packages html
+
+test-genmaint html:  # result written to gnuorg/maintainers.bypkg
+       gm generate maintainers bypackage
+
 test-listactivity:
        gm list packages activity
 
-test-listhtml html:  # included from www.gnu.org/software/software.html
-       gm list packages html
-
 test-nophysical:
        gm list maintainers nophysical
 
@@ -21,13 +25,13 @@
 test-gplv3 gplv3:
        gm list packages gplv3
        
-test-activity:
+test-checkactivity:
        gm check activityfile
        
-test-gnupackages:
+test-checkgnupackages:
        gm check gnupackages
        
-test-savannah sv:
+test-checksavannah sv:
        gm check savannah
 
 test-list-maintainers:

Index: doc-categories.txt
===================================================================
RCS file: /sources/womb/gnumaint/doc-categories.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- doc-categories.txt  14 Nov 2010 19:19:55 -0000      1.9
+++ doc-categories.txt  15 Nov 2010 20:04:15 -0000      1.10
@@ -24,4 +24,5 @@
 Sysadmin       System administration
 Telephony
 Text           Text creation and manipulation
+Video
 Web            Web authoring

Index: gm
===================================================================
RCS file: /sources/womb/gnumaint/gm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- gm  11 Nov 2010 00:32:25 -0000      1.26
+++ gm  15 Nov 2010 20:04:15 -0000      1.27
@@ -1,8 +1,8 @@
 #!/usr/bin/env perl
-# $Id: gm,v 1.26 2010/11/11 00:32:25 karl Exp $
+# $Id: gm,v 1.27 2010/11/15 20:04:15 karl Exp $
 # More gnumaint-related stuff, since I think better in Perl than TCL.
 # 
-# Copyright 2007, 2008, 2009, 2010 Free Software Foundation Inc.
+# Copyright 2007-2010 Free Software Foundation Inc.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,20 +38,23 @@
     print <<END_USAGE;
 Usage: $0 CMD ARG...
 
+Perform various GNU maintainer/package operations.
+(See also the gnumaint script in this directory.)
 Here are the possibilities:
-list maintainers bypackage   (generate the maintainers.bypkg file)
-list maintainers nophysical  (maintainers without phone/address info)
-list packages activity       (packages sorted by activity-status)
-list packages gplv3          (packages with GPLv3 update pending)
-list packages html           (packages with links, for gnu.org web site)
-list packages unanswered     (packages which we've had no contact about)
-check activityfile           (verify activity-report.txt)
-check gnupackages            (verify consistency: maintainers/gnupackages)
-check savannah               (verify consistency: gnupackages/savannah)
 
-See also the gnumaint script.
+check activityfile              verify activity-report.txt
+check maintainers               verify consistency: gnupackages/maintainers
+check savannah                  verify consistency: gnupackages/savannah
+
+generate maintainers bypackage  make maintainers.bypkg file
+generate packages html          packages with links, for gnu.org web site
+
+list maintainers nophysical     maintainers without phone/address info
+list packages activity          packages sorted by activity-status
+list packages gplv3             packages with GPLv3 update pending
+list packages unanswered        packages which we've had no contact about
 
-list maintainers bypackage is run from address@hidden cron.
+(generate maintainers bypackage is run from address@hidden cron.)
 END_USAGE
     return 0;
   }
@@ -70,53 +73,6 @@
 
 
 
-# Return all packages with all their maintainers, one package per
-# line, like the original format of the maintainers file.  We run this
-# from cron.
-# 
-sub list_maintainers_bypackage
-{
-  my @ret = ();
-  
-  my %pkgs = &read_maintainers ("by-package");
-  
-  for my $p (sort { lc($a) cmp lc($b) } keys %pkgs) {
-    my @entries = ();
-    my $generic_entry = "";
-    
-    for my $m (@{$pkgs{$p}}) {
-      my $name = $m->{"name"};
-      my $entry = $name;
-      $entry .= " " if $entry;
-      $entry .= "<$m->{best_email}>" if exists $m->{"best_email"};
-
-      if ($m->{"is_generic"} && $name ne "unmaintained") {
-        # Assume that if a name starts with a lowercase letter, it is
-        # generic.  If we ever have a maintainer whose real name starts
-        # with a lowercase letter, we can invent a field to distinguish.
-        # Exception: if the name is "unmaintained", just list that.
-        warn "two generic maintainers for $p?!" if $generic_entry;
-        $generic_entry = $entry;
-      } else {
-        push (@entries, $entry);
-      }
-    }
-    
-    # might not be anything in @entries if the only maintainer was generic.
-    push (@ret, "$p - " . join (", ", @entries)) if @entries;
-    
-    # if we had a generic maintainer for this package, add that as a
-    # separate entry, since that's the way rms wants it.
-    if ($generic_entry) {
-      push (@ret, "$p (generic) - $generic_entry");
-    }
-  }
-  
-  return @ret;
-}
-
-
-
 # Return list of maintainers for whom we have no phone or address.
 # 
 sub list_maintainers_nophysical
@@ -201,28 +157,6 @@
 
 
 
-# Return all packages as relative HTML links to directories by the
-# package name.  We carefully maintain http://www.gnu.org/software/
-# so this works.  Use the simple pkgname/ directory, since nothing else
-# (neither /index.html nor /pkgname.html) always works.
-# 
-sub list_packages_html
-{
-  my @ret = ();
-
-  my %pkgs = &read_gnupackages ();
-  for my $pkgname (sort keys %pkgs) {
-    next if $pkgname =~ / /; # gimp www pages, flex manual
-    next if $pkgname =~ /^gnu-.*-group$/; # no web pages for groups (yet?)
-    my %p = %{$pkgs{$pkgname}};
-    push (@ret, qq!<a href="$pkgname/">$pkgname</a>&nbsp;!);
-  }
-
-  return @ret;
-}
-
-
-
 # Return list of packages for whom no maintainer has answered.
 # 
 sub list_packages_unanswered
@@ -263,6 +197,75 @@
 
 
 
+# Return all packages with all their maintainers, one package per
+# line, like the original format of the maintainers file.  We run this
+# from cron.
+# 
+sub generate_maintainers_bypackage
+{
+  my @ret = ();
+  
+  my %pkgs = &read_maintainers ("by-package");
+  
+  for my $p (sort { lc($a) cmp lc($b) } keys %pkgs) {
+    my @entries = ();
+    my $generic_entry = "";
+    
+    for my $m (@{$pkgs{$p}}) {
+      my $name = $m->{"name"};
+      my $entry = $name;
+      $entry .= " " if $entry;
+      $entry .= "<$m->{best_email}>" if exists $m->{"best_email"};
+
+      if ($m->{"is_generic"} && $name ne "unmaintained") {
+        # Assume that if a name starts with a lowercase letter, it is
+        # generic.  If we ever have a maintainer whose real name starts
+        # with a lowercase letter, we can invent a field to distinguish.
+        # Exception: if the name is "unmaintained", just list that.
+        warn "two generic maintainers for $p?!" if $generic_entry;
+        $generic_entry = $entry;
+      } else {
+        push (@entries, $entry);
+      }
+    }
+    
+    # might not be anything in @entries if the only maintainer was generic.
+    push (@ret, "$p - " . join (", ", @entries)) if @entries;
+    
+    # if we had a generic maintainer for this package, add that as a
+    # separate entry, since that's the way rms wants it.
+    if ($generic_entry) {
+      push (@ret, "$p (generic) - $generic_entry");
+    }
+  }
+  
+  return @ret;
+}
+
+
+
+# Return all packages as relative HTML links to directories by the
+# package name.  We carefully maintain http://www.gnu.org/software/
+# so this works.  Use the simple pkgname/ directory, since nothing else
+# (neither /index.html nor /pkgname.html) always works.
+# 
+sub generate_packages_html
+{
+  my @ret = ();
+
+  my %pkgs = &read_gnupackages ();
+  for my $pkgname (sort keys %pkgs) {
+    next if $pkgname =~ / /; # gimp www pages, flex manual
+    next if $pkgname =~ /^gg-.*$/; # no web pages for groups (yet?)
+    my %p = %{$pkgs{$pkgname}};
+    push (@ret, qq!<a href="$pkgname/">$pkgname</a>&nbsp;!);
+  }
+
+  return @ret;
+}
+
+
+
 # Return list of packages in the activity report that is not in the
 # maintainers file.
 # 
@@ -297,6 +300,40 @@
 
 
 
+# Return list of packages in the gnupackages file that are not in the
+# maintainers file, and vice versa.
+# 
+sub check_maintainers_
+{
+  my @ret = ();
+  
+  my %maint_file = &read_maintainers ("by-package");
+  my %pkg_file = &read_gnupackages ();
+  
+  for my $m (keys %maint_file) {
+    if (exists $pkg_file{$m}) {
+      delete $maint_file{$m};
+      delete $pkg_file{$m};
+    }
+  }
+  
+  for my $p (sort keys %pkg_file) {
+    next if $pkg_file{$p}->{"savannah-only"};
+    push (@ret, "$GNUPACKAGES_FILE:$pkg_file{$p}->{lineno}: "
+                . "$p not in maintainers");
+  }
+  
+  for my $p (sort keys %maint_file) {
+    next if $p =~ /\.nongnu/;
+    push (@ret, "$MAINTAINERS_FILE:$maint_file{$p}[0]->{lineno}: "
+                . "$p not in gnupackages");
+  }
+  
+  return @ret;
+}
+
+
+
 # Return list of packages in the savannah GNU groups.tsv list that are
 # not in the gnupackages or oldpackages files.  We check against these
 # rather than maintainers because some are legitimately only on sv and
@@ -332,40 +369,6 @@
 
 
 
-# Return list of packages in the gnupackages file that are not in the
-# maintainers file, and vice versa.
-# 
-sub check_gnupackages_
-{
-  my @ret = ();
-  
-  my %maint_file = &read_maintainers ("by-package");
-  my %pkg_file = &read_gnupackages ();
-  
-  for my $m (keys %maint_file) {
-    if (exists $pkg_file{$m}) {
-      delete $maint_file{$m};
-      delete $pkg_file{$m};
-    }
-  }
-  
-  for my $p (sort keys %pkg_file) {
-    next if $pkg_file{$p}->{"savannah-only"};
-    push (@ret, "$GNUPACKAGES_FILE:$pkg_file{$p}->{lineno}: "
-                . "$p not in maintainers");
-  }
-  
-  for my $p (sort keys %maint_file) {
-    next if $p =~ /\.nongnu/;
-    push (@ret, "$MAINTAINERS_FILE:$maint_file{$p}[0]->{lineno}: "
-                . "$p not in gnupackages");
-  }
-  
-  return @ret;
-}
-
-
-
 # read the gnupackages.txt file, return a hash of information, where
 # the keys are package names and the values are hash references with the
 # information.  If a key is given more than once (e.g., note), the

Index: gnupackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/gnupackages.txt,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- gnupackages.txt     14 Nov 2010 19:19:55 -0000      1.72
+++ gnupackages.txt     15 Nov 2010 20:04:15 -0000      1.73
@@ -1,4 +1,4 @@
-# $Id: gnupackages.txt,v 1.72 2010/11/14 19:19:55 karl Exp $
+# $Id: gnupackages.txt,v 1.73 2010/11/15 20:04:15 karl Exp $
 # This file records information on a per-package basis,
 # *not* including maintainers (that's in /gd/gnuorg/maintainers).
 # There is nothing private in this file.  Public domain.
@@ -87,7 +87,7 @@
 doc-url: none
 gplv3-status: in-dev-sources (18jun08) # stated on web pages too
 activity-status: stale nonesuch
-last-contact: 14dec09 replied, "spring 2010"
+last-contact: 12nov10 wrote, 14dec09 replied, "spring 2010"
 
 package: alive
 doc-category: Internet
@@ -172,7 +172,7 @@
 package: barcode
 gplv3-status: under-discussion-with-maintainer (3nov09)
 activity-status: stale 20020303 (0.98)
-last-contact: 26jul09 replied
+last-contact: 15nov10 wrote, 26jul09 replied
 
 package: bash
 copyright-holder: fsf
@@ -669,7 +669,7 @@
 doc-url: http://www.freedink.org/doc/
 copyright-holder: notfsf
 gplv3-status: done-in-1.08 (gnumaint-reply 24 Aug 2007 19:47:56 +0200)
-activity-status: ok 20101113 (1.08.20101113, dfarc-3.8)
+activity-status: ok 20101113 (1.08.20101113, dfarc-3.8.1/20101114)
 
 package: freefont
 mundane-name: Free UCS Outline Fonts
@@ -1713,7 +1713,7 @@
 copyright-holder: fsf
 gplv3-status: not-done-since-no-release
 activity-status: newmaint/20090617 no-release
-last-contact: 8nov10,12feb10 wrote
+last-contact: 8nov10 replied, soon
 
 package: less
 copyright-holder: notfsf
@@ -2123,6 +2123,7 @@
 copyright-holder: fsf
 gplv3-status: not-done-since-unmaintained
 activity-status: newmaint/20100601 20010310 (1.99.16)
+last-contact: 15nov10 wrote
 
 package: orgadoc
 mundane-name: OrgaDoc
@@ -2791,6 +2792,9 @@
 
 package: vcdimager
 mundane-name: VCDImager
+doc-category: Video
+doc-summary: authoring, disassembling and analyzing (super and) video CDs
+doc-url: none
 gplv3-status: under-discussion-with-maintainer (4nov07)
 activity-status: moribund 20050711 (0.7.23) # 26feb09 replied
 
@@ -2921,6 +2925,3 @@
 activity-status: ok 20101008 (2.3.20)
 
 # End. (Do not remove this line or the blank line before it.  Thanks.)
-doc-category: Web
-doc-summary: 
-doc-url: /software//manual/



reply via email to

[Prev in Thread] Current Thread [Next in Thread]