shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

* meson.build: Check the return value of `run_command`.

By default, errors are not checked and a command that is somehow broken will
just capture incorrect output (likely an empty string).  Current development
versions of meson now raise a warning for this implicit behavior, and advise
explicitly setting the `check:` keyword argumend to determine whether a
failing return code should be considered an error.

Since none of the commands in this project are expected to fail, mark them
as required to succeed.

git/fs: mount .git/fs: mount/attach disallowed

--- a/meson.build

+++ b/meson.build

@@ -27,7 +27,8 @@

   meson_version: '>= 0.55.0',

   default_options: ['default_library=both'],

   version: run_command('builds/meson/extract_freetype_version.py',

-                       'include/freetype/freetype.h').stdout().strip(),

+                       'include/freetype/freetype.h',

+                       check: true).stdout().strip(),

 )

@@ -41,11 +42,13 @@

 ft2_so_version = run_command(python_exe,

   files('builds/meson/extract_libtool_version.py'),

   '--soversion',

-  files('builds/unix/configure.raw')).stdout().strip()

+  files('builds/unix/configure.raw'),

+  check: true).stdout().strip()

 ft2_pkgconfig_version = run_command(python_exe,

   files('builds/meson/extract_libtool_version.py'),

-  files('builds/unix/configure.raw')).stdout().strip()

+  files('builds/unix/configure.raw'),

+  check: true).stdout().strip()

 ft2_includes = include_directories('include')

@@ -70,7 +73,8 @@

 ft_main_modules = run_command(python_exe,

   files('builds/meson/parse_modules_cfg.py'),

   '--format=main-modules',

-  files('modules.cfg')).stdout().strip().split()

+  files('modules.cfg'),

+  check: true).stdout().strip().split()

 ft2_sources += files([

   'src/base/ftbase.c',

@@ -91,7 +95,8 @@

 ft_aux_modules = run_command(python_exe,

   files('builds/meson/parse_modules_cfg.py'),

   '--format=aux-modules',

-  files('modules.cfg')).stdout().strip().split()

+  files('modules.cfg'),

+  check: true).stdout().strip().split()

 foreach auxmod: ft_aux_modules

   source = auxmod

@@ -117,7 +122,8 @@

 base_extensions = run_command(python_exe,

   files('builds/meson/parse_modules_cfg.py'),

   '--format=base-extensions-list',

-  files('modules.cfg')).stdout().split()

+  files('modules.cfg'),

+  check: true).stdout().split()

 foreach ext: base_extensions

   ft2_sources += files('src/base/' + ext)