r17732: after some help from Jelmer, changed builddocs.sh not to rely on

either an internet connection, or a list of xsl paths
(This used to be commit 7f3c699d0f8fc0e75b351bc851dbb9ffdc3617c4)

10 files changed, 33 insertions, 43 deletions

diff --git a/source4/lib/ldb/docs/builddocs.sh b/source4/lib/ldb/docs/builddocs.sh
index 2842a7fb68..b071f0f954 100755
--- a/source4/lib/ldb/docs/builddocs.sh
+++ b/source4/lib/ldb/docs/builddocs.sh
@@ -10,53 +10,43 @@ if ! test -x "$XSLTPROC"; then
     exit 0
 fi
 
-# list of places to look for the docbook style sheet
-manxsl=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/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
+MANXSL="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
+HTMLXSL="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"
 
 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
diff --git a/source4/lib/ldb/man/ad2oLschema.1.xml b/source4/lib/ldb/man/ad2oLschema.1.xml
index a4e304f15f..6ae8996477 100644
--- a/source4/lib/ldb/man/ad2oLschema.1.xml
+++ b/source4/lib/ldb/man/ad2oLschema.1.xml
@@ -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>
diff --git a/source4/lib/ldb/man/ldb.3.xml b/source4/lib/ldb/man/ldb.3.xml
index bf306d787c..6a3a789034 100644
--- a/source4/lib/ldb/man/ldb.3.xml
+++ b/source4/lib/ldb/man/ldb.3.xml
@@ -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>
diff --git a/source4/lib/ldb/man/ldbadd.1.xml b/source4/lib/ldb/man/ldbadd.1.xml
index 11ed847b75..7ad0f835d0 100644
--- a/source4/lib/ldb/man/ldbadd.1.xml
+++ b/source4/lib/ldb/man/ldbadd.1.xml
@@ -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>
diff --git a/source4/lib/ldb/man/ldbdel.1.xml b/source4/lib/ldb/man/ldbdel.1.xml
index 51ae18e685..7dfc7366f6 100644
--- a/source4/lib/ldb/man/ldbdel.1.xml
+++ b/source4/lib/ldb/man/ldbdel.1.xml
@@ -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>
diff --git a/source4/lib/ldb/man/ldbedit.1.xml b/source4/lib/ldb/man/ldbedit.1.xml
index 3cfcce89f1..15c69b1b25 100644
--- a/source4/lib/ldb/man/ldbedit.1.xml
+++ b/source4/lib/ldb/man/ldbedit.1.xml
@@ -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>
diff --git a/source4/lib/ldb/man/ldbmodify.1.xml b/source4/lib/ldb/man/ldbmodify.1.xml
index e936746ed7..bc19647785 100644
--- a/source4/lib/ldb/man/ldbmodify.1.xml
+++ b/source4/lib/ldb/man/ldbmodify.1.xml
@@ -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>
diff --git a/source4/lib/ldb/man/ldbrename.1.xml b/source4/lib/ldb/man/ldbrename.1.xml
index b0480ca366..391ec84ccc 100644
--- a/source4/lib/ldb/man/ldbrename.1.xml
+++ b/source4/lib/ldb/man/ldbrename.1.xml
@@ -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>
diff --git a/source4/lib/ldb/man/ldbsearch.1.xml b/source4/lib/ldb/man/ldbsearch.1.xml
index f287f3c263..ed3749b920 100644
--- a/source4/lib/ldb/man/ldbsearch.1.xml
+++ b/source4/lib/ldb/man/ldbsearch.1.xml
@@ -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>
diff --git a/source4/lib/ldb/man/oLschema2ldif.1.xml b/source4/lib/ldb/man/oLschema2ldif.1.xml
index b499da574e..b1e681be4e 100644
--- a/source4/lib/ldb/man/oLschema2ldif.1.xml
+++ b/source4/lib/ldb/man/oLschema2ldif.1.xml
@@ -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>