[gnome-disk-utility] build: Use / instead of join_paths
- From: Kai Lüke <kailueke src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility] build: Use / instead of join_paths
- Date: Sun, 7 Jul 2019 12:25:01 +0000 (UTC)
commit 1e1536bab9add5f2248a5387414eb323b63a2259
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Wed Jul 3 23:11:35 2019 +0200
build: Use / instead of join_paths
Since meson 0.49, the `/` character can be used to join paths[0], so
all the instances of `join_paths` have been replaced.
[0] http://mesonbuild.com/Release-notes-for-0-49-0.html#joining-paths-with-
data/icons/meson.build | 2 +-
data/meson.build | 8 ++++----
doc/man/meson.build | 2 +-
meson.build | 14 +++++++-------
src/notify/meson.build | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 6e8dab60..7b3fec4d 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,4 +1,4 @@
install_subdir(
'hicolor',
- install_dir: join_paths(gdu_datadir, 'icons'),
+ install_dir: gdu_datadir / 'icons',
)
diff --git a/data/meson.build b/data/meson.build
index 1fd0f3da..011847f8 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -14,7 +14,7 @@ foreach desktop: desktops
output: desktop,
po_dir: po_dir,
install: true,
- install_dir: join_paths(gdu_datadir, 'applications'),
+ install_dir: gdu_datadir / 'applications',
)
endforeach
@@ -27,13 +27,13 @@ configure_file(
input: service + '.in',
output: service,
install: true,
- install_dir: join_paths(gdu_datadir, 'dbus-1', 'services'),
+ install_dir: gdu_datadir / 'dbus-1/services',
configuration: service_conf,
)
install_data(
'org.gnome.Disks.gschema.xml',
- install_dir: join_paths(gdu_datadir, 'glib-2.0', 'schemas'),
+ install_dir: gdu_datadir / 'glib-2.0/schemas',
)
info = 'org.gnome.DiskUtility.appdata.xml'
@@ -44,5 +44,5 @@ i18n.merge_file(
output: info,
po_dir: po_dir,
install: true,
- install_dir: join_paths(gdu_datadir, 'metainfo'),
+ install_dir: gdu_datadir / 'metainfo',
)
diff --git a/doc/man/meson.build b/doc/man/meson.build
index 1e481622..9e58d62c 100644
--- a/doc/man/meson.build
+++ b/doc/man/meson.build
@@ -20,6 +20,6 @@ foreach man: mans
output: output,
command: xsltproc_cmd,
install: true,
- install_dir: join_paths(gdu_mandir, 'man1'),
+ install_dir: gdu_mandir / 'man1',
)
endforeach
diff --git a/meson.build b/meson.build
index e071b023..8181dbb8 100644
--- a/meson.build
+++ b/meson.build
@@ -10,12 +10,12 @@ gdu_name = 'gnome-disk-utility'
gdu_version = meson.project_version()
gdu_prefix = get_option('prefix')
-gdu_bindir = join_paths(gdu_prefix, get_option('bindir'))
-gdu_datadir = join_paths(gdu_prefix, get_option('datadir'))
-gdu_libexecdir = join_paths(gdu_prefix, get_option('libexecdir'))
-gdu_localedir = join_paths(gdu_prefix, get_option('localedir'))
-gdu_mandir = join_paths(gdu_prefix, get_option('mandir'))
-gdu_sysconfdir = join_paths(gdu_prefix, get_option('sysconfdir'))
+gdu_bindir = gdu_prefix / get_option('bindir')
+gdu_datadir = gdu_prefix / get_option('datadir')
+gdu_libexecdir = gdu_prefix / get_option('libexecdir')
+gdu_localedir = gdu_prefix / get_option('localedir')
+gdu_mandir = gdu_prefix / get_option('mandir')
+gdu_sysconfdir = gdu_prefix / get_option('sysconfdir')
cc = meson.get_compiler('c')
@@ -89,7 +89,7 @@ config_h.set('HAVE_LOGIND', enable_logind,
gnome = import('gnome')
i18n = import('i18n')
-po_dir = join_paths(meson.source_root(), 'po')
+po_dir = meson.source_root() / 'po'
top_inc = include_directories('.', 'src')
diff --git a/src/notify/meson.build b/src/notify/meson.build
index d16a197a..7c884f78 100644
--- a/src/notify/meson.build
+++ b/src/notify/meson.build
@@ -30,5 +30,5 @@ configure_file(
output: desktop,
configuration: desktop_conf,
install: true,
- install_dir: join_paths(gdu_sysconfdir, 'xdg', 'autostart'),
+ install_dir: gdu_sysconfdir / 'xdg/autostart',
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]