[libgit2-glib] meson: Remove the use of join_paths function



commit 89d49088259f9a2160a7563e24d06b72f3e10bde
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Wed May 22 09:01:17 2019 +0200

    meson: Remove the use of join_paths function
    
    Since meson's 0.49 version the '/' character can be used as path
    separator instead of the `join_paths` function[0].
    
    Every use of the `join_paths` function has been replaced.
    
    [0] http://mesonbuild.com/Release-notes-for-0-49-0.html#joining-paths-with-

 docs/reference/meson.build | 2 +-
 libgit2-glib/meson.build   | 6 +++---
 meson.build                | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 58e8161..2223c8d 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -23,7 +23,7 @@ custom_target(
     'generate',
     '--quiet',
     '--no-namespace-dir',
-    '--add-include-path=@0@'.format(join_paths(source_root, 'libgit2-glib')),
+    '--add-include-path=@0@'.format(source_root / 'libgit2-glib'),
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
     '--content-dir=@0@'.format(meson.current_source_dir()),
diff --git a/libgit2-glib/meson.build b/libgit2-glib/meson.build
index 69575ac..3676ea7 100644
--- a/libgit2-glib/meson.build
+++ b/libgit2-glib/meson.build
@@ -193,7 +193,7 @@ enum_sources = gnome.mkenums_simple(
 
 install_headers(
   headers,
-  subdir: join_paths(libgit2_glib_api_name, meson.project_name())
+  subdir: libgit2_glib_api_name / meson.project_name(),
 )
 
 platform_deps = [
@@ -239,7 +239,7 @@ libgit2_glib_dep = declare_dependency(
 if enable_python
   install_data(
     'Ggit.py',
-    install_dir: join_paths(python.sysconfig_path('purelib'), 'gi', 'overrides'),
+    install_dir: python.sysconfig_path('purelib') / 'gi/overrides',
   )
 endif
 
@@ -253,7 +253,7 @@ if enable_gir
     symbol_prefix: libgit2_glib_ns.to_lower(),
     export_packages: libgit2_glib_api_name,
     includes: ['GObject-2.0', 'GLib-2.0', 'Gio-2.0'],
-    header: join_paths(meson.project_name(), ggit_h),
+    header: meson.project_name() / ggit_h,
     install: true,
   )
 
diff --git a/meson.build b/meson.build
index 21fb9da..fbfa8e5 100644
--- a/meson.build
+++ b/meson.build
@@ -38,10 +38,10 @@ libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
 darwin_versions = [current + 1, '@0@.@1@'.format(current + 1, revision)]
 
 libgit2_glib_prefix = get_option('prefix')
-libgit2_glib_libdir = join_paths(libgit2_glib_prefix, get_option('libdir'))
-libgit2_glib_datadir = join_paths(libgit2_glib_prefix, get_option('datadir'))
+libgit2_glib_libdir = libgit2_glib_prefix / get_option('libdir')
+libgit2_glib_datadir = libgit2_glib_prefix / get_option('datadir')
 
-libgit2_glib_pkgincludedir = join_paths(get_option('includedir'), libgit2_glib_api_name, 
meson.project_name())
+libgit2_glib_pkgincludedir = get_option('includedir') / libgit2_glib_api_name / meson.project_name()
 
 gnome = import('gnome')
 pkg = import('pkgconfig')


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