[gtkmm] meson.build: Specify 'check' option in run_command()
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] meson.build: Specify 'check' option in run_command()
- Date: Wed, 9 Feb 2022 11:37:58 +0000 (UTC)
commit fc0f061be1ea29d86a0d31df729897ca13f297a2
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Wed Feb 9 11:06:05 2022 +0100
meson.build: Specify 'check' option in run_command()
The default value will be changed in future Meson releases.
gdk/gdkmm/meson.build | 1 +
gtk/gtkmm/meson.build | 1 +
meson.build | 8 +++++---
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/gdk/gdkmm/meson.build b/gdk/gdkmm/meson.build
index ba23e0fc..0b5e20e8 100644
--- a/gdk/gdkmm/meson.build
+++ b/gdk/gdkmm/meson.build
@@ -226,6 +226,7 @@ else # not maintainer_mode
meson.current_build_dir(),
src_untracked_gdkmm,
gdkmm_hg_ccg_basenames,
+ check: true,
)
built_cc_files = [ '../..' / untracked_gdkmm / 'wrap_init.cc' ]
diff --git a/gtk/gtkmm/meson.build b/gtk/gtkmm/meson.build
index f64c08af..af74a196 100644
--- a/gtk/gtkmm/meson.build
+++ b/gtk/gtkmm/meson.build
@@ -465,6 +465,7 @@ else # not maintainer_mode
meson.current_build_dir(),
src_untracked_gtkmm,
gtkmm_hg_ccg_basenames,
+ check: true,
)
built_cc_files = [ '../..' / untracked_gtkmm / 'wrap_init.cc' ]
diff --git a/meson.build b/meson.build
index 8fc3b061..5b46b5d5 100644
--- a/meson.build
+++ b/meson.build
@@ -61,7 +61,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
@@ -185,14 +185,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' / 'docs')
+ project_source_root / 'untracked' / 'docs',
+ 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]