gplugin/gplugin

Add a doc alias target and bump the meson requirement to 0.52.0

2021-03-24, Gary Kramlich
f322ab51b750
Parents 11c702036a0a
Children b7c659d32d7a
Add a doc alias target and bump the meson requirement to 0.52.0

Testing Done:
Ran locally

Reviewed at https://reviews.imfreedom.org/r/582/
4 files changed, 20 insertions(+), 4 deletions(-)
  • +4 -2
    gplugin-gtk/reference/meson.build
  • +10 -0
    gplugin/gplugin-core.c
  • +1 -1
    gplugin/reference/meson.build
  • +5 -1
    meson.build
    • --- a/gplugin-gtk/reference/meson.build Mon Mar 22 03:17:22 2021 -0500
    +++ b/gplugin-gtk/reference/meson.build Wed Mar 24 03:25:11 2021 -0500
    @@ -15,7 +15,7 @@
    ]
    fixxref_args = [
    - '--extra-dir=' + (meson.build_root() / 'gplugin/reference/html')
    + '--extra-dir=' + (meson.build_root() / 'gplugin/reference/')
    ]
    gplugin_gtk_version_xml = configure_file(
    @@ -26,7 +26,9 @@
    content_files = [
    ]
    -gnome.gtkdoc(DOC_MODULE,
    +content_files += gplugin_doc
    +
    +gplugin_gtk_doc = gnome.gtkdoc(DOC_MODULE,
    main_xml : DOC_MODULE + '-docs.xml',
    namespace : 'gplugin_gtk',
    src_dir : gplugin_gtk_inc,
    --- a/gplugin/gplugin-core.c Mon Mar 22 03:17:22 2021 -0500
    +++ b/gplugin/gplugin-core.c Wed Mar 24 03:25:11 2021 -0500
    @@ -31,6 +31,16 @@
    * This section contains the core API of GPlugin.
    */
    +/**
    + * GPluginCoreFlags:
    + * @GPLUGIN_CORE_FLAGS_NONE: No flags.
    + * @GPLUGIN_CORE_FLAGS_DISABLE_NATIVE_LOADER: Disable the native plugin loader.
    + *
    + * Flags to configure behaviors in GPlugin.
    + *
    + * Since: 0.31.0
    + */
    +
    /******************************************************************************
    * API
    *****************************************************************************/
    --- a/gplugin/reference/meson.build Mon Mar 22 03:17:22 2021 -0500
    +++ b/gplugin/reference/meson.build Wed Mar 24 03:25:11 2021 -0500
    @@ -36,7 +36,7 @@
    'vala.xml',
    ]
    -gnome.gtkdoc(DOC_MODULE,
    +gplugin_doc = gnome.gtkdoc(DOC_MODULE,
    main_xml : DOC_MODULE + '-docs.xml',
    namespace : 'gplugin',
    src_dir : gplugin_inc,
    --- a/meson.build Mon Mar 22 03:17:22 2021 -0500
    +++ b/meson.build Wed Mar 24 03:25:11 2021 -0500
    @@ -4,7 +4,7 @@
    project('gplugin', 'c',
    license : 'LGPL-2.0-or-later',
    version : '0.30.1-dev',
    - meson_version : '>=0.50.0',
    + meson_version : '>=0.52.0',
    default_options : ['c_std=c99'])
    parts = meson.project_version().split('-')
    @@ -96,6 +96,10 @@
    subdir('tcc')
    subdir('vala')
    +if ENABLE_DOC
    + alias_target('doc', gplugin_doc, gplugin_gtk_doc)
    +endif
    +
    ###############################################################################
    # Install stuff
    ###############################################################################