doc: generate peering graph in conf.py

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/admin/build-doc b/admin/build-doc
index f52f17bb66842ae70e6e43612af2088e10fa7fb3..52e9086bff1881e7315f2d82579afdeab825a48f 100755 (executable)
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -48,8 +48,6 @@ fi
 # for availability of commands
 set -e
 
-cat $TOPDIR/src/osd/PeeringState.h $TOPDIR/src/osd/PeeringState.cc | $TOPDIR/doc/scripts/gen_state_diagram.py > $TOPDIR/doc/dev/peering_graph.generated.dot
-
 cd build-doc
 
 [ -z "$vdir" ] && vdir="$TOPDIR/build-doc/virtualenv"

diff --git a/doc/conf.py b/doc/conf.py
index 42b9d20bf54784fcfb5c6eefee04e195705b2626..cc6dc8db02143bf726019db6649ce6ac99592f9f 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,3 +1,4 @@
+import fileinput
 import shutil
 import sys
 import os
@@ -113,6 +114,22 @@ breathe_doxygen_config_options = {
 edit_on_github_project = 'ceph/ceph'
 edit_on_github_branch = 'master'
 
+def generate_state_diagram(input_paths, output_path):
+    sys.path.append(os.path.join(top_level, 'doc', 'scripts'))
+    from gen_state_diagram import do_filter, StateMachineRenderer
+    inputs = [os.path.join(top_level, fn) for fn in input_paths]
+    output = os.path.join(top_level, output_path)
+
+    def process(app):
+        with fileinput.input(files=inputs) as f:
+            input = do_filter(f)
+            render = StateMachineRenderer()
+            render.read_input(input)
+            with open(output, 'w') as dot_output:
+                render.emit_dot(dot_output)
+
+    return process
+
 # handles edit-on-github and old version warning display
 def setup(app):
     app.add_js_file('js/ceph.js')
@@ -120,6 +137,9 @@ def setup(app):
         # add "ditaa" as an alias of "diagram"
         from plantweb.directive import DiagramDirective
         app.add_directive('ditaa', DiagramDirective)
+    app.connect('builder-inited', generate_state_diagram(['src/osd/PeeringState.h',
+                                                          'src/osd/PeeringState.cc'],
+                                                         'doc/dev/peering_graph.generated.dot'))
 
 # mocking ceph_module offered by ceph-mgr. `ceph_module` is required by
 # mgr.mgr_module