commit 60a943053bce11171e7959af7159a3246f4fc708
author Ed Tanous <edtanous@google.com> Fri Jan 06 13:52:45 2023 -0800
committer Patrick Williams <patrick@stwcx.xyz> Sat Jan 07 05:24:45 2023 +0000
tree 8721e5a57f578df7d8253ac7582c4212c3e39206
parent d375eba5272335f43f380483c27a94731ae78026

Fix meson warning

Meson warns on the calls to run_command.

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

This commit does as meson recommends, and adds check: true to all
run_command calls, which will be the default.

Change-Id: I281df6ed32c935ce7d3664a0ad628cc81dbac3a8
Signed-off-by: Ed Tanous <edtanous@google.com>

example/gen/meson.build

diff --git a/example/gen/meson.build b/example/gen/meson.build
index 2756633..a7da0a7 100644
--- a/example/gen/meson.build
+++ b/example/gen/meson.build
@@ -2,12 +2,13 @@
 sdbuspp_gen_meson_ver = run_command(
     sdbuspp_gen_meson_prog,
     '--version',
+    check: true,
 ).stdout().strip().split('\n')[0]
 
-if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 4'
+if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 5'
     warning('Generated meson files from wrong version of sdbus++-gen-meson.')
     warning(
-        'Expected "sdbus++-gen-meson version 4", got:',
+        'Expected "sdbus++-gen-meson version 5", got:',
         sdbuspp_gen_meson_ver
     )
 endif

test/gen/meson.build

diff --git a/test/gen/meson.build b/test/gen/meson.build
index 2756633..a7da0a7 100644
--- a/test/gen/meson.build
+++ b/test/gen/meson.build
@@ -2,12 +2,13 @@
 sdbuspp_gen_meson_ver = run_command(
     sdbuspp_gen_meson_prog,
     '--version',
+    check: true,
 ).stdout().strip().split('\n')[0]
 
-if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 4'
+if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 5'
     warning('Generated meson files from wrong version of sdbus++-gen-meson.')
     warning(
-        'Expected "sdbus++-gen-meson version 4", got:',
+        'Expected "sdbus++-gen-meson version 5", got:',
         sdbuspp_gen_meson_ver
     )
 endif

tools/sdbus++-gen-meson

diff --git a/tools/sdbus++-gen-meson b/tools/sdbus++-gen-meson
index ba7aa93..7f85514 100755
--- a/tools/sdbus++-gen-meson
+++ b/tools/sdbus++-gen-meson
@@ -36,7 +36,7 @@
 ## if a repository contains old copies of the generated meson.build files and
 ## needs an update.  We should increment the version number whenever the
 ## resulting meson.build would change.
-tool_version="sdbus++-gen-meson version 4"
+tool_version="sdbus++-gen-meson version 5"
 function show_version() {
     echo "${tool_version}"
 }
@@ -118,6 +118,7 @@
 sdbuspp_gen_meson_ver = run_command(
     sdbuspp_gen_meson_prog,
     '--version',
+    check: true,
 ).stdout().strip().split('\n')[0]
 
 if sdbuspp_gen_meson_ver != '${tool_version}'