pidgin/pidgin

Add gi-docgen as a subproject so we can convert the documentation to it

2021-10-18, Gary Kramlich
02c3569bc32b
Parents 06289a48546f
Children a9588f5aef2f
Add gi-docgen as a subproject so we can convert the documentation to it

Testing Done:
Just compiled and verified that our `.wrap` file didn't get overwritten by a `wrap-file` from gplugin.

Reviewed at https://reviews.imfreedom.org/r/1055/
5 files changed, 33 insertions(+), 7 deletions(-)
  • +1 -1
    .hgignore
  • +1 -3
    doc/meson.build
  • +5 -0
    doc/reference/meson.build
  • +20 -3
    meson.build
  • +6 -0
    subprojects/gi-docgen.wrap
    • --- a/.hgignore Mon Oct 18 01:20:33 2021 -0500
    +++ b/.hgignore Mon Oct 18 01:36:58 2021 -0500
    @@ -5,9 +5,9 @@
    *.pyc
    *~
    \#*\#
    -subprojects/*/
    syntax: regexp
    ^build(.+)?\/
    win32-install-dir(\.release)?
    po\/pidgin\.pot$
    +^subprojects\/.+\/
    --- a/doc/meson.build Mon Oct 18 01:20:33 2021 -0500
    +++ b/doc/meson.build Mon Oct 18 01:36:58 2021 -0500
    @@ -1,6 +1,4 @@
    -if ENABLE_DOC
    - subdir('reference')
    -endif
    +subdir('reference')
    if ENABLE_GTK
    pidgin_man = configure_file(
    --- a/doc/reference/meson.build Mon Oct 18 01:20:33 2021 -0500
    +++ b/doc/reference/meson.build Mon Oct 18 01:36:58 2021 -0500
    @@ -1,3 +1,5 @@
    +if get_option('doc')
    +
    subdir('libpurple')
    subdir('protocols')
    @@ -14,3 +16,6 @@
    endif
    alias_target('doc', libpurple_doc, protocols_doc, pidgin_doc, finch_doc)
    +
    +endif
    +
    --- a/meson.build Mon Oct 18 01:20:33 2021 -0500
    +++ b/meson.build Mon Oct 18 01:36:58 2021 -0500
    @@ -656,9 +656,26 @@
    #######################################################################
    INSTALL_PIXMAPS = get_option('pixmaps-install')
    -# check for gtk-doc
    -ENABLE_DOC = get_option('doc')
    +#######################################################################
    +# Documentation
    +#######################################################################
    +
    +if get_option('doc') and not get_option('introspection')
    + error('Documentation requires GObject Introspection.')
    +endif
    +gidocgen_dep = dependency(
    + 'gi-docgen', version: '>= 2021.1',
    + fallback: ['gi-docgen', 'dummy_dep'],
    + required: get_option('doc')
    +)
    +
    +gidocgen = find_program('gi-docgen', required : get_option('doc'))
    +docs_dir = get_option('prefix') / get_option('datadir') / 'doc'
    +
    +#######################################################################
    +# Random Stuff
    +#######################################################################
    if ['debug', 'debugoptimize'].contains(get_option('buildtype'))
    enable_debug = true
    else
    @@ -719,7 +736,7 @@
    summary({
    'Enable Introspection': enable_introspection,
    - 'Generate documentation': ENABLE_DOC,
    + 'Generate documentation': get_option('doc'),
    'Has you': true,
    'Install pixmaps': INSTALL_PIXMAPS,
    'Install translations': get_option('nls'),
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/subprojects/gi-docgen.wrap Mon Oct 18 01:36:58 2021 -0500
    @@ -0,0 +1,6 @@
    +[wrap-git]
    +directory=gi-docgen
    +url=https://gitlab.gnome.org/GNOME/gi-docgen.git
    +push-url=ssh://git@gitlab.gnome.org:GNOME/gi-docgen.git
    +revision=main
    +depth=1