[retro-gtk] meson: Replace join_paths() by /



commit 13a03eb6dfd528e40d4d586280c5c5dc8aaf9bc0
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Fri Oct 16 08:23:09 2020 +0200

    meson: Replace join_paths() by /
    
    This makes the code style more unified and readable.

 meson.build           | 10 +++++-----
 retro-gtk/meson.build |  2 +-
 tests/meson.build     | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/meson.build b/meson.build
index 645787ad..6605dc70 100644
--- a/meson.build
+++ b/meson.build
@@ -4,15 +4,15 @@ project('retro-gtk','c',
 )
 
 retro_gtk_prefix = get_option('prefix')
-retro_gtk_datadir = join_paths(retro_gtk_prefix, get_option('datadir'))
+retro_gtk_datadir = retro_gtk_prefix / get_option('datadir')
 
 cc = meson.get_compiler('c')
 gnome = import('gnome')
 
 prefix = get_option('prefix')
-libdir = join_paths(prefix, get_option('libdir'))
-libexecdir = join_paths(prefix, get_option('libexecdir'))
-libretrodir = join_paths(libdir, 'libretro')
+libdir = prefix / get_option('libdir')
+libexecdir = prefix / get_option('libexecdir')
+libretrodir = libdir / 'libretro'
 
 confinc = include_directories('.')
 shared_inc = include_directories('shared')
@@ -37,7 +37,7 @@ samplerate = dependency ('samplerate', required : get_option('pulseaudio'))
 
 config_h = configuration_data()
 config_h.set_quoted ('RETRO_PLUGIN_PATH', ':'.join ([libretrodir, libdir]))
-config_h.set_quoted ('RETRO_RUNNER_PATH', join_paths (libexecdir, 'retro-runner'))
+config_h.set_quoted ('RETRO_RUNNER_PATH', libexecdir / 'retro-runner')
 
 configure_file(
   output: 'retro-gtk-config.h',
diff --git a/retro-gtk/meson.build b/retro-gtk/meson.build
index 61a9aefd..bc4b9bab 100644
--- a/retro-gtk/meson.build
+++ b/retro-gtk/meson.build
@@ -193,5 +193,5 @@ export_packages: 'retro-gtk',
         version: meson.project_version(),
         subdirs: 'retro-gtk',
        requires: 'glib-2.0',
-    install_dir: join_paths(get_option('libdir'), 'pkgconfig')
+    install_dir: get_option('libdir') / 'pkgconfig'
 )
diff --git a/tests/meson.build b/tests/meson.build
index c0074e37..3c950101 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,8 +1,8 @@
-retro_gtk_libexecdir = join_paths(retro_gtk_prefix, get_option('libexecdir'))
-installed_test_bindir = join_paths(retro_gtk_libexecdir, 'installed-tests', retro_gtk_module)
-installed_test_datadir = join_paths(retro_gtk_datadir, 'installed-tests', retro_gtk_module)
+retro_gtk_libexecdir = retro_gtk_prefix / get_option('libexecdir')
+installed_test_bindir = retro_gtk_libexecdir / 'installed-tests' / retro_gtk_module
+installed_test_datadir = retro_gtk_datadir / 'installed-tests' / retro_gtk_module
 
-testlibretrodir = join_paths(installed_test_datadir, 'libretro')
+testlibretrodir = installed_test_datadir / 'libretro'
 testexecdir = installed_test_bindir
 testdatadir = installed_test_datadir
 
@@ -42,9 +42,9 @@ installed_conf.set('testexecdir', testexecdir)
 installed_conf.set('testdatadir', testdatadir)
 
 build_conf = configuration_data()
-build_conf.set('testlibretrodir', join_paths(meson.build_root(), 'tests'))
-build_conf.set('testexecdir', join_paths(meson.build_root(), 'tests'))
-build_conf.set('testdatadir', join_paths(meson.source_root(), 'tests'))
+build_conf.set('testlibretrodir', meson.build_root() / 'tests')
+build_conf.set('testexecdir', meson.build_root() / 'tests')
+build_conf.set('testdatadir', meson.source_root() / 'tests')
 
 test_c_args = [
   '-DRETRO_LOG_DOMAIN="Retro"',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]