[libcloudproviders: 6/8] general: Lay out the basics for documentation generation

[Gitlab System User <gitlab src gnome org>]

commit 4b26247cac658a0a011d60538e7f91e98334f883
Author: Carlos Soriano <csoriano gnome org>
Date:   Wed Aug 30 17:43:36 2017 +0200

    general: Lay out the basics for documentation generation

 docs/reference/libcloudproviders-docs.xml | 14 ++------------
 docs/reference/meson.build                | 16 ++++++++++++----
 meson.build                               |  2 +-
 src/meson.build                           | 16 ++++++++--------
 4 files changed, 23 insertions(+), 25 deletions(-)
---
diff --git a/docs/reference/libcloudproviders-docs.xml b/docs/reference/libcloudproviders-docs.xml
index e252ecc..75aba09 100644
--- a/docs/reference/libcloudproviders-docs.xml
+++ b/docs/reference/libcloudproviders-docs.xml
@@ -34,20 +34,8 @@
       </para>
     </partintro>
     <xi:include href="xml/cloudprovider.xml"/>
-    <xi:include href="xml/cloudprovider-generated.xml"/>
     <xi:include href="xml/cloudproviders.xml"/>
     <xi:include href="xml/cloudprovidermanager.xml"/>
-    <xi:include href="xml/cloudproviderproxy.xml"/>
-  </reference>
-
-  <reference id="cloudproviderd">
-    <title>cloudproviderd daemon</title>
-    <partintro>
-      <para>
-        This part documents libcloudproviders libs.
-      </para>
-    </partintro>
-    <xi:include href="xml/cloudproviderd.xml" />
   </reference>
 
   <reference id="cloudproviders-dbus">
@@ -56,6 +44,8 @@
       <para>
       </para>
     </partintro>
+    <xi:include href="generated-docs-org.freedesktop.CloudProvider.Account1.xml"/>
+    <xi:include href="generated-docs-org.freedesktop.CloudProvider.Manager1.xml"/>
   </reference>
 
 </book>
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index c0860c5..8b3001c 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,11 +1,19 @@
 cdata = configuration_data()
-cdata.set('VERSION', meson.get_version())
+cdata.set('VERSION', meson.project_version())
 configure_file(input: 'version.xml.in',
                output: 'version.xml',
                configuration: cdata)
 
+codegen = find_program('gdbus-codegen')
+message('Generating DBUS docs…')
+run_command('gdbus-codegen', '--generate-docbook', 'generated-docs',
+            join_paths(meson.source_root(), 'data/cloudprovider-dbus.xml'),
+            join_paths(meson.source_root(), 'data/cloudprovidermanager-dbus.xml'),
+            '--output-directory', join_paths(meson.source_root(), 'docs/reference'))
+
 gnome.gtkdoc('libcloudproviders',
-             src_dir: inc,
-             main_xml: meson.source_root (),
-             content_files: [join_paths(meson.data_dir(), '/cloudprovidermanager-dbus.xml')],
+             src_dir: join_paths (meson.source_root(), 'src'),
+             main_xml: 'libcloudproviders-docs.xml',
+             content_files: ['generated-docs-org.freedesktop.CloudProvider.Account1.xml',
+                             'generated-docs-org.freedesktop.CloudProvider.Manager1.xml'],
              install : true)
diff --git a/meson.build b/meson.build
index ce5050a..a7f142a 100644
--- a/meson.build
+++ b/meson.build
@@ -25,4 +25,4 @@ conf.set_quoted ('GETTEXT_PACKAGE', 'cloudproviders')
 
 subdir ('src')
 subdir ('test')
-subdir ('docs')
+subdir ('docs/reference')
diff --git a/src/meson.build b/src/meson.build
index b66bcee..0c66384 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -16,14 +16,14 @@ libcloudproviders_deps = [glib, gio, gio_unix]
 
 generated_sources = []
 generated_sources += gnome.gdbus_codegen ('cloudprovider-generated',
-                                      join_paths (meson.source_root (), 'data', 'cloudprovider-dbus.xml'),
-                                      interface_prefix: 'org.freedesktop.CloudProvider',
-                                      namespace: 'CloudProvider',
-                                      object_manager: true)
+                                          join_paths (meson.source_root (), 'data', 
'cloudprovider-dbus.xml'),
+                                          interface_prefix: 'org.freedesktop.CloudProvider',
+                                          namespace: 'CloudProvider',
+                                          object_manager: true)
 generated_sources += gnome.gdbus_codegen ('cloudprovidermanager-generated',
-                                      join_paths (meson.source_root (), 'data', 
'cloudprovidermanager-dbus.xml'),
-                                      interface_prefix: 'org.freedesktop.CloudProvider',
-                                      namespace: 'CloudProvider')
+                                          join_paths (meson.source_root (), 'data', 
'cloudprovidermanager-dbus.xml'),
+                                          interface_prefix: 'org.freedesktop.CloudProvider',
+                                          namespace: 'CloudProvider')
 
 libcloudproviders_sources += generated_sources
 
@@ -33,7 +33,7 @@ libcloudproviders = shared_library ('cloudproviders',
                                     version: meson.project_version (),
                                     install: true)
 
-install_headers ( libcloudproviders_headers, subdir: 'cloudproviders')
+install_headers (libcloudproviders_headers, subdir: 'cloudproviders')
 
 pkg = import('pkgconfig')
 pkg.generate(libraries : libcloudproviders,