Skip to content

Commit

Permalink
build: Move computing gtk-doc module paths to the check place
Browse files Browse the repository at this point in the history
A checks and an application of extra directories for gtkdoc-fixxref
were computed independetly. This patch removes the code duplication.
It also adds the discovered path to a "meson setup" summary output.
  • Loading branch information
ppisar committed Jan 26, 2024
1 parent 903408a commit 9d28090
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
25 changes: 12 additions & 13 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,21 @@ sed = find_program('sed')
test = find_program('test')

with_docs = get_option('with_docs')
gtk_doc_referred_paths = []
if with_docs
gtkdoc = dependency('gtk-doc')
glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')

glib_index_path = join_paths(glib_docpath, 'glib/index.html')
ret = run_command ([test, '-e', glib_index_path],
check: false)
if ret.returncode() != 0
error('Missing documentation for GLib: @0@'.format(glib_index_path))
endif

gobject_index_path = join_paths(glib_docpath, 'gobject/index.html')
ret = run_command ([test, '-e', gobject_index_path],
check: false)
if ret.returncode() != 0
error('Missing documentation for GObject: @0@'.format(gobject_index_path))
endif
foreach referred_module : [ 'glib', 'gobject' ]
doc_module_path = join_paths(glib_docpath, referred_module)
doc_index_file = join_paths(doc_module_path, 'index.html')
ret = run_command ([test, '-e', doc_index_file],
check: false)
if ret.returncode() != 0
error('Missing GTK documentation for @0@: @1@'.format(referred_module, doc_index_file))
endif
gtk_doc_referred_paths += [ doc_module_path ]
endforeach
endif

# Keep with_manpages option a tristate feature for backward compatibility.
Expand Down Expand Up @@ -198,6 +196,7 @@ summary({'prefix': get_option('prefix'),
'datadir': get_option('datadir'),
'Python 2 GObject Overrides': gobject_overrides_dir_py2,
'Python 3 GObject Overrides': gobject_overrides_dir_py3,
'GTK-Doc Referred Paths': gtk_doc_referred_paths,
}, section: 'Directories')

summary({'Custom Python': get_option('python_name'),
Expand Down
9 changes: 5 additions & 4 deletions modulemd/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,10 @@ configure_file(
# --- Documenatation --- #

if with_docs
fixxref_args = []
foreach path : gtk_doc_referred_paths
fixxref_args += [ '--extra-dir=@0@'.format(path) ]
endforeach
gnome.gtkdoc(
'modulemd-2.0',
install_dir: 'modulemd-2.0',
Expand All @@ -265,10 +269,7 @@ if with_docs
dependencies : [
modulemd_dep,
],
fixxref_args: [
'--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
'--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
],
fixxref_args: [ fixxref_args ],
install : true,
)
endif
Expand Down

0 comments on commit 9d28090

Please sign in to comment.