[gnome-maps] meson: Stop using deprecated meson features



commit 142560ff25bde14a1384c477225b48c0108223a7
Author: Shivam Madlani <shivammadlani5 gmail com>
Date:   Sat Oct 15 20:02:28 2022 +0000

    meson: Stop using deprecated meson features
    
    Meson>=0.56.0 has deprecated .source_root(), .build_root()
    and ExternalProgram.path.
    Replace with .project_source_root(), .project_build_root()
    and ExternalProgram.full_path
    
    Fixes #495

 meson.build       | 2 +-
 src/meson.build   | 2 +-
 tests/meson.build | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 30bda546..296703bb 100644
--- a/meson.build
+++ b/meson.build
@@ -48,7 +48,7 @@ libmaps_deps = [
 ]
 
 msgfmt = find_program('msgfmt')
-po_dir = join_paths(meson.source_root(), 'po')
+po_dir = join_paths(meson.project_source_root(), 'po')
 
 top_inc = include_directories('.')
 
diff --git a/src/meson.build b/src/meson.build
index 25ec53b0..c0bf4c73 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -7,7 +7,7 @@ else
 endif
 
 script_conf = configuration_data()
-script_conf.set('GJS', gjs.path())
+script_conf.set('GJS', gjs.full_path())
 script_conf.set('PACKAGE_VERSION', version)
 script_conf.set('libdir', libdir)
 script_conf.set('prefix', prefix)
diff --git a/tests/meson.build b/tests/meson.build
index 160b9280..bf727223 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -12,7 +12,7 @@ endif
 
 foreach test : tests
   script_conf = configuration_data()
-  script_conf.set('GJS', gjs.path())
+  script_conf.set('GJS', gjs.full_path())
   script_conf.set('PACKAGE_VERSION', version)
   script_conf.set('libdir', libdir)
   script_conf.set('prefix', prefix)
@@ -43,14 +43,14 @@ gnome.compile_resources(
   ),
   gresource_bundle: true,
   install: false,
-  install_dir: meson.build_root(),
+  install_dir: meson.project_build_root(),
   source_dir: ['../src', '../src/geojson-vt']
 )
 
 foreach test : tests
   test(test, gjs,
        args: ['tests/@0@'.format(test),
-              join_paths(meson.build_root(), 'tests', 'test.src.gresource')],
+              join_paths(meson.project_build_root(), 'tests', 'test.src.gresource')],
        env:  ['LANG=en_US.utf8', 'LC_ALL=en_US.utf8']
   )
 endforeach


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