From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 2 Apr 2009 10:14:27 +0000 (+0000)
Subject: docs
X-Git-Tag: release-1.3.0~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5c76d0579cfbe0e5c0d02a21334457e29a68782;p=thirdparty%2Funbound.git

docs


git-svn-id: file:///svn/unbound/trunk@1577 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/Makefile.in b/Makefile.in
index d51b4abfc..8e34e8a93 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -343,8 +343,8 @@ doc:
 	if test -n "$(doxygen)"; then \
 		$(doxygen) $(srcdir)/doc/unbound.doxygen; fi
 	if test -x "`which sphinx-build 2>&1`"; then \
-		sphinx-build -b html pythonmod/doc/source doc/html/pythonmod
-		sphinx-build -b html libunbound/python/doc/source doc/html/pyunbound
+		sphinx-build -b html pythonmod/doc doc/html/pythonmod; \
+		sphinx-build -b html libunbound/python/doc doc/html/pyunbound;\
 	fi
 
 strip:
diff --git a/doc/Changelog b/doc/Changelog
index 53d83e504..ac3b0117c 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 2 April 2009: Wouter
 	- pyunbound (libunbound python plugin) compiles using libtool.
+	- documentation for pythonmod and pyunbound is generated in doc/html.
 
 1 April 2009: Wouter
 	- suppress errors when trying to contact authority servers that gave
diff --git a/doc/unbound.doxygen b/doc/unbound.doxygen
index a436e5e6f..328d11e66 100644
--- a/doc/unbound.doxygen
+++ b/doc/unbound.doxygen
@@ -495,10 +495,12 @@ EXCLUDE                = ./build \
                          util/configparser.h \
                          util/configlexer.c \
                          util/locks.h \
-			 pythonmod/Unbound.py \
+			 pythonmod/unboundmodule.py \
 			 pythonmod/interface.h \
 			 pythonmod/examples/resgen.py \
 			 pythonmod/examples/resmod.py \
+			 libunbound/python/unbound.py \
+			 libunbound/python/libunbound_wrap.c \
 			 ./ldns-src
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
diff --git a/libunbound/python/doc/conf.py b/libunbound/python/doc/conf.py
index 6309d5029..97fca2125 100644
--- a/libunbound/python/doc/conf.py
+++ b/libunbound/python/doc/conf.py
@@ -15,7 +15,9 @@ import sys, os
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__),'../../')))
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__),'../')))
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__),'../../../')))
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__),'../../../.libs/')))
 #print sys.path
 
 # General configuration
diff --git a/pythonmod/doc/examples/example1.rst b/pythonmod/doc/examples/example1.rst
index 09d78035b..b49e64409 100644
--- a/pythonmod/doc/examples/example1.rst
+++ b/pythonmod/doc/examples/example1.rst
@@ -10,7 +10,7 @@ This packet will be send to a client that asked for it.
 Complete source code
 --------------------
 
-.. literalinclude:: ../../../examples/log.py
+.. literalinclude:: ../../examples/log.py
    :language: python
 
 Testing
diff --git a/pythonmod/doc/examples/example2.rst b/pythonmod/doc/examples/example2.rst
index a0bfee4e5..f00fcc239 100644
--- a/pythonmod/doc/examples/example2.rst
+++ b/pythonmod/doc/examples/example2.rst
@@ -11,7 +11,7 @@ This example shows how to handle queries and generate response packet.
 Complete source code
 --------------------
 
-.. literalinclude:: ../../../examples/resgen.py
+.. literalinclude:: ../../examples/resgen.py
    :language: python
 
 Testing
diff --git a/pythonmod/doc/examples/example3.rst b/pythonmod/doc/examples/example3.rst
index 8ba43a8c7..6213dc188 100644
--- a/pythonmod/doc/examples/example3.rst
+++ b/pythonmod/doc/examples/example3.rst
@@ -16,7 +16,7 @@ In other cases, the validator module guarantees updating data which are produced
 Complete source code
 --------------------
 
-.. literalinclude:: ../../../examples/resmod.py
+.. literalinclude:: ../../examples/resmod.py
    :language: python
 
 Testing
diff --git a/pythonmod/doc/examples/example4.rst b/pythonmod/doc/examples/example4.rst
index 0f8353d68..6cc484797 100644
--- a/pythonmod/doc/examples/example4.rst
+++ b/pythonmod/doc/examples/example4.rst
@@ -160,5 +160,5 @@ Proof that the unbound still works as resolver.
 Complete source code
 --------------------
 
-.. literalinclude:: ../../../examples/dict.py
+.. literalinclude:: ../../examples/dict.py
    :language: python