gplugin/gplugin

Remove join_paths from Meson files as much as possible.
develop
2020-02-29, Elliott Sales de Andrade
0685dd2a8a48
Parents 47b11278e9ea
Children a99bc339c18f
Remove join_paths from Meson files as much as possible.

With 0.50.0, we can use / directly.
14 files changed, 21 insertions(+), 21 deletions(-)
  • +1 -1
    gplugin-gtk-viewer/meson.build
  • +2 -2
    gplugin-gtk/meson.build
  • +1 -1
    gplugin-gtk/reference/meson.build
  • +5 -5
    gplugin/meson.build
  • +1 -1
    lua/meson.build
  • +1 -1
    lua/tests/meson.build
  • +2 -2
    meson.build
  • +1 -1
    perl/meson.build
  • +1 -1
    perl/tests/meson.build
  • +1 -1
    python/meson.build
  • +1 -1
    python/tests/meson.build
  • +1 -1
    tcc/meson.build
  • +1 -1
    tcc/tests/meson.build
  • +2 -2
    vala/meson.build
    • --- a/gplugin-gtk-viewer/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/gplugin-gtk-viewer/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -23,7 +23,7 @@
    gplugin_gtk_viewer],
    output : 'gplugin-gtk-viewer.1',
    install : true,
    - install_dir : join_paths(get_option('mandir'), 'man1'))
    + install_dir : get_option('mandir') / 'man1')
    endif
    endif
    --- a/gplugin-gtk/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/gplugin-gtk/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -49,14 +49,14 @@
    output : 'gplugin-gtk.h',
    configuration : conf,
    install : true,
    - install_dir : join_paths(get_option('includedir'), 'gplugin-1.0'))
    + install_dir : get_option('includedir') / 'gplugin-1.0')
    gplugin_gtk_xml = configure_file(
    input : 'gplugin-gtk.xml.in',
    output: 'gplugin-gtk.xml',
    configuration : version_conf,
    install: true,
    - install_dir : join_paths(get_option('datadir'), 'glade', 'catalogs'),
    + install_dir : get_option('datadir') / 'glade' / 'catalogs',
    )
    ###############################################################################
    --- a/gplugin-gtk/reference/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/gplugin-gtk/reference/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -15,7 +15,7 @@
    ]
    fixxref_args = [
    - '--extra-dir=' + join_paths(meson.current_build_dir(), '../../gplugin/reference/html')
    + '--extra-dir=' + (meson.current_build_dir() / '../../gplugin/reference/html')
    ]
    gplugin_gtk_version_xml = configure_file(
    --- a/gplugin/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/gplugin/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -69,7 +69,7 @@
    'gplugin-enums',
    sources : ENUM_HEADERS,
    install_header : true,
    - install_dir : join_paths(get_option('includedir'), 'gplugin-1.0', 'gplugin'))
    + install_dir : get_option('includedir') / 'gplugin-1.0' / 'gplugin')
    enums_c = enums[0]
    enums_h = enums[1]
    @@ -95,7 +95,7 @@
    output : 'gplugin-version.h',
    configuration : version_conf,
    install : true,
    - install_dir : join_paths(get_option('includedir'), 'gplugin-1.0', 'gplugin')
    + install_dir : get_option('includedir') / 'gplugin-1.0' / 'gplugin'
    )
    GPLUGIN_PUBLIC_BUILT_HEADERS += [
    @@ -126,7 +126,7 @@
    output : 'gplugin.h',
    configuration : conf,
    install : true,
    - install_dir : join_paths(get_option('includedir'), 'gplugin-1.0'))
    + install_dir : get_option('includedir') / 'gplugin-1.0')
    # Build gplugin-native.h
    GPLUGIN_NATIVE_H_INCLUDES = ''
    @@ -143,7 +143,7 @@
    output : 'gplugin-native.h',
    configuration : conf,
    install : true,
    - install_dir : join_paths(get_option('includedir'), 'gplugin-1.0'))
    + install_dir : get_option('includedir') / 'gplugin-1.0')
    ###############################################################################
    # Library target
    @@ -204,7 +204,7 @@
    gplugin_query],
    output : 'gplugin-query.1',
    install : true,
    - install_dir : join_paths(get_option('mandir'), 'man1'))
    + install_dir : get_option('mandir') / 'man1')
    endif
    ###############################################################################
    --- a/lua/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/lua/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -52,7 +52,7 @@
    name_prefix : '',
    dependencies : [LUA, gplugin_dep],
    install : true,
    - install_dir : join_paths(get_option('libdir'), 'gplugin')
    + install_dir : get_option('libdir') / 'gplugin'
    )
    endif # lua
    --- a/lua/tests/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/lua/tests/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -2,7 +2,7 @@
    e = executable('test-lua-loader', 'test-lua-loader.c',
    c_args : [
    - '-DLUA_LOADER_DIR="@0@"'.format(join_paths(meson.current_build_dir(), '..')),
    + '-DLUA_LOADER_DIR="@0@/.."'.format(meson.current_build_dir()),
    '-DLUA_PLUGIN_DIR="@0@/plugins"'.format(
    meson.current_source_dir()),
    ],
    --- a/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -22,7 +22,7 @@
    version_conf.set('GPLUGIN_EXTRA_VERSION', extra)
    version_conf.set('GPLUGIN_VERSION', meson.project_version())
    -LOCALE_DIR = join_paths(get_option('prefix'), get_option('localedir'))
    +LOCALE_DIR = get_option('prefix') / get_option('localedir')
    add_project_arguments('-DLOCALEDIR="@0@"'.format(LOCALE_DIR), language : 'c')
    ###############################################################################
    @@ -99,4 +99,4 @@
    ###############################################################################
    # documentation
    install_data('ChangeLog', 'INSTALL.md', 'README.md', 'HACKING.md',
    - install_dir : join_paths(get_option('datadir'), 'doc', 'gplugin'))
    + install_dir : get_option('datadir') / 'doc' / 'gplugin')
    --- a/perl/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/perl/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -41,7 +41,7 @@
    name_prefix : '',
    dependencies : [GMODULE, gplugin_dep, perl_dep, glib_perl_dep],
    install : true,
    - install_dir : join_paths(get_option('libdir'), 'gplugin')
    + install_dir : get_option('libdir') / 'gplugin'
    )
    endif # perl
    --- a/perl/tests/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/perl/tests/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -2,7 +2,7 @@
    e = executable('test-perl-loader', 'test-perl-loader.c',
    c_args : [
    - '-DPERL_LOADER_DIR="@0@"'.format(join_paths(meson.current_build_dir(), '..')),
    + '-DPERL_LOADER_DIR="@0@/.."'.format(meson.current_build_dir()),
    '-DPERL_PLUGIN_DIR="@0@/plugins"'.format(meson.current_source_dir()),
    ],
    link_with : gplugin_loader_tests,
    --- a/python/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/python/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -39,7 +39,7 @@
    name_prefix : '',
    dependencies : [PYTHON3, PYGOBJECT, gplugin_dep],
    install : true,
    - install_dir : join_paths(get_option('libdir'), 'gplugin')
    + install_dir : get_option('libdir') / 'gplugin'
    )
    gplugin_python3_dep = declare_dependency(
    include_directories : gplugin_python3_inc,
    --- a/python/tests/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/python/tests/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -3,7 +3,7 @@
    e = executable('test-python3-loader', 'test-python3-loader.c',
    include_directories : include_directories('.'),
    c_args : [
    - '-DPYTHON3_LOADER_DIR="@0@"'.format(join_paths(meson.current_build_dir(), '..')),
    + '-DPYTHON3_LOADER_DIR="@0@/.."'.format(meson.current_build_dir()),
    '-DPYTHON3_PLUGIN_DIR="@0@/plugins"'.format(meson.current_source_dir()),
    ],
    link_with : gplugin_loader_tests,
    --- a/tcc/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/tcc/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -21,7 +21,7 @@
    name_prefix : '',
    dependencies : [TCC, gplugin_dep],
    install : true,
    - install_dir : join_paths(get_option('libdir'), 'gplugin')
    + install_dir : get_option('libdir') / 'gplugin'
    )
    endif # tcc
    --- a/tcc/tests/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/tcc/tests/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -2,7 +2,7 @@
    e = executable('test-tcc-loader', 'test-tcc-loader.c',
    c_args : [
    - '-DTCC_LOADER_DIR="@0@"'.format(join_paths(meson.current_build_dir(), '..')),
    + '-DTCC_LOADER_DIR="@0@/.."'.format(meson.current_build_dir()),
    '-DTCC_PLUGIN_DIR="@0@/plugins"'.format(
    meson.current_source_dir()),
    ],
    --- a/vala/meson.build Fri Feb 28 10:34:51 2020 -0600
    +++ b/vala/meson.build Sat Feb 29 02:44:13 2020 -0500
    @@ -8,7 +8,7 @@
    gplugin_vapi = gnome.generate_vapi('gplugin',
    sources : gplugin_gir[0],
    install : true,
    - gir_dirs : join_paths(meson.current_build_dir(), '..', 'gplugin'),
    + gir_dirs : meson.current_build_dir() / '..' / 'gplugin',
    )
    if get_option('gtk3')
    @@ -16,7 +16,7 @@
    sources : gplugin_gtk_gir[0],
    packages : [ 'gtk+-3.0' ],
    install : true,
    - gir_dirs : join_paths(meson.current_build_dir(), '..', 'gplugin'),
    + gir_dirs : meson.current_build_dir() / '..' / 'gplugin',
    )
    endif