[totem/wip/hadess/fix-meson-hang: 1/4] build: Add check kwarg to run_command() calls
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem/wip/hadess/fix-meson-hang: 1/4] build: Add check kwarg to run_command() calls
- Date: Thu, 6 Jan 2022 16:22:22 +0000 (UTC)
commit 80672c9ae6099e65aed82776c5c413cbd3523909
Author: Bastien Nocera <hadess hadess net>
Date: Thu Jan 6 17:18:03 2022 +0100
build: Add check kwarg to run_command() calls
WARNING: You should add the boolean check kwarg to the run_command call.
It currently defaults to false,
but it will default to true in future releases of meson.
See also: https://github.com/mesonbuild/meson/issues/9300
data/meson.build | 4 ++--
meson.build | 2 +-
src/backend/meson.build | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index b38997400..b31ce755c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -60,7 +60,7 @@ ui_resources = gnome.compile_resources(
c_name: 'totem'
)
-r = run_command(desktop_sh, mime_type_list, uri_schemes_list)
+r = run_command(desktop_sh, mime_type_list, uri_schemes_list, check: true)
desktop_conf = configuration_data()
desktop_conf.set('VERSION', totem_version)
@@ -109,7 +109,7 @@ configure_file(
configuration: service_conf
)
-r = run_command(thumbnailer_sh, mime_type_list)
+r = run_command(thumbnailer_sh, mime_type_list, check: true)
thumbnailer_conf = configuration_data()
thumbnailer_conf.set('BINDIR', totem_bindir)
diff --git a/meson.build b/meson.build
index a77fe5077..2322a68a4 100644
--- a/meson.build
+++ b/meson.build
@@ -177,7 +177,7 @@ if python_option != 'no'
if python.found()
python_req_version = '>= 3.0'
- r = run_command([python, '--version'])
+ r = run_command([python, '--version'], check: true)
python_version = r.stdout().split(' ')[1]
pygobject_dep = dependency('pygobject-3.0', version: '>= 2.90.3', required: false)
diff --git a/src/backend/meson.build b/src/backend/meson.build
index 0a47fbd9f..9bd9e468e 100644
--- a/src/backend/meson.build
+++ b/src/backend/meson.build
@@ -15,7 +15,7 @@ gst_base_plugins = [
]
foreach plugin: gst_base_plugins
- r = run_command(gst_inspect, plugin)
+ r = run_command(gst_inspect, plugin, check: false)
assert(r.returncode() == 0,
'Cannot find required GStreamer-1.0 plugin "' + plugin + '". It should be part of gst-plugins-base.
Please install it.')
endforeach
@@ -27,7 +27,7 @@ gst_good_plugins = [
]
foreach plugin: gst_good_plugins
- r = run_command(gst_inspect, plugin)
+ r = run_command(gst_inspect, plugin, check: false)
assert(r.returncode() == 0,
'Cannot find required GStreamer-1.0 plugin "' + plugin + '". It should be part of gst-plugins-good.
Please install it.')
endforeach
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]