build: Rename -Dgtk_doc option to -Ddocumentation

Because the documentation is no longer built using gtk-doc.

Keep the old option around, but deprecated.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Helps: #3037
This commit is contained in:
Philip Withnall 2023-11-29 10:26:37 +00:00
parent f6a1599e3c
commit e8edaeeb87
6 changed files with 16 additions and 14 deletions

View File

@ -119,7 +119,7 @@ fedora-x86_64:
-Dsystemtap=true -Dsystemtap=true
-Ddtrace=true -Ddtrace=true
-Dinstalled_tests=true -Dinstalled_tests=true
-Dgtk_doc=true -Ddocumentation=true
_build _build
- meson compile -C _build - meson compile -C _build
- mkdir -p _coverage - mkdir -p _coverage
@ -735,7 +735,7 @@ dist-job:
- git submodule update --init - git submodule update --init
- for m in $(git submodule foreach -q 'echo $path'); do git config --global --add safe.directory "${PWD}/${m}"; done - for m in $(git submodule foreach -q 'echo $path'); do git config --global --add safe.directory "${PWD}/${m}"; done
- meson subprojects download - meson subprojects download
- meson setup ${MESON_COMMON_OPTIONS} --buildtype release -Dgtk_doc=true -Dman=true _build - meson setup ${MESON_COMMON_OPTIONS} --buildtype release -Ddocumentation=true -Dman=true _build
- meson dist -C _build - meson dist -C _build
- ninja -C _build glib-doc gobject-doc gio-doc - ninja -C _build glib-doc gobject-doc gio-doc
- tar -c -J -f "glib-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/glib html - tar -c -J -f "glib-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/glib html

View File

@ -117,7 +117,7 @@ libraries.
gobject-introspection against this copy of GLib, then re-building GLib against gobject-introspection against this copy of GLib, then re-building GLib against
the new gobject-introspection with `-Dintrospection=enabled`. The GLib API the new gobject-introspection with `-Dintrospection=enabled`. The GLib API
documentation can be built during this second build process if documentation can be built during this second build process if
`-Dgtk_doc=true` is also set. `-Ddocumentation=true` is also set.
## Extra Configuration Options ## Extra Configuration Options
@ -142,13 +142,9 @@ configuring the GLib library:
Therefore, it may make sense to turn this feature off in some Therefore, it may make sense to turn this feature off in some
situations. The `-Dbsymbolic_functions=false` option allows to do that. situations. The `-Dbsymbolic_functions=false` option allows to do that.
`-Dgtk_doc=false` and `-Dgtk_doc=true` `-Ddocumentation=false` and `-Ddocumentation=true`
: By default, GLib will detect whether the gtk-doc package is installed. : By default, GLib will not build documentation for the library and tools. This
If it is, then it will use it to extract and build the documentation option can be used to enable building the documentation.
for the GLib library. These options can be used to explicitly control
whether gtk-doc should be used or not. If it is not used, the
distributed, pre-generated HTML files will be installed instead of
building them on your machine.
`-Dman=false` and `-Dman=true` `-Dman=false` and `-Dman=true`
: By default, GLib will detect whether `xsltproc` and the necessary DocBook : By default, GLib will detect whether `xsltproc` and the necessary DocBook

View File

@ -11,7 +11,7 @@ if get_option('man')
endforeach endforeach
endif endif
if get_option('gtk_doc') if get_option('documentation')
# GVariant specification is currently standalone # GVariant specification is currently standalone
rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false) rst2html5 = find_program('rst2html5', 'rst2html5.py', required: false)

View File

@ -1,4 +1,4 @@
if get_option('gtk_doc') and enable_gir if get_option('documentation') and enable_gir
gidocgen_dep = dependency('gi-docgen', version: '>= 2023.1', gidocgen_dep = dependency('gi-docgen', version: '>= 2023.1',
fallback: ['gi-docgen', 'dummy_dep'], fallback: ['gi-docgen', 'dummy_dep'],
required: true) required: true)

View File

@ -2638,7 +2638,7 @@ summary({
'dtrace' : get_option('dtrace'), 'dtrace' : get_option('dtrace'),
'systemtap' : enable_systemtap, 'systemtap' : enable_systemtap,
'sysprof' : libsysprof_capture_dep.found(), 'sysprof' : libsysprof_capture_dep.found(),
'gtk_doc' : get_option('gtk_doc'), 'documentation' : get_option('documentation'),
'bsymbolic_functions' : get_option('bsymbolic_functions'), 'bsymbolic_functions' : get_option('bsymbolic_functions'),
'force_posix_threads' : get_option('force_posix_threads'), 'force_posix_threads' : get_option('force_posix_threads'),
'tests' : get_option('tests'), 'tests' : get_option('tests'),

View File

@ -62,10 +62,16 @@ option('sysprof',
value : 'disabled', value : 'disabled',
description : 'include tracing support for sysprof') description : 'include tracing support for sysprof')
option('documentation',
type : 'boolean',
value : false,
description : 'Build API reference and tools documentation')
option('gtk_doc', option('gtk_doc',
type : 'boolean', type : 'boolean',
value : false, value : false,
description : 'use gtk-doc to build documentation') description : 'use gtk-doc to build documentation',
deprecated : 'documentation')
option('bsymbolic_functions', option('bsymbolic_functions',
type : 'boolean', type : 'boolean',