From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21875 invoked by alias); 3 Apr 2008 21:03:09 -0000 Received: (qmail 21868 invoked by uid 22791); 3 Apr 2008 21:03:09 -0000 X-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00 X-Spam-Check-By: sourceware.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (83.160.170.119) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 03 Apr 2008 21:02:31 +0000 Received: from [82.72.53.253] by gnu.wildebeest.org with esmtp (Exim 4.63) (envelope-from ) id 1JhWYj-0003y9-DY; Thu, 03 Apr 2008 23:02:28 +0200 Subject: Re: Put refpurposes one line for easy manpage generation. From: Mark Wielaard To: Andrew Cagney Cc: frysk In-Reply-To: <47F4EC2C.7000707@redhat.com> References: <1207230707.4284.11.camel@localhost.localdomain> <47F4E516.4070000@redhat.com> <1207232684.4284.24.camel@localhost.localdomain> <47F4EC2C.7000707@redhat.com> Content-Type: multipart/mixed; boundary="=-6zQn22vHucYdZe/nkscn" Date: Thu, 03 Apr 2008 21:11:00 -0000 Message-Id: <1207256480.3545.14.camel@cc1341701-a.deven1.ov.home.nl> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-3.fc8) X-Spam-Score: -3.1 (---) X-Virus-Checked: Checked by ClamAV on sourceware.org X-IsSubscribed: yes Mailing-List: contact frysk-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-owner@sourceware.org X-SW-Source: 2008-q2/txt/msg00021.txt.bz2 --=-6zQn22vHucYdZe/nkscn Content-Type: text/plain Content-Transfer-Encoding: 7bit Content-length: 1251 Hi Andrew, On Thu, 2008-04-03 at 10:39 -0400, Andrew Cagney wrote: > I'm not fluent in XML either, however I still managed to hack up the > attached (from htdocs/bugzilla). Can we do something with that? Yes, you probably could. Note that all the rest of the manpage index generation is done with sed. You might need to replace all of that. But I wouldn't put too much work into it unless you really want to. It does work pretty well as is now. I did add a quick detection of refpurpose tags that aren't on one line to the Makefile. So when you do make manpages it immediately points them out. It found two other occurrences which I also fixed. frysk-common/ChangeLog 2008-04-03 Mark Wielaard * manpages.sh: Catch bad refpurpose tags. frysk-core/frysk/pkglibdir/ChangeLog 2008-04-03 Mark Wielaard * funit-procmask.xml: Put refpurpose on one line by itself. * funit-exit.xml: Likewise. frysk-top/ChangeLog 2008-04-03 Mark Wielaard * Makefile.am (manpages): Check for refpurpose errors. Now all tools mentioned on http://sourceware.org/frysk/manpages/ have a proper description. Cheers, Mark --=-6zQn22vHucYdZe/nkscn Content-Disposition: inline; filename=patch Content-Type: text/x-patch; name=patch; charset=utf-8 Content-Transfer-Encoding: 7bit Content-length: 2201 diff --git a/frysk-common/manpages.sh b/frysk-common/manpages.sh index 63c1168..ac0c0b6 100755 --- a/frysk-common/manpages.sh +++ b/frysk-common/manpages.sh @@ -83,7 +83,10 @@ EOF cat <${name}.${n} EOF - sed -n 's/\(.*\)<\/refpurpose>/\1/ p' $xmlfile + # Catch empty (aka not on one line) refpurpose tags. + desc=$(sed -n 's/\(.*\)<\/refpurpose>/\1/ p' $xmlfile) + if test -z "$desc"; then exit 1; fi + echo "$desc" echo "" fi done diff --git a/frysk-core/frysk/pkglibdir/funit-exit.xml b/frysk-core/frysk/pkglibdir/funit-exit.xml index c442d85..d420b15 100644 --- a/frysk-core/frysk/pkglibdir/funit-exit.xml +++ b/frysk-core/frysk/pkglibdir/funit-exit.xml @@ -61,8 +61,8 @@ - funit-exit exits with specified - status, or terminates with the specified signal + funit-exit + exits with specified status, or terminates with the specified signal diff --git a/frysk-sys/frysk/pkglibdir/funit-procmask.xml b/frysk-sys/frysk/pkglibdir/funit-procmask.xml index 933b147..add4d7b 100644 --- a/frysk-sys/frysk/pkglibdir/funit-procmask.xml +++ b/frysk-sys/frysk/pkglibdir/funit-procmask.xml @@ -62,8 +62,7 @@ funit-procmask - Test the processes signal mask for the presence (or - absence) of a list if signals + Test the processes signal mask for the presence (or absence) of a list if signals diff --git a/frysk-top/Makefile.am b/frysk-top/Makefile.am index 6c45b4b..9f6a8c8 100644 --- a/frysk-top/Makefile.am +++ b/frysk-top/Makefile.am @@ -88,7 +88,8 @@ manpages manpages/index.html: -"GNOME Interface" \ $(srcdir)/frysk-gui/frysk/bindir/*.xml \ -"Test framework" \ - $(srcdir)/*/frysk/pkglibdir/*.xml + $(srcdir)/*/frysk/pkglibdir/*.xml \ + || (echo "Bad [not on one line] refpurpose tag found."; exit 1) mv manpages/index.new manpages/index.html # Generate JAVADOC documentation. --=-6zQn22vHucYdZe/nkscn--