[gnome-bluetooth: 6/14] build: Use / instead of join_paths
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth: 6/14] build: Use / instead of join_paths
- Date: Fri, 11 Jan 2019 11:23:19 +0000 (UTC)
commit d88cd6afd1b99c3555356412c802e33544793ff4
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Thu Dec 20 15:32:38 2018 +0100
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.
Required meson version has been bumped to 0.49.
[0] http://mesonbuild.com/Release-notes-for-0-49-0.html#joining-paths-with-
icons/meson.build | 2 +-
lib/meson.build | 2 +-
meson.build | 10 +++++-----
sendto/meson.build | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/icons/meson.build b/icons/meson.build
index d01af7ef..08a403af 100644
--- a/icons/meson.build
+++ b/icons/meson.build
@@ -1 +1 @@
-install_subdir('hicolor', install_dir: join_paths(gnomebt_datadir, 'icons'))
+install_subdir('hicolor', install_dir: gnomebt_datadir / 'icons')
diff --git a/lib/meson.build b/lib/meson.build
index 32843abe..cf1f520b 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -78,7 +78,7 @@ cflags = [
'-DG_LOG_DOMAIN="Bluetooth"',
]
-symbol_map = join_paths(meson.current_source_dir(), meson.project_name() + '.map')
+symbol_map = meson.current_source_dir() / (meson.project_name() + '.map')
test_ldflag = '-Wl,--version-script,' + symbol_map
ldflags = []
diff --git a/meson.build b/meson.build
index 3cc6eaa7..0ba2f6eb 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
version: '3.28.2',
license: 'GPL2+',
default_options: 'buildtype=debugoptimized',
- meson_version: '>= 0.43.0',
+ meson_version: '>= 0.49.0',
)
gnomebt_version = meson.project_version()
@@ -20,10 +20,10 @@ gnomebt_gir_ns = 'GnomeBluetooth'
gnomebt_gettext_package = meson.project_name() + '2'
gnomebt_prefix = get_option('prefix')
-gnomebt_datadir = join_paths(gnomebt_prefix, get_option('datadir'))
-gnomebt_localedir = join_paths(gnomebt_prefix, get_option('localedir'))
+gnomebt_datadir = gnomebt_prefix / get_option('datadir')
+gnomebt_localedir = gnomebt_prefix / get_option('localedir')
-gnomebt_pkgdatadir = join_paths(gnomebt_datadir, meson.project_name())
+gnomebt_pkgdatadir = gnomebt_datadir / meson.project_name()
# options
enable_gtk_doc = get_option('gtk_doc')
@@ -46,7 +46,7 @@ gnome = import('gnome')
i18n = import('i18n')
pkg = import('pkgconfig')
-po_dir = join_paths(meson.current_source_dir(), 'po')
+po_dir = meson.current_source_dir() / 'po'
top_inc = include_directories('.')
diff --git a/sendto/meson.build b/sendto/meson.build
index 0754fd0d..f0e8ad8f 100644
--- a/sendto/meson.build
+++ b/sendto/meson.build
@@ -32,5 +32,5 @@ i18n.merge_file (
output: desktop,
po_dir: po_dir,
install: true,
- install_dir: join_paths(gnomebt_datadir, 'applications'),
+ install_dir: gnomebt_datadir / 'applications',
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]