[libgweather] build: Update the gtkdoc() invocation



commit 59403efc541bd3e48452de0fc1344ae2e27678e2
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Nov 27 17:36:37 2017 +0000

    build: Update the gtkdoc() invocation
    
    The gnome.gtkdoc() declaration is slightly smarter, these days, and can
    figure out the location of most files, and pass the appropriate
    arguments to the various stages of the gtk-doc build.

 doc/meson.build |   42 +++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 11 deletions(-)
---
diff --git a/doc/meson.build b/doc/meson.build
index 455ae1e..38c9f5f 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -3,15 +3,35 @@ version_conf = configuration_data()
 version_conf.set('LIBGWEATHER_VERSION', meson.project_version())
 configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
 
+glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
+glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
+
+gtk_prefix = dependency('gtk+-3.0').get_pkgconfig_variable('prefix')
+gtk_docpath = join_paths(gtk_prefix, 'share', 'gtk-doc', 'html')
+
+docpath = join_paths(datadir, 'gtk-doc', 'html')
+
 gnome.gtkdoc('libgweather',
-             main_xml: 'libgweather-docs.xml',
-             dependencies: libgweather_dep,
-             gobject_typesfile: join_paths(meson.current_source_dir(), 'libgweather.types'),
-             ignore_headers: ['gweather-enum-types.h',
-                              'gweather-parser.h',
-                              'gweather-private.h'],
-             install: true,
-             mkdb_args: ['--xml-mode', '--output-format=xml'],
-             scan_args: ['--deprecated-guards="GWEATHER_DISABLE_DEPRECATED"'],
-             src_dir: [join_paths(meson.source_root(), 'libgweather'),
-                       join_paths(meson.build_root(), 'libgweather')])
+  main_xml: 'libgweather-docs.xml',
+  src_dir: ['libgweather'],
+  dependencies: libgweather_dep,
+  gobject_typesfile: [join_paths(meson.current_source_dir(), 'libgweather.types')],
+  ignore_headers: [
+    'gweather-enum-types.h',
+    'gweather-parser.h',
+    'gweather-private.h',
+  ],
+  mkdb_args: ['--xml-mode', '--output-format=xml'],
+  scan_args: [
+    '--deprecated-guards="GWEATHER_DISABLE_DEPRECATED"',
+    '--ignore-decorators=GWEATHER_EXTERN',
+  ],
+  fixxref_args: [
+    '--html-dir=@0@'.format(docpath),
+    '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+    '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+    '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+    '--extra-dir=@0@'.format(join_paths(gtk_docpath, 'gtk')),
+  ],
+  install: true,
+)


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