From bfbcf8f3febcba7379f887430c5da16e03e0cf47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= Date: Wed, 28 Aug 2019 10:40:46 +0200 Subject: [PATCH] meson: Use generators placeholders Functions derived from generators as `configure_file`, `custom_target` and `i18n.merge_file` can use placeholders like `@BASENAME@` that removes the extension from the input filename string. The output string has been replaced by this placeholder that allows in some cases the use of less variables. --- clients/common/meson.build | 2 +- data/meson.build | 22 ++++++++++------------ dispatcher/meson.build | 5 ++--- docs/api/meson.build | 4 ++-- docs/libnm/meson.build | 4 ++-- docs/meson.build | 2 -- man/meson.build | 6 ++---- meson.build | 8 +++----- shared/meson.build | 2 +- 9 files changed, 23 insertions(+), 32 deletions(-) diff --git a/clients/common/meson.build b/clients/common/meson.build index fed0f3bf81..303b99e7f4 100644 --- a/clients/common/meson.build +++ b/clients/common/meson.build @@ -45,7 +45,7 @@ if enable_introspection else settings_docs_source = configure_file( input: settings_docs + '.in', - output: settings_docs, + output: '@BASENAME@', configuration: configuration_data(), ) endif diff --git a/data/meson.build b/data/meson.build index 9025eae452..b8e2e117ee 100644 --- a/data/meson.build +++ b/data/meson.build @@ -6,31 +6,29 @@ data_conf.set('sysconfdir', nm_sysconfdir) data_conf.set('DISTRO_NETWORK_SERVICE', (enable_ifcfg_rh ? 'network.service' : '')) data_conf.set('NM_MODIFY_SYSTEM_POLICY', (enable_modify_system ? 'yes' : 'auth_admin_keep')) -server = 'server.conf' - configure_file( - input: server + '.in', - output: server, + input: 'server.conf.in', + output: '@BASENAME@', install_dir: join_paths(nm_datadir, 'doc', nm_name, 'examples'), configuration: data_conf, ) if install_systemd_unit_dir services = [ - 'NetworkManager-dispatcher.service', - 'NetworkManager.service', + 'NetworkManager-dispatcher.service.in', + 'NetworkManager.service.in', ] if have_systemd_200 - services += ['NetworkManager-wait-online.service'] + services += ['NetworkManager-wait-online.service.in'] else - services += ['NetworkManager-wait-online-systemd-pre200.service'] + services += ['NetworkManager-wait-online-systemd-pre200.service.in'] endif foreach service: services configure_file( - input: service + '.in', - output: service, + input: service, + output: '@BASENAME@', install_dir: systemd_system_unit_dir, configuration: data_conf, ) @@ -62,14 +60,14 @@ if enable_polkit policy_in = configure_file( input: policy + '.in.in', - output: policy + '.in', + output: '@BASENAME@', configuration: data_conf, ) custom_target( policy, input: policy_in, - output: policy, + output: '@BASENAME@', command: intltool_xml_cmd, install: true, install_dir: polkit_dir, diff --git a/dispatcher/meson.build b/dispatcher/meson.build index 0706ab07a2..e9f3723c25 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -8,11 +8,10 @@ service_conf.set('sysconfdir', nm_sysconfdir) service_conf.set('localstatedir', nm_localstatedir) service_conf.set('libexecdir', nm_libexecdir) -service = 'org.freedesktop.nm_dispatcher.service' configure_file( - input: service + '.in', - output: service, + input: 'org.freedesktop.nm_dispatcher.service.in', + output: '@BASENAME@', install_dir: dbus_sys_dir, configuration: service_conf, ) diff --git a/docs/api/meson.build b/docs/api/meson.build index 62c5b8c926..3ea2edd5fe 100644 --- a/docs/api/meson.build +++ b/docs/api/meson.build @@ -15,8 +15,8 @@ if enable_introspection endif configure_file( - input: version_xml + '.in', - output: version_xml, + input: 'version.xml.in', + output: '@BASENAME@', configuration: version_conf, ) diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index b4a23729bb..7da4061a3d 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -27,8 +27,8 @@ private_headers = [ ] configure_file( - input: version_xml + '.in', - output: version_xml, + input: 'version.xml.in', + output: '@BASENAME@', configuration: version_conf, ) diff --git a/docs/meson.build b/docs/meson.build index cc814b77e7..f89592ab3d 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,8 +1,6 @@ version_conf = configuration_data() version_conf.set('VERSION', nm_version) -version_xml = 'version.xml' - subdir('libnm') subdir('api') diff --git a/man/meson.build b/man/meson.build index a4ef3d9e21..8ba6f4d8a1 100644 --- a/man/meson.build +++ b/man/meson.build @@ -9,11 +9,9 @@ common_conf.set('NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT', config_default_logging_a common_conf.set('NM_CONFIG_DEFAULT_MAIN_RC_MANAGER', config_dns_rc_manager_default) common_conf.set('NM_CONFIG_DEFAULT_MAIN_DHCP', config_dhcp_default) -common = 'common.ent' - common_ent_file = configure_file( - input: common + '.in', - output: common, + input: 'common.ent.in', + output: '@BASENAME@', configuration: common_conf, ) diff --git a/meson.build b/meson.build index 9c4ee0712e..1b7ff0fb81 100644 --- a/meson.build +++ b/meson.build @@ -847,11 +847,9 @@ if enable_docs subdir('docs') endif -config = 'config.h' - configure_file( - input: config + '.meson', - output: config, + input: 'config.h.meson', + output: '@BASENAME@', configuration: config_h, ) @@ -879,7 +877,7 @@ config_extra_h.set_quoted('SYSCONFDIR', nm_sysconfdir) configure_file( input: 'config-extra.h.meson', - output: 'config-extra.h', + output: '@BASENAME@', configuration: config_extra_h, ) diff --git a/shared/meson.build b/shared/meson.build index aa10f792f8..4c8b58c84f 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -132,7 +132,7 @@ version_conf.set('NM_MICRO_VERSION', nm_micro_version) version_header = configure_file( input: 'nm-version-macros.h.in', - output: 'nm-version-macros.h', + output: '@BASENAME@', configuration: version_conf, )