From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19937 invoked by alias); 3 Apr 2008 21:00:06 -0000 Received: (qmail 19889 invoked by uid 9112); 3 Apr 2008 21:00:06 -0000 Date: Thu, 03 Apr 2008 21:00:00 -0000 Message-ID: <20080403210006.19857.qmail@sourceware.org> From: mark@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Catch bad refpurpose tags. And fix funit-procmask.xml and funit-exit.xml. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: fcdc9da1e58960f0fe8c3308f21c765abedbc4bb X-Git-Newrev: c7c9068679a57d65feaa31102116f95bd5d56fbe Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00039.txt.bz2 The branch, master has been updated via c7c9068679a57d65feaa31102116f95bd5d56fbe (commit) from fcdc9da1e58960f0fe8c3308f21c765abedbc4bb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit c7c9068679a57d65feaa31102116f95bd5d56fbe Author: Mark Wielaard Date: Thu Apr 3 19:35:22 2008 +0200 Catch bad refpurpose tags. And fix funit-procmask.xml and funit-exit.xml. 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. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 4 ++++ frysk-common/manpages.sh | 5 ++++- frysk-core/frysk/pkglibdir/ChangeLog | 5 +++++ frysk-core/frysk/pkglibdir/funit-exit.xml | 4 ++-- frysk-sys/frysk/pkglibdir/funit-procmask.xml | 3 +-- frysk-top/ChangeLog | 4 ++++ frysk-top/Makefile.am | 3 ++- 7 files changed, 22 insertions(+), 6 deletions(-) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index 4444b75..a96c691 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,3 +1,7 @@ +2008-04-03 Mark Wielaard + + * manpages.sh: Catch bad refpurpose tags. + 2008-04-03 Andrew Cagney * version.in: Bump to 0.2.50. 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/ChangeLog b/frysk-core/frysk/pkglibdir/ChangeLog index 97d9c2c..e91c206 100644 --- a/frysk-core/frysk/pkglibdir/ChangeLog +++ b/frysk-core/frysk/pkglibdir/ChangeLog @@ -1,3 +1,8 @@ +2008-04-03 Mark Wielaard + + * funit-procmask.xml: Put refpurpose on one line by itself. + * funit-exit.xml: Likewise. + 2008-04-01 Phil Muldoon * funit-watchpoint.S: New. 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/ChangeLog b/frysk-top/ChangeLog index e8a0ad7..03cbbec 100644 --- a/frysk-top/ChangeLog +++ b/frysk-top/ChangeLog @@ -1,3 +1,7 @@ +2008-04-03 Mark Wielaard + + * Makefile.am (manpages): Check for refpurpose errors. + 2008-04-02 Andrew Cagney * Makefile.am (manpages): Make un-conditional. 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. hooks/post-receive -- frysk system monitor/debugger