diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-16 11:55:36 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-19 10:24:43 +0900 |
| commit | 6b1aac3ccf3a554011a1a6030672fa5b5c4b4f77 (patch) | |
| tree | d35120a1c59911b103e5a07b21469fae7c76fe53 /sysusers.d/meson.build | |
| parent | e0698c66f4569c91e3fdd54ca77449698ae38704 (diff) | |
| download | systemd-6b1aac3ccf3a554011a1a6030672fa5b5c4b4f77.tar.gz | |
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 349cc4a507c4d84fcadf61f42159ea6412717896 did for C defines.
Diffstat (limited to 'sysusers.d/meson.build')
| -rw-r--r-- | sysusers.d/meson.build | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/sysusers.d/meson.build b/sysusers.d/meson.build index ef809a4f44..894d1840bc 100644 --- a/sysusers.d/meson.build +++ b/sysusers.d/meson.build @@ -4,32 +4,19 @@ if enable_sysusers install_data('README', install_dir : sysusersdir) endif -in_files = ['basic.conf'] +in_files = [['basic.conf', enable_sysusers], + ['systemd.conf', enable_sysusers], + ['systemd-remote.conf', enable_sysusers and + conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1]] -foreach file : in_files - gen = configure_file( - input : file + '.in', - output : file, - configuration : substs) - if enable_sysusers - install_data(gen, - install_dir : sysusersdir) - endif -endforeach - -m4_files = ['systemd.conf'] - -if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 - m4_files += ['systemd-remote.conf'] -endif - -foreach file : m4_files +foreach tuple : in_files + file = tuple[0] custom_target( - 'sysusers.d_' + file, - input : file + '.m4', + file, + input : file + '.in', output: file, - command : [meson_apply_m4, config_h, '@INPUT@'], + command : [meson_render_jinja2, config_h, '@INPUT@'], capture : true, - install : enable_sysusers, + install : tuple[1], install_dir : sysusersdir) endforeach |