From c09f6050f719e48cdd18fc405a21d74711026235 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 23 Aug 2006 00:42:33 +0000
Subject: r17729: remove the dependence on an internet connection for building
 standalone ldb by only running xsltproc if we can find a local copy of the
 required stylesheets (This used to be commit
 16be09e0d6bd2c9c21f9cf0291dabf661a9a3797)

---
 source4/lib/ldb/docs/builddocs.sh | 62 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100755 source4/lib/ldb/docs/builddocs.sh

(limited to 'source4/lib/ldb/docs/builddocs.sh')

diff --git a/source4/lib/ldb/docs/builddocs.sh b/source4/lib/ldb/docs/builddocs.sh
new file mode 100755
index 0000000000..2842a7fb68
--- /dev/null
+++ b/source4/lib/ldb/docs/builddocs.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+# build ldb docs
+# tridge@samba.org August 2006
+
+XSLTPROC="$1"
+SRCDIR="$2"
+
+if ! test -x "$XSLTPROC"; then
+    echo "xsltproc not installed"
+    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
+
+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
+	echo Processing manpage $f
+	$XSLTPROC -o "$out" "$manstyle" $f || exit 1
+    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
+	echo Processing html $f
+	$XSLTPROC -o "$out" "$htmlstyle" $f || exit 1
+    fi
+done
-- 
cgit 


From f1da198449fece2e6d586859f35e1a2f1832336f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 23 Aug 2006 01:44:22 +0000
Subject: 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)

---
 source4/lib/ldb/docs/builddocs.sh | 58 ++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

(limited to 'source4/lib/ldb/docs/builddocs.sh')

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
-- 
cgit 


From b075bb842d6665be3212ddf93d4ccb98472f341a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 24 Aug 2006 01:03:42 +0000
Subject: r17765: fix handling of old solaris /bin/sh in ldb build/test (This
 used to be commit f41d3ed4b3d76c37c9c5bfd15e9e4e27179450f0)

---
 source4/lib/ldb/docs/builddocs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/docs/builddocs.sh')

diff --git a/source4/lib/ldb/docs/builddocs.sh b/source4/lib/ldb/docs/builddocs.sh
index b071f0f954..64835c9efe 100755
--- a/source4/lib/ldb/docs/builddocs.sh
+++ b/source4/lib/ldb/docs/builddocs.sh
@@ -5,7 +5,7 @@
 XSLTPROC="$1"
 SRCDIR="$2"
 
-if ! test -x "$XSLTPROC"; then
+if [ -z "$XSLTPROC" ] || [ ! -x "$XSLTPROC" ]; then
     echo "xsltproc not installed"
     exit 0
 fi
-- 
cgit 


From 6aa376ef15d69c06fbb8a637201d61ad0267cd7a Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 6 Sep 2006 10:14:01 +0000
Subject: r18153: html/ isn't needed

metze
(This used to be commit 39dc57a50280889a56fa27638b9f56574883a487)
---
 source4/lib/ldb/docs/builddocs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/docs/builddocs.sh')

diff --git a/source4/lib/ldb/docs/builddocs.sh b/source4/lib/ldb/docs/builddocs.sh
index 64835c9efe..449dcb2681 100755
--- a/source4/lib/ldb/docs/builddocs.sh
+++ b/source4/lib/ldb/docs/builddocs.sh
@@ -13,7 +13,7 @@ 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
+mkdir -p man
 
 for f in $SRCDIR/man/*.xml; do
     base=`basename $f .xml`
-- 
cgit