Update gendoc tool for the new documentation structure.

3 files changed, 18 insertions, 32 deletions

diff --git a/tools/gendoc/doc/index.rst b/tools/gendoc/doc/index.rst
index fb3ade0..fe6d543 100644
--- a/tools/gendoc/doc/index.rst
+++ b/tools/gendoc/doc/index.rst
@@ -19,14 +19,16 @@ Table of Content
 
    install
    config
-   clones/openlmi-providers/src/account/doc/source/index
-   clones/openlmi-providers/src/hardware/doc/source/index
-   clones/openlmi-providers/src/journald/doc/source/index
-   clones/openlmi-providers/src/logicalfile/doc/source/index
-   clones/openlmi-providers/src/realdm/doc/source/index
-   clones/openlmi-providers/src/service-dbus/doc/source/index
-   clones/openlmi-providers/src/software/doc/admin/index
-   clones/openlmi-networking/build/doc/admin/index
+   clones/openlmi-providers/doc/admin/account/index
+   clones/openlmi-providers/doc/admin/fan/index
+   clones/openlmi-providers/doc/admin/hardware/index
+   clones/openlmi-providers/doc/admin/journald/index
+   clones/openlmi-providers/doc/admin/logicalfile/index
+   clones/openlmi-providers/doc/admin/power/index
+   clones/openlmi-providers/doc/admin/realdm/index
+   clones/openlmi-providers/doc/admin/service-dbus/index
+   clones/openlmi-providers/doc/admin/software/index
+   clones/openlmi-networking/doc/admin/index
    clones/openlmi-storage/doc/admin/index
 
 OpenLMI Classes:
diff --git a/tools/gendoc/gendoc b/tools/gendoc/gendoc
index 68dfa7b..436407a 100755
--- a/tools/gendoc/gendoc
+++ b/tools/gendoc/gendoc
@@ -8,7 +8,7 @@ fi
 MOCK=$1
 shift
 
-mock -r $MOCK --install plantuml konkretcmpi-devel openlmi-providers-devel git dia python-sphinx cim-schema cmake sblim-cmpi-devel glib2-devel check-devel NetworkManager-devel libuuid-devel dbus-glib-devel python-sphinx-theme-openlmi graphviz
+mock -r $MOCK --install plantuml konkretcmpi-devel openlmi-providers-devel git dia python-sphinx cim-schema cmake sblim-cmpi-devel glib2-devel check-devel NetworkManager-devel libuuid-devel dbus-glib-devel python-sphinx-theme-openlmi graphviz systemd-devel pciutils-devel upower-devel libuser-devel
 mock -r $MOCK --shell "rm -rf /builddir/doc/ /builddir/gendoc-mock-inside"
 mock -r $MOCK --copyin gendoc-mock-inside /builddir || exit 1
 mock -r $MOCK --copyin doc /builddir/doc || exit 1
diff --git a/tools/gendoc/gendoc-mock-inside b/tools/gendoc/gendoc-mock-inside
index b2e7ce2..8f70681 100755
--- a/tools/gendoc/gendoc-mock-inside
+++ b/tools/gendoc/gendoc-mock-inside
@@ -37,29 +37,17 @@ cp -r _build/html/* $OUT/openlmi-storage/$3/
 rm -rf mof/*.rst
 popd
 
-for d in account hardware logicalfile realmd service-dbus; do
-    pushd clones/openlmi-providers/src/$d/doc/
-    make html || exit 1
+pushd clones/openlmi-providers/
+mkdir build || exit 1
+cd build || exit 1
+cmake .. || exit 1
+make doc || exit 1
+for d in account fan hardware journald logicalfile power realmd service-dbus software; do
     mkdir -p $OUT/openlmi-providers/$1/$d
-    cp -r build/html/* $OUT/openlmi-providers/$1/$d/
-    # prepare the directory for inclusion in overall documentation
-    # we don't want class documentation here, there will be one
-    # on the top level
-    rm -rf source/mof/*.rst
-    popd
+    cp -r doc/admin/$d/html/* $OUT/openlmi-providers/$1/$d/
 done
-
-pushd clones/openlmi-providers/src/software/doc/admin
-make html || exit 1
-mkdir -p $OUT/openlmi-providers/$1/software
-cp -r _build/html/* $OUT/openlmi-providers/$1/software
-# prepare the directory for inclusion in overall documentation
-# we don't want class documentation here, there will be one
-# on the top level
-rm -rf mof/*.rst
 popd
 
-
 pushd clones/openlmi-networking
 mkdir build || exit 1
 cd build || exit 1
@@ -67,10 +55,6 @@ cmake .. || exit 1
 make doc || exit 1
 mkdir -p $OUT/openlmi-networking/$2
 cp -r doc/admin/html/* $OUT/openlmi-networking/$2/
-# prepare the directory for inclusion in overall documentation
-# we don't want class documentation here, there will be one
-# on the top level
-rm -rf doc/admin/mof/*.rst
 popd
 
 # Update project versions in RST files