[glib: 1/2] docs: Fix configuration with gtk_doc=true and installed_tests=false
- From: Sebastian Dröge <sdroege src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 1/2] docs: Fix configuration with gtk_doc=true and installed_tests=false
- Date: Wed, 1 Apr 2020 11:21:14 +0000 (UTC)
commit 84ad802c3a8c4f6aec37d4eb2d44b5dbbbbc0097
Author: Chris Mayo <aklhfex gmail com>
Date: Fri Mar 27 19:33:12 2020 +0000
docs: Fix configuration with gtk_doc=true and installed_tests=false
Skip the gdbus-object-manager-example which is generated as part of
testing.
Program xsltproc found: YES (/usr/bin/xsltproc)
Run-time dependency gtk-doc found: YES 1.32
docs/reference/gio/gdbus-object-manager-example/meson.build:1:0: ERROR:
Unknown variable "libgdbus_example_objectmanager_dep".
docs/reference/gio/meson.build | 47 +++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 19 deletions(-)
---
diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
index b25d11b41..a4e67ca82 100644
--- a/docs/reference/gio/meson.build
+++ b/docs/reference/gio/meson.build
@@ -1,5 +1,7 @@
if get_option('gtk_doc')
- subdir('gdbus-object-manager-example')
+ if installed_tests_enabled
+ subdir('gdbus-object-manager-example')
+ endif
subdir('xml')
ignore_headers = [
@@ -160,6 +162,30 @@ if get_option('gtk_doc')
copy : true,
)
+ content_files = [
+ 'overview.xml',
+ 'migrating-posix.xml',
+ 'migrating-gnome-vfs.xml',
+ 'migrating-gconf.xml',
+ 'migrating-gdbus.xml',
+ 'gio-querymodules.xml',
+ 'glib-compile-schemas.xml',
+ 'glib-compile-resources.xml',
+ 'gapplication.xml',
+ 'gsettings.xml',
+ 'gresource.xml',
+ 'gdbus.xml',
+ 'gdbus-codegen.xml',
+ ]
+
+ if installed_tests_enabled
+ content_files += [
+ gdbus_example_objectmanager_xml,
+ gdbus_example_objectmanager_sources,
+ gdbus_object_manager_example_doc
+ ]
+ endif
+
gnome.gtkdoc('gio',
main_xml : 'gio-docs.xml',
namespace : 'g',
@@ -173,24 +199,7 @@ if get_option('gtk_doc')
mkdb_args : [
'--ignore-files=' + ' '.join(ignore_sources),
],
- content_files : [
- 'overview.xml',
- 'migrating-posix.xml',
- 'migrating-gnome-vfs.xml',
- 'migrating-gconf.xml',
- 'migrating-gdbus.xml',
- 'gio-querymodules.xml',
- 'glib-compile-schemas.xml',
- 'glib-compile-resources.xml',
- 'gapplication.xml',
- 'gsettings.xml',
- 'gresource.xml',
- 'gdbus.xml',
- 'gdbus-codegen.xml',
- gdbus_example_objectmanager_xml,
- gdbus_example_objectmanager_sources,
- gdbus_object_manager_example_doc,
- ],
+ content_files : content_files,
expand_content_files : [
'overview.xml',
'migrating-posix.xml',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]