[gnome-sound-recorder] meson: use / instead of join_path



commit ea2ab7be38154879ee73f21c89875d026febbe63
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Tue Jun 2 18:36:52 2020 +0200

    meson: use / instead of join_path

 data/appdata/meson.build |  2 +-
 data/meson.build         | 14 +++++++-------
 meson.build              | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
index 041a8e0..d37b20f 100644
--- a/data/appdata/meson.build
+++ b/data/appdata/meson.build
@@ -12,7 +12,7 @@ appdata_file = i18n.merge_file(
   output: '@0  appdata xml'.format(application_id),
   po_dir: po_dir,
   install: true,
-  install_dir: join_paths(sound_recorder_datadir, 'metainfo')
+  install_dir:  sound_recorder_datadir / 'metainfo'
 )
 
 appstream_util = find_program('appstream-util', required: false)
diff --git a/data/meson.build b/data/meson.build
index 32ba750..ef0d7fc 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,14 +1,14 @@
-icon_dir = join_paths('icons', 'hicolor', 'scalable', 'apps')
+icon_dir = 'icons' / 'hicolor' / 'scalable' / 'apps'
 install_data(
-  join_paths('icons', '@0@.svg'.format(application_id)),
-  install_dir: join_paths(sound_recorder_datadir, icon_dir)
+  'icons' / '@0@.svg'.format(application_id),
+  install_dir:  sound_recorder_datadir / icon_dir
 )
 
-icon_dir = join_paths('icons', 'hicolor', 'symbolic', 'apps')
+icon_dir = 'icons' / 'hicolor' / 'symbolic' / 'apps'
 install_data(
-  join_paths('icons', 'org.gnome.SoundRecorder-symbolic.svg'),
+  'icons' / 'org.gnome.SoundRecorder-symbolic.svg',
   rename: '@0 -symbolic svg'.format(application_id),
-  install_dir: join_paths(sound_recorder_datadir, icon_dir)
+  install_dir: sound_recorder_datadir / icon_dir
 )
 
 desktop_conf = configuration_data()
@@ -22,7 +22,7 @@ desktop_file = i18n.merge_file(
   ),
   output: '@0@.desktop'.format(application_id),
   install: true,
-  install_dir: join_paths(sound_recorder_datadir, 'applications'),
+  install_dir: sound_recorder_datadir / 'applications',
   po_dir: po_dir,
   type: 'desktop'
 )
diff --git a/meson.build b/meson.build
index 366fb3b..e8b9c8b 100644
--- a/meson.build
+++ b/meson.build
@@ -24,12 +24,12 @@ application_id = 'org.gnome.SoundRecorder@0@'.format(profile)
 
 gettext_package = application_id
 sound_recorder_prefix = get_option('prefix')
-sound_recorder_bindir = join_paths(sound_recorder_prefix, get_option('bindir'))
-sound_recorder_libdir = join_paths(sound_recorder_prefix, get_option('libdir'))
-sound_recorder_datadir = join_paths(sound_recorder_prefix, get_option('datadir'))
-sound_recorder_pkgdatadir = join_paths(sound_recorder_datadir, application_id)
+sound_recorder_bindir = sound_recorder_prefix / get_option('bindir')
+sound_recorder_libdir = sound_recorder_prefix / get_option('libdir')
+sound_recorder_datadir = sound_recorder_prefix / get_option('datadir')
+sound_recorder_pkgdatadir = sound_recorder_datadir / application_id
 
-sound_recorder_schemadir = join_paths(sound_recorder_datadir, 'glib-2.0', 'schemas')
+sound_recorder_schemadir = sound_recorder_datadir / 'glib-2.0' / 'schemas'
 
 gjs_dep = dependency('gjs-1.0', version: '>= 1.48.0')
 gjs_console = gjs_dep.get_pkgconfig_variable('gjs_console')
@@ -44,14 +44,14 @@ dependency('gobject-introspection-1.0', version: '>= 1.31.6')
 gnome = import('gnome')
 i18n = import('i18n')
 
-po_dir = join_paths(meson.source_root(), 'po')
+po_dir = meson.source_root() / 'po'
 
 subdir('src')
 subdir('data')
 subdir('po')
 
 meson.add_install_script(
-  join_paths('build-aux', 'meson_post_install.py'),
+  'build-aux' / 'meson_post_install.py',
   sound_recorder_datadir,
   sound_recorder_bindir,
   sound_recorder_pkgdatadir,


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