docs

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

diff --git a/Makefile.in b/Makefile.in
index d51b4abfcfa859a45905f7db140e9b23c670e8a7..8e34e8a93711a1903c16f6b938311163f0e8768a 100644 (file)
--- 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 53d83e5046a7fdcdf9e02721a7640dec59315641..ac3b0117cd1e4b4257bd1d514d61bfa8cfae54ce 100644 (file)
--- 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 a436e5e6f77f8bc3e7acb9dfb139a4c52764e6ef..328d11e6658e3e8cc1fa525293d32f7f42f7e0ee 100644 (file)
--- 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 6309d5029ce1d49ca7c58116c1d2ddc8d1c483d6..97fca2125f83e205345c7d72f6cd1140523709dc 100644 (file)
--- 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 09d78035bb8d95586619ca3337d6e7770997ff2e..b49e64409255cff7074d485c3922664ff42ca342 100644 (file)
--- 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 a0bfee4e5eefe2e249ffe266a4510666ae62928e..f00fcc239609809ddce5035219ce53bbd723c3fe 100644 (file)
--- 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 8ba43a8c7f57f860bdcf9a81c1e3ea13f7474fb6..6213dc188f12860b87aa1e604fbd9d38453a5033 100644 (file)
--- 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 0f8353d68a568bc9d4fc319065c6b91fbd7a68c2..6cc4847978264a4e59223afa0c9f74aa7386ccde 100644 (file)
--- 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