[d-feet: 1/3] build: use python path method
- From: Thomas Bechtold <toabctl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [d-feet: 1/3] build: use python path method
- Date: Tue, 24 Mar 2020 04:34:04 +0000 (UTC)
commit bbe1cd23957e3c670e39e7aabaa77816a7c2eb74
Author: Chris Mayo <aklhfex gmail com>
Date: Mon Mar 23 19:48:44 2020 +0000
build: use python path method
The method was added to Meson in 0.50.0 which is the current minimum for
d-feet.
meson.build | 8 ++------
src/tests/meson.build | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index ba53385..af1a373 100644
--- a/meson.build
+++ b/meson.build
@@ -21,10 +21,6 @@ gnome = import('gnome')
i18n = import('i18n')
python = import('python').find_installation('python3')
-# FIXME: workaround for missing path method
-# https://github.com/mesonbuild/meson/pull/4616
-python_path = find_program('python3').path()
-
source_root = meson.current_source_dir()
data_dir = source_root / 'data'
@@ -37,7 +33,7 @@ df_conf = configuration_data()
values = [
# python
- ['PYTHON', python_path],
+ ['PYTHON', python.path()],
['pythondir', python.get_install_dir()],
# directories
['pkglibdir', df_prefix / df_pkglibdir],
@@ -72,6 +68,6 @@ meson.add_install_script(
'meson_post_install.py',
df_datadir,
gio_schemasdir,
- python_path,
+ python.path(),
python.get_install_dir(),
)
diff --git a/src/tests/meson.build b/src/tests/meson.build
index b185953..19f819b 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -1,5 +1,5 @@
test_conf = configuration_data()
-test_conf.set('PYTHON', python_path)
+test_conf.set('PYTHON', python.path())
test_conf.set('DATA_DIR', data_dir)
test_conf.set('SRC_DIR', src_dir)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]