[gnome-bluetooth: 13/14] build: Improve GtkDoc documentation generation



commit df46998feeeb77eec41e8bda6dd3fe1273fd5e37
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Fri Dec 21 12:11:20 2018 +0100

    build: Improve GtkDoc documentation generation
    
    Since gnome-bluetooth was ported to meson, version has acquired
    a new parameter called `private_headers` which replaces the
    `--ignore-headers` argument in `scan_args` parameter.
    `--rebuild-types` argument is also not necessary because a types
    does exist already.
    
    `--sgml-mode` and `--output-format=xml` parameters are also not
    necessary because meson already handles them automatically.
    
    Finally, the `version.xml` is included now explicitly as a
    content file because previously it was copied as a workaround.

 docs/reference/libgnome-bluetooth/meson.build | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/docs/reference/libgnome-bluetooth/meson.build b/docs/reference/libgnome-bluetooth/meson.build
index 728c24d7..67e030de 100644
--- a/docs/reference/libgnome-bluetooth/meson.build
+++ b/docs/reference/libgnome-bluetooth/meson.build
@@ -12,7 +12,7 @@ private_headers = [
 version_conf = configuration_data()
 version_conf.set('VERSION', gnomebt_version)
 
-configure_file(
+version_xml = configure_file(
   input: 'version.xml.in',
   output: '@BASENAME@',
   configuration: version_conf,
@@ -21,16 +21,10 @@ configure_file(
 gnome.gtkdoc(
   meson.project_name(),
   main_sgml: meson.project_name() + '-docs.sgml',
-  src_dir: top_inc,
+  src_dir: lib_inc,
   dependencies: libgnome_bluetooth_dep,
-  scan_args: [
-    '--rebuild-types',
-    '--ignore-headers=' + ' '.join(private_headers),
-  ],
-  mkdb_args: [
-    '--sgml-mode',
-    '--output-format=xml',
-  ],
+  ignore_headers: private_headers,
   gobject_typesfile: meson.project_name() + '.types',
+  content_files: version_xml,
   install: true,
 )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]