[atkmm] meson.build: Specify 'check' option in run_command()
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atkmm] meson.build: Specify 'check' option in run_command()
- Date: Sat, 5 Feb 2022 11:34:35 +0000 (UTC)
commit a7808dbf95dd4b213e4c73f6d2f61c8739ce6842
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Sat Feb 5 12:22:31 2022 +0100
meson.build: Specify 'check' option in run_command()
The default value will be changed in future Meson releases.
atk/atkmm/meson.build | 1 +
meson.build | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/atk/atkmm/meson.build b/atk/atkmm/meson.build
index 2eb4430..a6b8fcd 100644
--- a/atk/atkmm/meson.build
+++ b/atk/atkmm/meson.build
@@ -185,6 +185,7 @@ else # not maintainer_mode
meson.current_build_dir(),
src_untracked_atkmm,
hg_ccg_basenames,
+ check: true,
)
built_cc_files = [ rel_untracked_atkmm / 'wrap_init.cc' ]
diff --git a/meson.build b/meson.build
index 4256a23..9a98015 100644
--- a/meson.build
+++ b/meson.build
@@ -59,7 +59,7 @@ import os
import sys
sys.exit(os.path.isdir("@0@") or os.path.isfile("@0@"))
'''.format(project_source_root / '.git')
-is_git_build = run_command(python3, '-c', cmd_py).returncode() != 0
+is_git_build = run_command(python3, '-c', cmd_py, check: false).returncode() != 0
# Are we testing a dist tarball while it's being built?
# There ought to be a better way. https://github.com/mesonbuild/meson/issues/6866
@@ -143,14 +143,16 @@ dist_build_scripts_py = script_dir / 'dist-build-scripts.py'
if maintainer_mode
# Copy files to untracked/build_scripts and untracked/doc.
run_command(mm_common_get, '--force', script_dir,
- project_source_root / 'untracked' / 'doc')
+ project_source_root / 'untracked' / 'doc',
+ check: true,
+ )
else
cmd_py = '''
import os
import sys
sys.exit(os.path.isfile("@0@"))
'''.format(generate_binding_py)
- file_exists = run_command(python3, '-c', cmd_py).returncode() != 0
+ file_exists = run_command(python3, '-c', cmd_py, check: false).returncode() != 0
if not file_exists
error('Missing files in untracked/. You must enable maintainer-mode.')
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]