gplugin/gplugin

Fix a bunch of weird spacing in our meson files

2020-09-14, Gary Kramlich
4abae92ecef8
Parents ed368ed0c3e3
Children 04f8758f9a72
Fix a bunch of weird spacing in our meson files

Clean up a bunch of weird formatting in the meson files

Testing Done:
Built and ran the unit tests.

Reviewed at https://reviews.imfreedom.org/r/109/
7 files changed, 28 insertions(+), 32 deletions(-)
  • +0 -1
    gplugin-gtk/meson.build
  • +13 -19
    gplugin/meson.build
  • +1 -1
    lua/meson.build
  • +9 -8
    meson.build
  • +2 -1
    perl5/meson.build
  • +1 -1
    python3/meson.build
  • +2 -1
    tcc/meson.build
    • --- a/gplugin-gtk/meson.build Tue Sep 08 04:50:20 2020 -0500
    +++ b/gplugin-gtk/meson.build Mon Sep 14 20:36:36 2020 -0500
    @@ -35,7 +35,6 @@
    # Configure Files
    ###############################################################################
    GPLUGIN_GTK_H_INCLUDES = ''
    -
    foreach header : GPLUGIN_GTK_HEADERS
    GPLUGIN_GTK_H_INCLUDES = '@0@\n#include <gplugin-gtk/@1@>'.format(
    GPLUGIN_GTK_H_INCLUDES,
    --- a/gplugin/meson.build Tue Sep 08 04:50:20 2020 -0500
    +++ b/gplugin/meson.build Mon Sep 14 20:36:36 2020 -0500
    @@ -85,7 +85,8 @@
    ##############################################################################
    # Helper Variables
    ###############################################################################
    -PRIVATE_HEADERS = GPLUGIN_PRIVATE_HEADERS + GPLUGIN_PRIVATE_BUILT_HEADERS + ['gplugin-private.h', 'gplugin-native-private.h']
    +PRIVATE_HEADERS = GPLUGIN_PRIVATE_HEADERS + GPLUGIN_PRIVATE_BUILT_HEADERS + \
    + ['gplugin-private.h', 'gplugin-native-private.h']
    ###############################################################################
    # Configure Files
    @@ -106,14 +107,7 @@
    # Build gplugin.h
    GPLUGIN_H_INCLUDES = ''
    -
    -foreach header : GPLUGIN_HEADERS
    - GPLUGIN_H_INCLUDES = '@0@\n#include <gplugin/@1@>'.format(
    - GPLUGIN_H_INCLUDES,
    - header)
    -endforeach
    -
    -foreach header : ['gplugin-version.h', 'gplugin-enums.h'] # GPLUGIN_PUBLIC_BUILT_HEADERS
    +foreach header : GPLUGIN_HEADERS + ['gplugin-version.h', 'gplugin-enums.h']
    GPLUGIN_H_INCLUDES = '@0@\n#include <gplugin/@1@>'.format(
    GPLUGIN_H_INCLUDES,
    header)
    @@ -170,20 +164,20 @@
    gplugin_dep = declare_dependency(
    include_directories : [toplevel_inc, include_directories('.')],
    link_with : gplugin,
    - sources : GPLUGIN_PUBLIC_BUILT_HEADERS, # Ensure they're built before use.
    + sources : GPLUGIN_PUBLIC_BUILT_HEADERS, # Ensure they're built before use.
    dependencies : [GLIB, GOBJECT]
    )
    pkgconfig.generate(
    - gplugin,
    - name : 'libgplugin',
    - description : 'A fully featured GModule based plugin library',
    - filebase : 'gplugin',
    - subdirs : 'gplugin-1.0',
    - requires : [GLIB, GOBJECT, GMODULE],
    - variables : [
    - 'plugindir=${libdir}',
    - ],
    + gplugin,
    + name : 'libgplugin',
    + description : 'A fully featured GModule based plugin library',
    + filebase : 'gplugin',
    + subdirs : 'gplugin-1.0',
    + requires : [GLIB, GOBJECT, GMODULE],
    + variables : [
    + 'plugindir=${libdir}',
    + ],
    )
    ###############################################################################
    --- a/lua/meson.build Tue Sep 08 04:50:20 2020 -0500
    +++ b/lua/meson.build Mon Sep 14 20:36:36 2020 -0500
    @@ -54,6 +54,6 @@
    install : true,
    install_dir : get_option('libdir') / 'gplugin'
    )
    -endif # lua
    +endif # lua
    subdir('tests')
    --- a/meson.build Tue Sep 08 04:50:20 2020 -0500
    +++ b/meson.build Mon Sep 14 20:36:36 2020 -0500
    @@ -1,15 +1,16 @@
    ###############################################################################
    # Project Info
    ###############################################################################
    -project('gplugin', 'c', version : '0.30.1-dev',
    - meson_version : '>=0.50.0',
    - default_options : ['c_std=c99'])
    +project('gplugin', 'c',
    + version : '0.30.1-dev',
    + meson_version : '>=0.50.0',
    + default_options : ['c_std=c99'])
    parts = meson.project_version().split('-')
    if parts.length() > 1
    - extra = parts[1]
    + extra = parts[1]
    else
    - extra = ''
    + extra = ''
    endif
    parts = parts[0].split('.')
    @@ -22,9 +23,6 @@
    version_conf.set('GPLUGIN_EXTRA_VERSION', extra)
    version_conf.set('GPLUGIN_VERSION', meson.project_version())
    -LOCALE_DIR = get_option('prefix') / get_option('localedir')
    -add_project_arguments('-DLOCALEDIR="@0@"'.format(LOCALE_DIR), language : 'c')
    -
    ###############################################################################
    # Dependencies
    ###############################################################################
    @@ -45,7 +43,9 @@
    # NLS
    ###############################################################################
    GETTEXT_PACKAGE = 'gplugin'
    +LOCALE_DIR = get_option('prefix') / get_option('localedir')
    +add_project_arguments('-DLOCALEDIR="@0@"'.format(LOCALE_DIR), language : 'c')
    add_project_arguments('-DGETTEXT_PACKAGE="@0@"'.format(GETTEXT_PACKAGE),
    language : 'c')
    @@ -101,3 +101,4 @@
    # documentation
    install_data('ChangeLog', 'INSTALL.md', 'README.md', 'HACKING.md',
    install_dir : get_option('datadir') / 'doc' / 'gplugin')
    +
    --- a/perl5/meson.build Tue Sep 08 04:50:20 2020 -0500
    +++ b/perl5/meson.build Mon Sep 14 20:36:36 2020 -0500
    @@ -35,6 +35,7 @@
    else
    perl_arch = 'vendorarchexp'
    endif
    +
    perl_arch = run_command(PERL,
    '-MConfig',
    '-e', 'if ($Config{@0@}) { print "$Config{@0@}" } else { exit 1 }'.format(perl_arch),
    @@ -61,6 +62,6 @@
    install : true,
    install_dir : get_option('libdir') / 'gplugin'
    )
    -endif
    +endif # perl5
    subdir('tests')
    --- a/python3/meson.build Tue Sep 08 04:50:20 2020 -0500
    +++ b/python3/meson.build Mon Sep 14 20:36:36 2020 -0500
    @@ -55,6 +55,6 @@
    include_directories : gplugin_python3_inc,
    link_with : gplugin_python3_static,
    )
    -endif # python3
    +endif # python3
    subdir('tests')
    --- a/tcc/meson.build Tue Sep 08 04:50:20 2020 -0500
    +++ b/tcc/meson.build Mon Sep 14 20:36:36 2020 -0500
    @@ -13,6 +13,7 @@
    if not compiler.has_header('libtcc.h')
    error('libtcc.h not found')
    endif
    +
    TCC = compiler.find_library('tcc')
    gplugin_tcc = shared_library('gplugin-tcc',
    @@ -23,6 +24,6 @@
    install : true,
    install_dir : get_option('libdir') / 'gplugin'
    )
    -endif # tcc
    +endif # tcc
    subdir('tests')