public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Use sed grep for multiline refpurpose tags.
@ 2008-04-04  8:31 mark
  0 siblings, 0 replies; only message in thread
From: mark @ 2008-04-04  8:31 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  64375b7902ee26d196612782462de03dba6175c7 (commit)
      from  73baf44bbc8df85147fc09136607a327e2c9eeb3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 64375b7902ee26d196612782462de03dba6175c7
Author: Mark Wielaard <mwielaard@redhat.com>
Date:   Fri Apr 4 10:28:04 2008 +0200

    Use sed grep for multiline refpurpose tags.
    
    frysk-common/ChangeLog
    2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
    	    Petr Machata <pmachata@redhat.com>
    
    	* frysk.xml: Split refpurpose tag over multiple lines.
    	* manpages.sh (refpurposegrep): New.
    	(suffix): Use refpurposegrep.
    
    frysk-core/frysk/bindir/ChangeLog
    2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
    
    	* fdebuginfo.xml: Put refpurpose tag on multiple lines.
    	* fexe.xml: Likewise.
    	* fmaps.xml: Likewise.
    
    frysk-core/frysk/pkglibdir/ChangeLog
    2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
    
    	* funit-exit.xml: Put refpurpose tag on multiple lines.
    	* fparser.xml: Likewise.
    
    frysk-sys/frysk/pkglibdir/ChangeLog
    2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
    
    	* funit-procmask.xml: Put refpurpose tag on multiple lines.
    
    frysk-top/ChangeLog
    2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
    
    	* Makefile.am (manpages): Clarify error message.

-----------------------------------------------------------------------

Summary of changes:
 frysk-common/ChangeLog                       |    7 +++++++
 frysk-common/frysk.xml                       |    3 ++-
 frysk-common/manpages.sh                     |   20 +++++++++++++++++++-
 frysk-core/frysk/bindir/ChangeLog            |    6 ++++++
 frysk-core/frysk/bindir/fdebuginfo.xml       |    3 ++-
 frysk-core/frysk/bindir/ferror.xml           |    3 ++-
 frysk-core/frysk/bindir/fmaps.xml            |    5 ++---
 frysk-core/frysk/pkglibdir/ChangeLog         |    5 +++++
 frysk-core/frysk/pkglibdir/fparser.xml       |    3 ++-
 frysk-core/frysk/pkglibdir/funit-exit.xml    |    3 ++-
 frysk-sys/frysk/pkglibdir/ChangeLog          |    4 ++++
 frysk-sys/frysk/pkglibdir/funit-procmask.xml |    3 ++-
 frysk-top/ChangeLog                          |    4 ++++
 frysk-top/Makefile.am                        |    2 +-
 14 files changed, 60 insertions(+), 11 deletions(-)

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index a96c691..11ae984 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
+	    Petr Machata <pmachata@redhat.com>
+
+	* frysk.xml: Split refpurpose tag over multiple lines.
+	* manpages.sh (refpurposegrep): New.
+	(suffix): Use refpurposegrep.
+
 2008-04-03  Mark Wielaard  <mwielaard@redhat.com>
 
 	* manpages.sh: Catch bad refpurpose tags.
diff --git a/frysk-common/frysk.xml b/frysk-common/frysk.xml
index 404b014..8991af9 100644
--- a/frysk-common/frysk.xml
+++ b/frysk-common/frysk.xml
@@ -62,7 +62,8 @@
 
   <refnamediv>
     <refname>frysk</refname>
-    <refpurpose>The Frysk Debugging, Tracing, and Monitoring Tool Suite</refpurpose>
+    <refpurpose>The Frysk Debugging, Tracing, and Monitoring
+                Tool Suite</refpurpose>
   </refnamediv>
   
   <refsect1>
diff --git a/frysk-common/manpages.sh b/frysk-common/manpages.sh
index ac0c0b6..c41513a 100755
--- a/frysk-common/manpages.sh
+++ b/frysk-common/manpages.sh
@@ -57,6 +57,24 @@ sed -n < ${template} \
 
 # Generate the body for the man pages.
 
+refpurposegrep=$(cat << EOF
+/<refpurpose>/{
+ :loop
+   /<\/refpurpose>/b break
+   N
+   b loop
+
+ :break
+   s,^.*<refpurpose>,,
+   s,</refpurpose>.*$,,
+   s,\(^[[:space:]]*\|[[:space:]]*$\),,g
+   s,[[:space:]]\+, ,g
+   p
+   q
+}
+EOF
+)
+
 suffix=
 for xmlfile in "$@" ; do
     if expr x"${xmlfile}" : "x-" > /dev/null ; then
@@ -84,7 +102,7 @@ EOF
 <li><tt><a href="${name}.${n}.html">${name}.${n}</a></tt>
 EOF
 	# Catch empty (aka not on one line) refpurpose tags.
-	desc=$(sed -n 's/<refpurpose>\(.*\)<\/refpurpose>/\1/ p' $xmlfile)
+	desc=$(sed -n "$refpurposegrep" $xmlfile)
 	if test -z "$desc"; then exit 1; fi
 	echo "$desc"
 	echo "</li>"
diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog
index 0e69cc8..adb3027 100644
--- a/frysk-core/frysk/bindir/ChangeLog
+++ b/frysk-core/frysk/bindir/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
+
+	* fdebuginfo.xml: Put refpurpose tag on multiple lines.
+	* fexe.xml: Likewise.
+	* fmaps.xml: Likewise.
+
 2008-04-03  Mark Wielaard  <mwielaard@redhat.com>
 
 	* fdebuginfo.xml: Put refpurpose on one line.
diff --git a/frysk-core/frysk/bindir/fdebuginfo.xml b/frysk-core/frysk/bindir/fdebuginfo.xml
index 3798c06..8f88f0b 100644
--- a/frysk-core/frysk/bindir/fdebuginfo.xml
+++ b/frysk-core/frysk/bindir/fdebuginfo.xml
@@ -70,7 +70,8 @@
 
   <refnamediv>
     <refname>fdebuginfo</refname>
-    <refpurpose>display the debug-info paths for a process and its shared modules</refpurpose>
+    <refpurpose>display the debug-info paths for a process
+                and its shared modules</refpurpose>
   </refnamediv>
   
   <refsynopsisdiv>
diff --git a/frysk-core/frysk/bindir/ferror.xml b/frysk-core/frysk/bindir/ferror.xml
index 6d4bc90..b8742b6 100644
--- a/frysk-core/frysk/bindir/ferror.xml
+++ b/frysk-core/frysk/bindir/ferror.xml
@@ -70,7 +70,8 @@
 
   <refnamediv>
     <refname>ferror</refname>
-    <refpurpose>print a stack trace when the given message is printed by the traced program</refpurpose>
+    <refpurpose>print a stack trace when the given message is printed
+                by the traced program</refpurpose>
   </refnamediv>
   
   <refsynopsisdiv>
diff --git a/frysk-core/frysk/bindir/fmaps.xml b/frysk-core/frysk/bindir/fmaps.xml
index 692967e..de7a3dd 100644
--- a/frysk-core/frysk/bindir/fmaps.xml
+++ b/frysk-core/frysk/bindir/fmaps.xml
@@ -69,9 +69,8 @@
   </refmeta>
 
   <refnamediv>
-    <refname>fmaps</refname>
-    <refpurpose>print the process or a corefile's address maps.</refpurpose>
-  </refnamediv>
+    <refname>fmaps</refname><refpurpose>print the process or a corefile's
+                                        address maps</refpurpose></refnamediv>
   
   <refsynopsisdiv>
     <cmdsynopsis>
diff --git a/frysk-core/frysk/pkglibdir/ChangeLog b/frysk-core/frysk/pkglibdir/ChangeLog
index e91c206..4a28cf2 100644
--- a/frysk-core/frysk/pkglibdir/ChangeLog
+++ b/frysk-core/frysk/pkglibdir/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
+
+	* funit-exit.xml: Put refpurpose tag on multiple lines.
+	* fparser.xml: Likewise.
+
 2008-04-03  Mark Wielaard  <mwielaard@redhat.com>
 
 	* funit-procmask.xml: Put refpurpose on one line by itself.
diff --git a/frysk-core/frysk/pkglibdir/fparser.xml b/frysk-core/frysk/pkglibdir/fparser.xml
index 3635e45..352e330 100644
--- a/frysk-core/frysk/pkglibdir/fparser.xml
+++ b/frysk-core/frysk/pkglibdir/fparser.xml
@@ -62,7 +62,8 @@
 
   <refnamediv>
     <refname>fparser</refname>
-    <refpurpose>Runs the frysk standalone source code parser utility.</refpurpose>
+    <refpurpose>runs the frysk standalone source code parser
+                utility</refpurpose>
   </refnamediv>
   
   <refsynopsisdiv>
diff --git a/frysk-core/frysk/pkglibdir/funit-exit.xml b/frysk-core/frysk/pkglibdir/funit-exit.xml
index d420b15..513ab11 100644
--- a/frysk-core/frysk/pkglibdir/funit-exit.xml
+++ b/frysk-core/frysk/pkglibdir/funit-exit.xml
@@ -62,7 +62,8 @@
 
   <refnamediv>
     <refname>funit-exit</refname>
-    <refpurpose>exits with specified status, or terminates with the specified signal</refpurpose>
+    <refpurpose>exits with specified status,
+                or terminates with the specified signal</refpurpose>
   </refnamediv>
   
   <refsynopsisdiv>
diff --git a/frysk-sys/frysk/pkglibdir/ChangeLog b/frysk-sys/frysk/pkglibdir/ChangeLog
index b96dad4..7293980 100644
--- a/frysk-sys/frysk/pkglibdir/ChangeLog
+++ b/frysk-sys/frysk/pkglibdir/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
+
+	* funit-procmask.xml: Put refpurpose tag on multiple lines.
+
 2008-03-14  Andrew Cagney  <cagney@redhat.com>
 
 	* fsystest.xml: Cite frysk(7), update url.
diff --git a/frysk-sys/frysk/pkglibdir/funit-procmask.xml b/frysk-sys/frysk/pkglibdir/funit-procmask.xml
index add4d7b..9e82450 100644
--- a/frysk-sys/frysk/pkglibdir/funit-procmask.xml
+++ b/frysk-sys/frysk/pkglibdir/funit-procmask.xml
@@ -62,7 +62,8 @@
 
   <refnamediv>
     <refname>funit-procmask</refname>
-    <refpurpose>Test the processes signal mask for the presence (or absence) of a list if signals</refpurpose>
+    <refpurpose>test the processes signal mask for the presence
+                (or absence) of a list if signals</refpurpose>
   </refnamediv>
   
   <refsynopsisdiv>
diff --git a/frysk-top/ChangeLog b/frysk-top/ChangeLog
index 03cbbec..af2ab19 100644
--- a/frysk-top/ChangeLog
+++ b/frysk-top/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-04  Mark Wielaard  <mwielaard@redhat.com>
+
+	* Makefile.am (manpages): Clarify error message.
+
 2008-04-03  Mark Wielaard  <mwielaard@redhat.com>
 
 	* Makefile.am (manpages): Check for refpurpose errors.
diff --git a/frysk-top/Makefile.am b/frysk-top/Makefile.am
index 9f6a8c8..5a95c67 100644
--- a/frysk-top/Makefile.am
+++ b/frysk-top/Makefile.am
@@ -89,7 +89,7 @@ manpages manpages/index.html:
 		$(srcdir)/frysk-gui/frysk/bindir/*.xml \
 		-"Test framework" \
 		$(srcdir)/*/frysk/pkglibdir/*.xml \
-	    || (echo "Bad [not on one line] refpurpose tag found."; exit 1)
+	    || (echo "Bad xml file or no refpurpose tag found."; exit 1)
 	mv manpages/index.new manpages/index.html
 \f
 # Generate JAVADOC documentation.


hooks/post-receive
--
frysk system monitor/debugger


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-04-04  8:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-04-04  8:31 [SCM] master: Use sed grep for multiline refpurpose tags mark

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).