[Git][freetype/freetype][master] 3 commits: * meson.build: Check the return value of `run_command`.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• e342f83c
  by Eli Schwartz at 2021-12-17T10:38:57+01:00

  * 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.
  

• 57fd6180
  by Eli Schwartz at 2021-12-17T10:45:29+01:00

  * builds/meson/*.py: Fix name of python executable for auxiliary scripts.
  
  The previous change to check the return code of `run_command` invocations
  caused the CI to fail.  Although most scripts used `python_exe` as the
  program command, the script to determine the project version did not.
  
  But, all scripts used `python` as the shebang, and this is not available on
  all systems.  Particularly Debian does not provide a `python` command,
  though `python3` does exist.  This meant that formerly the version number
  was lacking, and now the build simply fails.
  
  Instead, rely on `python3` since it is guaranteed to exist when running
  meson, and `python2` is end of life anyway.
  

• d6a5c577
  by Eli Schwartz at 2021-12-17T10:47:13+01:00

  * meson.build: Optimize lookup for `python3` program.
  
  The python module's `find_installation` method is intended to provide
  routines for compiling and installing python modules into the
  `site-packages` directory.  It does a couple of slow things, including run
  an introspection command to scrape sysconfig info from the detected
  interpreter, which are not needed for the sole use case of invoking the
  found installation as an executable.
  
  Furthermore, when invoked without the name or path of a python binary, it is
  hardcoded to always look for `python3` corresponding to the interpreter
  meson itself uses to run.  So using `find_installation` did not even allow
  detecting `python2` as a fallback.
  
  Instead, switch to a simple `find_program` lookup that finishes as soon as
  the program is found.
  

6 changed files:

• builds/meson/extract_freetype_version.py
• builds/meson/extract_libtool_version.py
• builds/meson/generate_reference_docs.py
• builds/meson/parse_modules_cfg.py
• builds/meson/process_ftoption_h.py
• meson.build

Changes:

builds/meson/extract_freetype_version.py

---

1		-#!/usr/bin/env python
	1	+#!/usr/bin/env python3
2	2	#
3	3	# Copyright (C) 2020-2021 by
4	4	# David Turner, Robert Wilhelm, and Werner Lemberg.

builds/meson/extract_libtool_version.py

---

1		-#!/usr/bin/env python
	1	+#!/usr/bin/env python3
2	2	#
3	3	# Copyright (C) 2020-2021 by
4	4	# David Turner, Robert Wilhelm, and Werner Lemberg.

builds/meson/generate_reference_docs.py

---

1		-#!/usr/bin/env python
	1	+#!/usr/bin/env python3
2	2	#
3	3	# Copyright (C) 2020-2021 by
4	4	# David Turner, Robert Wilhelm, and Werner Lemberg.

builds/meson/parse_modules_cfg.py

---

1		-#!/usr/bin/env python
	1	+#!/usr/bin/env python3
2	2	#
3	3	# Copyright (C) 2020-2021 by
4	4	# David Turner, Robert Wilhelm, and Werner Lemberg.

builds/meson/process_ftoption_h.py

---

1		-#!/usr/bin/env python
	1	+#!/usr/bin/env python3
2	2	#
3	3	# Copyright (C) 2020-2021 by
4	4	# David Turner, Robert Wilhelm, and Werner Lemberg.

meson.build

---

...	...	@@ -27,7 +27,8 @@ project('freetype2', 'c',
27	27	meson_version: '>= 0.55.0',
28	28	default_options: ['default_library=both'],
29	29	version: run_command('builds/meson/extract_freetype_version.py',
30		- 'include/freetype/freetype.h').stdout().strip(),
	30	+ 'include/freetype/freetype.h',
	31	+ check: true).stdout().strip(),
31	32	)
32	33
33	34
...	...	@@ -35,17 +36,18 @@ project('freetype2', 'c',
35	36	# variable; we thus use an external command to have this functionality
36	37	# with older versions, too.
37	38
38		-python = import('python')
39		-python_exe = python.find_installation(required: true)
	39	+python_exe = find_program('python3')
40	40
41	41	ft2_so_version = run_command(python_exe,
42	42	files('builds/meson/extract_libtool_version.py'),
43	43	'--soversion',
44		- files('builds/unix/configure.raw')).stdout().strip()
	44	+ files('builds/unix/configure.raw'),
	45	+ check: true).stdout().strip()
45	46
46	47	ft2_pkgconfig_version = run_command(python_exe,
47	48	files('builds/meson/extract_libtool_version.py'),
48		- files('builds/unix/configure.raw')).stdout().strip()
	49	+ files('builds/unix/configure.raw'),
	50	+ check: true).stdout().strip()
49	51
50	52	ft2_includes = include_directories('include')
51	53
...	...	@@ -70,7 +72,8 @@ ft2_sources = [ftmodule_h]
70	72	ft_main_modules = run_command(python_exe,
71	73	files('builds/meson/parse_modules_cfg.py'),
72	74	'--format=main-modules',
73		- files('modules.cfg')).stdout().strip().split()
	75	+ files('modules.cfg'),
	76	+ check: true).stdout().strip().split()
74	77
75	78	ft2_sources += files([
76	79	'src/base/ftbase.c',
...	...	@@ -91,7 +94,8 @@ endforeach
91	94	ft_aux_modules = run_command(python_exe,
92	95	files('builds/meson/parse_modules_cfg.py'),
93	96	'--format=aux-modules',
94		- files('modules.cfg')).stdout().strip().split()
	97	+ files('modules.cfg'),
	98	+ check: true).stdout().strip().split()
95	99
96	100	foreach auxmod: ft_aux_modules
97	101	source = auxmod
...	...	@@ -117,7 +121,8 @@ endforeach
117	121	base_extensions = run_command(python_exe,
118	122	files('builds/meson/parse_modules_cfg.py'),
119	123	'--format=base-extensions-list',
120		- files('modules.cfg')).stdout().split()
	124	+ files('modules.cfg'),
	125	+ check: true).stdout().split()
121	126
122	127	foreach ext: base_extensions
123	128	ft2_sources += files('src/base/' + ext)

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.