5 Commits

Author	SHA1	Message	Date
Zbigniew Jędrzejewski-Szmek	6abe882bae	meson: add missing final newline in jinja2 outputs ... I think this might be caused by trim_blocks=True. We were missing the final newline everywhere.	2021-12-09 12:46:19 +01:00
Christian Brauner	a6d1760024	build: preserve correct mode when generating files via jinja2 ... When using "capture : true" in custom_target()s the mode of the source file is not preserved when the generated file is not installed and so needs to be tweaked manually. Switch from output capture to creating the target file and copy the permissions from the input file. Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>	2021-11-08 12:06:48 +00:00
Zbigniew Jędrzejewski-Szmek	5f035b13de	meson-render-jinja2: use ast.literal_eval() ... Imports are sorted in the usual fashion: stdlib first. literal_eval() parses string/numbers/lists/sets/dicts, and nothing else, while eval will execute any python code. Using literal_eval() is generally more correct, because it avoids the risk of side effects from the parsed expression. In this case, we generate the parsed strings ourselves, so it's very unlikely to have anything unexpected in the expressions. But let's do the correct thing anyway.	2021-11-05 14:56:32 +01:00
Luca Boccassi	948def4af6	tree-wide: fix SPDX short identifier for LGPL-2.1-or-later ... https://spdx.dev/ids/#:~:text=Allowing%20later%20versions%20of%20a%20license https://spdx.org/licenses/LGPL-2.1-or-later.html	2021-10-01 17:27:34 +01:00
Zbigniew Jędrzejewski-Szmek	6b1aac3ccf	meson: replace some m4 templates with jinja2 ... m4 was nice in '85, but the syntax feels a bit dated. Since we use python for meson, let's use a popular python templating engine to replace some m4 usage. A little nicety is that typos are caught: FAILED: sysusers.d/systemd-remote.conf /usr/bin/meson --internal exe --capture sysusers.d/systemd-remote.conf -- /home/zbyszek/src/systemd/tools/meson-render-jinja2.py config.h ../sysusers.d/systemd-remote.conf.j2 Traceback (most recent call last): File "/home/zbyszek/src/systemd/tools/meson-render-jinja2.py", line 28, in <module> print(render(sys.argv[2], defines)) File "/home/zbyszek/src/systemd/tools/meson-render-jinja2.py", line 24, in render return template.render(defines) File "/usr/lib/python3.9/site-packages/jinja2/environment.py", line 1090, in render self.environment.handle_exception() File "/usr/lib/python3.9/site-packages/jinja2/environment.py", line 832, in handle_exception reraise(*rewrite_traceback_stack(source=source)) File "/usr/lib/python3.9/site-packages/jinja2/_compat.py", line 28, in reraise raise value.with_traceback(tb) File "<template>", line 8, in top-level template code jinja2.exceptions.UndefinedError: 'HAVE_MICROHTTP' is undefined This checking mirrors what 349cc4a507 did for C defines.	2021-05-19 10:24:43 +09:00