[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commit-womb] gnumaint Makefile gm-generate.pl gm-read.pl gnu...
|
From: |
karl |
|
Subject: |
[commit-womb] gnumaint Makefile gm-generate.pl gm-read.pl gnu... |
|
Date: |
Thu, 10 Oct 2013 23:30:15 +0000 |
CVSROOT: /sources/womb
Module name: gnumaint
Changes by: karl <karl> 13/10/10 23:30:15
Modified files:
. : Makefile gm-generate.pl gm-read.pl
gnupackages.txt pkgblurbs.txt
Log message:
eliminate all subpackages
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnumaint/Makefile?cvsroot=womb&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-generate.pl?cvsroot=womb&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gm-read.pl?cvsroot=womb&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnumaint/gnupackages.txt?cvsroot=womb&r1=1.192&r2=1.193
http://cvs.savannah.gnu.org/viewcvs/gnumaint/pkgblurbs.txt?cvsroot=womb&r1=1.2&r2=1.3
Patches:
Index: Makefile
===================================================================
RCS file: /sources/womb/gnumaint/Makefile,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- Makefile 10 Oct 2013 22:42:21 -0000 1.53
+++ Makefile 10 Oct 2013 23:30:14 -0000 1.54
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.53 2013/10/10 22:42:21 karl Exp $
+# $Id: Makefile,v 1.54 2013/10/10 23:30:14 karl Exp $
# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013
# Free Software Foundation, Inc.
#
@@ -19,7 +19,7 @@
html-diff:
cd $(gw) && cvs diff -u0 */allgnupkgs.html
-pkg-blurbs-html dhtml:
+pkg-blurbs-html bhtml:
gm generate blurbs html
test-genlhtml ghtml: # result included from www.gnu.org/graphics/manual.html
Index: gm-generate.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-generate.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gm-generate.pl 10 Oct 2013 22:42:22 -0000 1.4
+++ gm-generate.pl 10 Oct 2013 23:30:14 -0000 1.5
@@ -1,8 +1,8 @@
-# $Id: gm-generate.pl,v 1.4 2013/10/10 22:42:22 karl Exp $
+# $Id: gm-generate.pl,v 1.5 2013/10/10 23:30:14 karl Exp $
# The generate actions for the gm script (see --help message).
#
-# Copyright 2007, 2008, 2009, 2010, 2012, 2013 Free Software Foundation
-# Inc.
+# Copyright 2007, 2008, 2009, 2010, 2012, 2013
+# 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
@@ -22,7 +22,7 @@
# Return doc links for all packages. The result is included in
-# www.gnu.org/manual/manual.html via SSI.
+# http://www.gnu.org/manual/manual.html via SSI.
#
sub generate_logos_html {
my $autostamp = &generated_by_us ();
@@ -342,24 +342,30 @@
my $autostamp = &generated_by_us ();
my @ret = ("<!-- File $autostamp -->");
+ # so we can cross-check blurbs against packages.
+ my %gnupkgs = &read_gnupackages ();
+
my %pkgs = &read_pkgblurbs ();
- my $blurb;
for my $pkgname (sort keys %pkgs) {
next if &skip_pkg_p ($pkgname);
my %pkg = %{ $pkgs{$pkgname} };
- push (@ret, "<--#if expr=\"\$pkg_selection = /:$pkg{package}:/\" -->");
+ warn "$PKGBLURBS_FILE:$pkg{lineno}: $pkgname not in gnupackages\n"
+ if ! exists $gnupkgs{$pkgname};
+
+ push (@ret, "\n<--#if expr=\"\$pkg_selection = /:$pkg{package}:/\" -->");
push (@ret, "<h4><a href=\"$pkg{url}\">$pkg{name}</a></h4>");
- $blurb = $pkg{blurb};
+ my $blurb = $pkg{blurb};
$blurb =~ s/\&/\&/g;
$blurb =~ s/</\</g;
$blurb =~ s/>/\>/g;
$blurb =~ s/"/\"/g;
+
push (@ret, "<p>$blurb</p>");
push (@ret, "<!--#endif -->");
}
+ push (@ret, "\n<!-- End file $autostamp -->");
return @ret;
}
-
1;
Index: gm-read.pl
===================================================================
RCS file: /sources/womb/gnumaint/gm-read.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gm-read.pl 10 Oct 2013 22:42:22 -0000 1.10
+++ gm-read.pl 10 Oct 2013 23:30:14 -0000 1.11
@@ -1,4 +1,4 @@
-# $Id: gm-read.pl,v 1.10 2013/10/10 22:42:22 karl Exp $
+# $Id: gm-read.pl,v 1.11 2013/10/10 23:30:14 karl Exp $
# Subroutines for gm script that read various external data file.
#
# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013
@@ -505,11 +505,12 @@
if ($key =~ /^\+ /) {
$pkg{blurb} = $pkg{blurb} . " " . substr($key, 2);
} else {
- warn "$GNUPACKAGES_FILE:$.: no colon in line\n";
+ warn "$PKGBLURBS_FILE:$.: no colon in line\n";
}
}
- # if key already exists, use | to separate values.
- $val = "$pkg{$key}|$val" if exists $pkg{$key};
+ # if key already exists, complain.
+ warn "found second value $val for key $key (already have $pkg{$key})\n"
+ if exists $pkg{$key};
$pkg{$key} = $val;
}
Index: gnupackages.txt
===================================================================
RCS file: /sources/womb/gnumaint/gnupackages.txt,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -b -r1.192 -r1.193
--- gnupackages.txt 10 Oct 2013 22:55:52 -0000 1.192
+++ gnupackages.txt 10 Oct 2013 23:30:15 -0000 1.193
@@ -1,4 +1,4 @@
-# $Id: gnupackages.txt,v 1.192 2013/10/10 22:55:52 karl Exp $
+# $Id: gnupackages.txt,v 1.193 2013/10/10 23:30:15 karl Exp $
# Public domain.
#
# This file is maintained in the CVS repository of GNU womb,
@@ -304,7 +304,7 @@
package: ccide
doc-category: Software
-doc-summary: decision table code generator
+doc-summary: Decision table code generator
doc-url: none
gplv3-status: done
download-url: http://sourceforge.net/projects/ccide/files/
@@ -423,16 +423,16 @@
activity-status: ok 20130729 (0.4.0)
package: commoncpp
-mundane-name: Common C++
+mundane-name: (u)Common C++
doc-category: Libraries
-doc-summary: (u)Common C++ framework
+doc-summary: (u)Common C++ framework for threaded applications
doc-url: none
gplv3-status: not-done-commoncpp2-1.6.3.tar.gz, done-ucommon-1.9.1
activity-status: ok commoncpp2-1.8.0/20100224 (ucommon-6.1/20121126)
package: complexity
doc-category: Software
-doc-summary: analyzing complexity of C functions
+doc-summary: Analyze complexity of C functions
doc-url: /software/complexity/manual/
gplv3-status: done
activity-status: ok 20121125 (1.0)
@@ -440,7 +440,7 @@
package: config
copyright-holder: fsf-ok-#786463
doc-category: Software
-doc-summary: Common config.guess and config.sub scripts
+doc-summary: Ubiquitious config.guess and config.sub scripts
doc-url: none
gplv3-status: done-with-exception-#341945 (gnumaint-reply 21 Aug 2007 18:39:06)
activity-status: ok released-through-vc
@@ -641,7 +641,7 @@
logo: /software/electric/electric.jpg
doc-category: Science
doc-url: http://www.staticfreesoft.com/jmanual/
-doc-summary: electrical CAD system
+doc-summary: Electrical CAD system
gplv3-status: in-dev-sources (gnumaint-reply 20 Aug 2007 18:50:41 -0700)
activity-status: ok 20130620 (9.04)
Index: pkgblurbs.txt
===================================================================
RCS file: /sources/womb/gnumaint/pkgblurbs.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- pkgblurbs.txt 10 Oct 2013 22:55:56 -0000 1.2
+++ pkgblurbs.txt 10 Oct 2013 23:30:15 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: pkgblurbs.txt,v 1.2 2013/10/10 22:55:56 karl Exp $
+# $Id: pkgblurbs.txt,v 1.3 2013/10/10 23:30:15 karl Exp $
# Public domain.
#
# This file is maintained in the CVS repository of GNU womb,
@@ -20,7 +20,7 @@
name: a2ps
url: http://www.gnu.org/software/a2ps/
description: Any file to PostScript, including pretty-printing
-blurb: a2ps converts almost anything to a Postscript file, ready for
+blurb: a2ps converts almost anything to a PostScript file, ready for
+ printing. It accomplishes this by being able to delegate files to
+ external handlers, such as Groff and Gzip. It handles as many steps
+ as is necessary to produce a pretty-printed file. It also includes
@@ -182,8 +182,8 @@
description: Convert text strings to printed bars in various standards
blurb: GNU Barcode is a flexible tool to produce printed barcodes from text
+ strings. It supports a variety of encoding standards and sizing
-+ measurements. Barcodes can be output in Postscript or Encapsulated
-+ Postscript formats.
++ measurements. Barcodes can be output in PostScript or Encapsulated
++ PostScript formats.
package: bash
name: Bash
@@ -257,13 +257,11 @@
+ compact. Control and data flow analysis, as well as basic checks for
+ deadlocks and other such properties are available.
-package: bzr
-name: Bazaar
-url: http://www.gnu.org/software/bzr
-description: The GNU distributed version control system
-blurb: Bazaar is a version control system that allows you to record changes
-+ to project files over time. It is flexible to fit the needs of a
-+ wide range of projects. It also supports both a distributed workflow
+package: bazaar
+blurb: GNU Bazaar is a version control system that allows
++ you to record changes
++ to project files over time.
++ It supports both a distributed workflow
+ as well as the classic centralized workflow.
package: c-graph
@@ -385,13 +383,11 @@
+ advanced features, such as date parsing and directory traversal.
package: commoncpp
-name: Common C++
-url: http://www.gnu.org/software/commoncpp/
-description: (u)Common C++ framework
blurb: GNU Common C++ is an portable, optimized class framework for
+ threaded applications, supporting concurrent synchronization,
+ inter-process communications via sockets, and various methods for data
-+ handling, such as serialization and XML parsing.
++ handling, such as serialization and XML parsing. It includes the uCommon
++ C++ library, a smaller reimplementation.
package: complexity
name: Complexity
@@ -403,7 +399,7 @@
+ code you wrote that seemed comprehensible at the time of writing.
package: consensus
-blurb: omitted (stale:20131010)
+blurb: null (stale:20131010)
package: coreutils
name: Coreutils
@@ -453,7 +449,7 @@
+ capabilities.
package: dr-geo
-blurb: omitted (stale:20131010)
+blurb: null (stale:20131010)
package: ddd
name: DDD
@@ -535,16 +531,6 @@
+ databases: universal constants, atomic numbers, and constants related
+ to semiconductors.
-package: dismal
-name: Dismal-mode
-url: http://www.gnu.org/software/dismal/
-description: Emacs spreadsheet mode
-blurb: Dismal implements a full spreadsheet mode in Emacs. Because it is
-+ within Emacs, Dismal benefits from all the functionality offered it.
-+ It is fully extensible, allowing users to implement their own
-+ functions. It also has several novel features, such as the ability
-+ to timestamp keyboard and mouse movement.
-
package: dmd
name: DMD
url: http://www.gnu.org/software/dmd/
@@ -874,7 +860,7 @@
+ features completion and history.
package: gg-network
-blurb: omitted (container)
+blurb: null (container)
package: ggradebook
name: gradebook
@@ -985,15 +971,6 @@
+ It provides a convenient means for working remotely with a GNATS
+ database.
-package: gnu-arch
-name: arch
-url: http://www.gnu.org/software/gnu-arch/
-description: Distributed version control system
-blurb: GNU arch is a distributed revision control system. It is easy to
-+ learn and administer and has support for all of the necessary
-+ branching and merging actions necessary for software projects with
-+ many authors.
-
package: gnu-c-manual
name: The GNU C Reference Manual
url: http://www.gnu.org/software/gnu-c-manual/
@@ -1005,7 +982,7 @@
+ included.
package: gnu-crypto
-blurb: omitted (stable, mostly merged in classpath)
+blurb: null (stable, mostly merged in classpath)
package: gnubatch
name: GNUbatch
@@ -1069,7 +1046,7 @@
+ transactions.
package: gnucomm
-blurb: omitted (container)
+blurb: null (container)
package: gnue
blurb: Includes an application server, common development library, an
@@ -1077,7 +1054,7 @@
+ system, and data reporting system.
package: gnufm
-blurb: omitted (stale:20131010)
+blurb: null (stale:20131010)
package: gnugo
name: Go
@@ -1114,7 +1091,7 @@
+ and replays.
package: gnukart
-blurb: omitted (stale:20131010)
+blurb: null (stale:20131010)
package: gnumach
name: Mach
@@ -1164,7 +1141,9 @@
blurb: The GNU Privacy Guard is a complete implementation of the OpenPGP
+ standard. It is used to encrypt and sign data and communication. It
+ features powerful key management and the ability to access public key
-+ servers.
++ servers. It includes several libraries: libassuan (IPC between GnuPG
++ components), libgpg-error (centralized GnuPG error values), libskba
++ (working with X.509 certificates and CMS data),
package: gnupod
name: GNUpod
@@ -1244,7 +1223,7 @@
+ interfaces are available.
package: gnustandards
-blurb: omitted
+blurb: null (infrastructure doc)
package: gnutls
name: GnuTLS
@@ -1453,13 +1432,7 @@
package: guile-gnome
blurb: Includes guile-clutter, guile-gnome-gstreamer,
-guile-gnome-platform (GNOME developer libraries), guile-gtksourceview.
-
-package: guile-gtk
-name: guile-gtk
-url: http://www.gnu.org/software/guile-gtk/
-description: GTK+ language bindings for Guile
-blurb: guile-gtk provides Guile bindings to the GTK+ widget toolkit.
++ guile-gnome-platform (GNOME developer libraries), guile-gtksourceview.
package: guile-ncurses
name: guile-ncurses
@@ -1538,9 +1511,6 @@
+ and "--version" command-line arguments into a manual page
+ automatically.
-package: hippo
-blurb: omitted (stale:20131010)
-
package: hp2xx
name: hp2xx
url: http://www.gnu.org/software/hp2xx/
@@ -1691,15 +1661,6 @@
+ does not have to read the entire input file before starting, so it
+ starts faster than most text editors.
-package: libassuan
-name: libassuan
-url: http://www.gnupg.org/related_software/libassuan/index.en.html/
-description: A library implementing the Assuan IPC protocol
-blurb: libassuan is a library implementing the Assuan protocol, which is used
-+ for IPC between GnuPG components. It supports both server- and
-+ client-side functionality. Its primary use is to allow a client to
-+ interact with a non-persistent server.
-
package: libc
name: The GNU C Library
url: http://www.gnu.org/software/libc/
@@ -1737,13 +1698,6 @@
+ hash algorithms, public key algorithms, large integer functions and
+ random number generation.
-package: libgpg-error
-name: libgpg-error
-url: http://www.gnupg.org/related_software/libgpg-error/index.en.html/
-description: A library that defines common error values for GnuPG
-blurb: libgpg-error is a library that defines common error values for all
-+ GnuPG components.
-
package: libiconv
name: libiconv
url: http://www.gnu.org/software/libiconv/
@@ -1761,15 +1715,6 @@
+ internationalized domain names. It includes native C, C# and Java
+ libraries.
-package: libksba
-name: Libksba
-url: http://www.gnupg.org/related_software/libksba/index.en.html/
-description: A library for working with X.509 certificates and CMS data
-blurb: Libksba is a library for working with X.509 certificates, CMS data
-+ and other related objects. It abstracts working with the implemented
-+ protocols by providing a high-level interface, freeing the developer
-+ from worrying about the details of each protocol.
-
package: libmatheval
name: libmatheval
url: http://www.gnu.org/software/libmatheval/
@@ -2161,7 +2106,7 @@
+ applications themselves.
package: network
-blurb: omitted (container)
+blurb: null (container)
package: ocrad
name: Ocrad
@@ -2277,7 +2222,7 @@
+ error can be varied.
package: phantom_home
-blurb: omitted (stale:20131010)
+blurb: null (stale:20131010)
package: pies
name: Pies
@@ -2314,7 +2259,7 @@
+ features both a graphical interface as well as command-line input.
+ PSPP is designed to interoperate with Gnumeric, LibreOffice and
+ OpenOffice. Data can be imported from spreadsheets, text files and
-+ database sources and it can be output in text, Postscript, PDF or
++ database sources and it can be output in text, PostScript, PDF or
+ HTML.
package: psychosynth
@@ -2452,17 +2397,6 @@
+ and programming manual, and a browser for displaying sources and
+ directed graphs of class inheritance.
-package: sauce
-name: SAUCE
-url: http://www.gnu.org/software/sauce/
-description: An anti-spam SMTP mail filter
-blurb: SAUCE is an SMTP server that sits between the internet and the mail
-+ user agent and is used to fight spam. It works by checking incoming
-+ email and its sources and rejecting the message if any problem is
-+ discovered. It also supports spambait addresses, which automatically
-+ blacklist any addresses that send to them, and message delays for
-+ messages from unknown sources.
-
package: scm
name: SCM
url: http://www.gnu.org/software/scm
@@ -2574,7 +2508,7 @@
+ classes such as ones for networking and GUI programming.
package: social
-blurb: omitted (stale:20131010)
+blurb: null (stale:20131010)
package: solfege
name: Solfege
@@ -2781,24 +2715,12 @@
name: Trueprint
url: http://www.gnu.org/software/trueprint/
description: Pretty-print C sources and other plain text to PostScript
-blurb: Trueprint is a program that prints C source code files on Postscript
+blurb: Trueprint is a program that prints C source code files on PostScript
+ printers. In addition to the basic source code output, it can
+ also perform diff-marking, indentation counting, function and file
+ indices and more.
-package: ucommon
-name: uCommon C++
-url: http://www.gnu.org/software/commoncpp/
-description: A portable C++ library
-blurb: uCommon C++ is a reimplementation of GNU Common C++, intended to be
-+ smaller and features improved support for both IPv4 and IPv6 socket
-+ addressing. It is a portable, optimized class framework for threaded
-+ applications.
-
package: units
-name: Units
-url: http://www.gnu.org/software/units/
-description: Conversion between thousands of scales
blurb: Units is a program for converting measured quantities between units
+ of measure. It can handle scale changes through adaptive usage of
+ standard scale prefixes (micro-, kilo-, etc.). It can also
@@ -2810,8 +2732,8 @@
name: UnRTF
url: http://www.gnu.org/software/unrtf/unrtf.html/
description: Convert Rich Text Format documents to other formats
-blurb: UnRTF is a program for converting text documents from RTF to HTML,
-+ LaTeX, or troff macros. It supports changes in font characteristics,
+blurb: UnRTF converts text documents from RTF to HTML,
++ LaTeX, or troff. It supports changes in font characteristics,
+ underlines and strikethroughs, superscripts and subscripts, and more.
package: userv
@@ -2909,7 +2831,7 @@
+ system.
package: womb
-blurb: omitted (not released, random collection)
+blurb: null (not released, random collection)
package: xaos
name: XaoS
@@ -2931,6 +2853,9 @@
+ presents a fully interactive graphical interface and it can load and
+ save games in the Portable Game Notation.
+package: xhippo
+blurb: null (stale:20131010)
+
package: xlogmaster
name: Xlogmaster
url: http://www.gnu.org/software/xlogmaster/
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [commit-womb] gnumaint Makefile gm-generate.pl gm-read.pl gnu...,
karl <=