svn commit: samba r17732 - in branches/SAMBA_4_0/source/lib/ldb:
docs man
tridge at samba.org
tridge at samba.org
Wed Aug 23 01:44:24 GMT 2006
Author: tridge
Date: 2006-08-23 01:44:22 +0000 (Wed, 23 Aug 2006)
New Revision: 17732
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17732
Log:
after some help from Jelmer, changed builddocs.sh not to rely on
either an internet connection, or a list of xsl paths
Modified:
branches/SAMBA_4_0/source/lib/ldb/docs/builddocs.sh
branches/SAMBA_4_0/source/lib/ldb/man/ad2oLschema.1.xml
branches/SAMBA_4_0/source/lib/ldb/man/ldb.3.xml
branches/SAMBA_4_0/source/lib/ldb/man/ldbadd.1.xml
branches/SAMBA_4_0/source/lib/ldb/man/ldbdel.1.xml
branches/SAMBA_4_0/source/lib/ldb/man/ldbedit.1.xml
branches/SAMBA_4_0/source/lib/ldb/man/ldbmodify.1.xml
branches/SAMBA_4_0/source/lib/ldb/man/ldbrename.1.xml
branches/SAMBA_4_0/source/lib/ldb/man/ldbsearch.1.xml
branches/SAMBA_4_0/source/lib/ldb/man/oLschema2ldif.1.xml
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/docs/builddocs.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/docs/builddocs.sh 2006-08-23 01:13:40 UTC (rev 17731)
+++ branches/SAMBA_4_0/source/lib/ldb/docs/builddocs.sh 2006-08-23 01:44:22 UTC (rev 17732)
@@ -10,53 +10,43 @@
exit 0
fi
-# list of places to look for the docbook style sheet
-manxsl=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
+MANXSL="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
+HTMLXSL="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"
-# list of places to look for the html style sheet
-htmlxsl=/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl
-
-manstyle=""
-htmlstyle=""
-
-for f in $manxsl; do
- if [ -r "$f" ]; then
- manstyle="$f"
- fi
-done
-
-if [ -z "$manstyle" ]; then
- echo "manpages/docbook.xsl not found on system"
- exit 0
-fi
-
-for f in $htmlxsl; do
- if [ -r "$f" ]; then
- htmlstyle="$f"
- fi
-done
-
-if [ -z "$htmlstyle" ]; then
- echo "html/docbook.xsl not found on system"
- exit 0
-fi
-
mkdir -p man html
for f in $SRCDIR/man/*.xml; do
base=`basename $f .xml`
out=man/"`basename $base`"
- if [ ! -f "$out" ] || [ "$base" -nt "$out" ]; then
+ if [ ! -f "$out" ] || [ "$f" -nt "$out" ]; then
echo Processing manpage $f
- $XSLTPROC -o "$out" "$manstyle" $f || exit 1
+ $XSLTPROC --nonet -o "$out" "$MANXSL" $f
+ ret=$?
+ if [ "$ret" = "4" ]; then
+ echo "ignoring stylesheet error 4 for $MANXSL"
+ exit 0
+ fi
+ if [ "$ret" != "0" ]; then
+ echo "xsltproc failed with error $ret"
+ exit $ret
+ fi
fi
done
for f in $SRCDIR/man/*.xml; do
base=`basename $f .xml`
out=man/"`basename $base`".html
- if [ ! -f "$out" ] || [ "$base" -nt "$out" ]; then
+ if [ ! -f "$out" ] || [ "$f" -nt "$out" ]; then
echo Processing html $f
- $XSLTPROC -o "$out" "$htmlstyle" $f || exit 1
+ $XSLTPROC --nonet -o "$out" "$HTMLXSL" $f
+ ret=$?
+ if [ "$ret" = "4" ]; then
+ echo "ignoring stylesheet error 4 for $HTMLXSL"
+ exit 0
+ fi
+ if [ "$ret" != "0" ]; then
+ echo "xsltproc failed with error $ret"
+ exit $ret
+ fi
fi
done
Modified: branches/SAMBA_4_0/source/lib/ldb/man/ad2oLschema.1.xml
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/man/ad2oLschema.1.xml 2006-08-23 01:13:40 UTC (rev 17731)
+++ branches/SAMBA_4_0/source/lib/ldb/man/ad2oLschema.1.xml 2006-08-23 01:44:22 UTC (rev 17732)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="ad2oLschema.1">
<refmeta>
Modified: branches/SAMBA_4_0/source/lib/ldb/man/ldb.3.xml
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/man/ldb.3.xml 2006-08-23 01:13:40 UTC (rev 17731)
+++ branches/SAMBA_4_0/source/lib/ldb/man/ldb.3.xml 2006-08-23 01:44:22 UTC (rev 17732)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="ldb.3">
<refmeta>
Modified: branches/SAMBA_4_0/source/lib/ldb/man/ldbadd.1.xml
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/man/ldbadd.1.xml 2006-08-23 01:13:40 UTC (rev 17731)
+++ branches/SAMBA_4_0/source/lib/ldb/man/ldbadd.1.xml 2006-08-23 01:44:22 UTC (rev 17732)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="ldbadd.1">
<refmeta>
Modified: branches/SAMBA_4_0/source/lib/ldb/man/ldbdel.1.xml
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/man/ldbdel.1.xml 2006-08-23 01:13:40 UTC (rev 17731)
+++ branches/SAMBA_4_0/source/lib/ldb/man/ldbdel.1.xml 2006-08-23 01:44:22 UTC (rev 17732)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="ldbdel.1">
<refmeta>
Modified: branches/SAMBA_4_0/source/lib/ldb/man/ldbedit.1.xml
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/man/ldbedit.1.xml 2006-08-23 01:13:40 UTC (rev 17731)
+++ branches/SAMBA_4_0/source/lib/ldb/man/ldbedit.1.xml 2006-08-23 01:44:22 UTC (rev 17732)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="ldbedit.1">
<refmeta>
Modified: branches/SAMBA_4_0/source/lib/ldb/man/ldbmodify.1.xml
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/man/ldbmodify.1.xml 2006-08-23 01:13:40 UTC (rev 17731)
+++ branches/SAMBA_4_0/source/lib/ldb/man/ldbmodify.1.xml 2006-08-23 01:44:22 UTC (rev 17732)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="ldbmodify.1">
<refmeta>
Modified: branches/SAMBA_4_0/source/lib/ldb/man/ldbrename.1.xml
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/man/ldbrename.1.xml 2006-08-23 01:13:40 UTC (rev 17731)
+++ branches/SAMBA_4_0/source/lib/ldb/man/ldbrename.1.xml 2006-08-23 01:44:22 UTC (rev 17732)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="ldbrename.1">
<refmeta>
Modified: branches/SAMBA_4_0/source/lib/ldb/man/ldbsearch.1.xml
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/man/ldbsearch.1.xml 2006-08-23 01:13:40 UTC (rev 17731)
+++ branches/SAMBA_4_0/source/lib/ldb/man/ldbsearch.1.xml 2006-08-23 01:44:22 UTC (rev 17732)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="ldbsearch.1">
<refmeta>
Modified: branches/SAMBA_4_0/source/lib/ldb/man/oLschema2ldif.1.xml
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/man/oLschema2ldif.1.xml 2006-08-23 01:13:40 UTC (rev 17731)
+++ branches/SAMBA_4_0/source/lib/ldb/man/oLschema2ldif.1.xml 2006-08-23 01:44:22 UTC (rev 17732)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="oLschema2ldif.1">
<refmeta>
More information about the samba-cvs
mailing list