Merge branch 'gdbusegdoc' into 'master'

docs: Fix configuration with gtk_doc=true and installed_tests=false

See merge request GNOME/glib!1424
This commit is contained in:
Sebastian Dröge 2020-04-01 11:20:59 +00:00
commit aa5cb26c6e

View File

@ -1,5 +1,7 @@
if get_option('gtk_doc') if get_option('gtk_doc')
if installed_tests_enabled
subdir('gdbus-object-manager-example') subdir('gdbus-object-manager-example')
endif
subdir('xml') subdir('xml')
ignore_headers = [ ignore_headers = [
@ -160,20 +162,7 @@ if get_option('gtk_doc')
copy : true, copy : true,
) )
gnome.gtkdoc('gio', content_files = [
main_xml : 'gio-docs.xml',
namespace : 'g',
mode : 'none',
dependencies : [libgio_dep, libgobject_dep, libglib_dep],
src_dir : 'gio',
scan_args : gtkdoc_common_scan_args + [
'--rebuild-types',
'--ignore-headers=' + ' '.join(ignore_headers),
],
mkdb_args : [
'--ignore-files=' + ' '.join(ignore_sources),
],
content_files : [
'overview.xml', 'overview.xml',
'migrating-posix.xml', 'migrating-posix.xml',
'migrating-gnome-vfs.xml', 'migrating-gnome-vfs.xml',
@ -187,10 +176,30 @@ if get_option('gtk_doc')
'gresource.xml', 'gresource.xml',
'gdbus.xml', 'gdbus.xml',
'gdbus-codegen.xml', 'gdbus-codegen.xml',
]
if installed_tests_enabled
content_files += [
gdbus_example_objectmanager_xml, gdbus_example_objectmanager_xml,
gdbus_example_objectmanager_sources, gdbus_example_objectmanager_sources,
gdbus_object_manager_example_doc, gdbus_object_manager_example_doc
]
endif
gnome.gtkdoc('gio',
main_xml : 'gio-docs.xml',
namespace : 'g',
mode : 'none',
dependencies : [libgio_dep, libgobject_dep, libglib_dep],
src_dir : 'gio',
scan_args : gtkdoc_common_scan_args + [
'--rebuild-types',
'--ignore-headers=' + ' '.join(ignore_headers),
], ],
mkdb_args : [
'--ignore-files=' + ' '.join(ignore_sources),
],
content_files : content_files,
expand_content_files : [ expand_content_files : [
'overview.xml', 'overview.xml',
'migrating-posix.xml', 'migrating-posix.xml',