[netfilter-cvslog] r3328 - in trunk/nfsim: . doc
rusty at netfilter.org
rusty at netfilter.org
Mon Dec 13 03:30:03 CET 2004
Author: rusty at netfilter.org
Date: 2004-12-13 03:30:03 +0100 (Mon, 13 Dec 2004)
New Revision: 3328
Modified:
trunk/nfsim/Makefile.in
trunk/nfsim/configure
trunk/nfsim/doc/create-links
trunk/nfsim/doc/gen-help
Log:
Stumble through when no docbook support.
Modified: trunk/nfsim/Makefile.in
===================================================================
--- trunk/nfsim/Makefile.in 2004-12-13 01:47:43 UTC (rev 3327)
+++ trunk/nfsim/Makefile.in 2004-12-13 02:30:03 UTC (rev 3328)
@@ -52,6 +52,7 @@
ln -sf core/fakesockopt.so.1.0 ./
docs:
+ @[ -f doc/link-dtd ] || (echo "No docbook installation: see README"; exit 1)
cd doc && $(MAKE) $@
gcov:
Modified: trunk/nfsim/configure
===================================================================
--- trunk/nfsim/configure 2004-12-13 01:47:43 UTC (rev 3327)
+++ trunk/nfsim/configure 2004-12-13 02:30:03 UTC (rev 3328)
@@ -55,5 +55,4 @@
echo Creating documentation links.
cd doc && ./create-links
-
echo Done.
Modified: trunk/nfsim/doc/create-links
===================================================================
--- trunk/nfsim/doc/create-links 2004-12-13 01:47:43 UTC (rev 3327)
+++ trunk/nfsim/doc/create-links 2004-12-13 02:30:03 UTC (rev 3328)
@@ -28,26 +28,13 @@
if [ -z "$dir" ]
then
- cat <<EOF >&2
-Your system does not appear to have the appropriate docbook components
-installed: couldn't find file $file under the directories:
-
-${dirs// /
-}
-
-If it is installed elsewhere, simply create a symlink from $link to the
-directory containing this file. Otherwise install the appropriate docbook
-stylesheet and/or dtd packages. They'll be called something like
-
-Redhat: docbook-style-xsl and docbook-dtds
-Debian: docbook-xsl and dockbook-xml xsltproc
-EOF
+ echo Docbook support not found. See README. Faking it. >&2
exit 1
else
- ln -s "$dir" "$link"
+ ln -sfn "$dir" "$link"
fi
}
-[ -L link-xhtml ] || condlink "xhtml/docbook.xsl" "$XSLDIRS" "link-xhtml"
-[ -L link-dtd ] || condlink "docbookx.dtd" "$DTDDIRS" "link-dtd"
+condlink "xhtml/docbook.xsl" "$XSLDIRS" "link-xhtml"
+condlink "docbookx.dtd" "$DTDDIRS" "link-dtd"
Modified: trunk/nfsim/doc/gen-help
===================================================================
--- trunk/nfsim/doc/gen-help 2004-12-13 01:47:43 UTC (rev 3327)
+++ trunk/nfsim/doc/gen-help 2004-12-13 02:30:03 UTC (rev 3328)
@@ -8,25 +8,40 @@
STARTLINE=1
for LINE in `fgrep -n '/*** XML Help:' < $FILE | cut -d: -f1`; do
- echo '<?xml version="1.0"?>' > $TMPF
- echo '<!DOCTYPE article PUBLIC "-//OASIS//DTD Docbook XML V4.1.2//EN"' >> $TMPF
- echo '"'`pwd`'/doc/link-dtd/docbookx.dtd">' >> $TMPF
- echo '<article><section>' >> $TMPF
- doc/extract-help $FILE $LINE >> $TMPF
- echo '</section></article>' >> $TMPF
+ if [ -L doc/link-dtd ]; then
+ echo '<?xml version="1.0"?>' > $TMPF
+ echo '<!DOCTYPE article PUBLIC "-//OASIS//DTD Docbook XML V4.1.2//EN"' >> $TMPF
+ echo '"'`pwd`'/doc/link-dtd/docbookx.dtd">' >> $TMPF
+ echo '<article><section>' >> $TMPF
+ doc/extract-help $FILE $LINE >> $TMPF
+ echo '</section></article>' >> $TMPF
- tr '\n' ' ' < $TMPF | sed -e 's/[[:space:]]\{2,\}/ /g' |
+ tr '\n' ' ' < $TMPF | sed -e 's/[[:space:]]\{2,\}/ /g' |
xsltproc doc/text.xsl - | fold -w80 -s > $TMPF.txt
- COMMAND=`sed -n 's,.*<command>[ ]*\([^ ]*\)[ ]*</command>.*,\1,p' < $TMPF | head -1`
- COMMAND_FILE=`basename $FILE .c`-help:$COMMAND
- echo Creating $COMMAND_FILE
- # Output description, in quotes.
- echo 'nfsim_log(LOG_ALWAYS,' > $COMMAND_FILE
+
+ COMMAND=`sed -n 's,.*<command>[ ]*\([^ ]*\)[ ]*</command>.*,\1,p' < $TMPF | head -1`
+ COMMAND_FILE=`basename $FILE .c`-help:$COMMAND
+ echo Creating $COMMAND_FILE
+
+ # Output description, in quotes.
+ echo 'nfsim_log(LOG_ALWAYS,' > $COMMAND_FILE
- TXTSTART=`grep -n '^ 1\.1\.' $TMPF.txt | cut -d: -f1`
- tail +`expr $TXTSTART + 2` $TMPF.txt | while read -r TXTLINE; do
- echo "$TXTLINE" | sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$/\\n"/' >> $COMMAND_FILE
- done
- echo ');' >> $COMMAND_FILE
+ TXTSTART=`grep -n '^ 1\.1\.' $TMPF.txt | cut -d: -f1`
+ tail +`expr $TXTSTART + 2` $TMPF.txt | while read -r TXTLINE; do
+ echo "$TXTLINE" | sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$/\\n"/' >> $COMMAND_FILE
+ done
+ echo ');' >> $COMMAND_FILE
+ else
+ doc/extract-help $FILE $LINE > $TMPF
+
+ COMMAND=`sed -n 's,.*<command>[ ]*\([^ ]*\)[ ]*</command>.*,\1,p' < $TMPF | head -1`
+ COMMAND_FILE=`basename $FILE .c`-help:$COMMAND
+ echo Faking up $COMMAND_FILE
+
+ echo 'nfsim_log(LOG_ALWAYS,' > $COMMAND_FILE
+ sed 's/<arg [^>]*>/ /;s/<[^>]*>//g' < $TMPF | sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$/\\n"/' >> $COMMAND_FILE
+ echo ');' >> $COMMAND_FILE
+ fi
+
STARTLINE=$LINE
done
More information about the netfilter-cvslog
mailing list