[#3731] Make more paths idiomatic in meson

diff --git a/doc/devel/meson.build b/doc/devel/meson.build
index 06aa783f345d34f35c494bd73fbceaa706cb9a57..639c29b5f3b8507ae05ca7d32a05c5d029b8f5b6 100644 (file)
--- a/doc/devel/meson.build
+++ b/doc/devel/meson.build
@@ -7,10 +7,9 @@ current_source_dir = meson.current_source_dir()
 make_devel_conf_data = configuration_data()
 make_devel_conf_data.set('builddir', current_build_dir)
 make_devel_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
-configure_file(
+make_devel = configure_file(
     input: 'make-devel.sh.in',
     output: 'make-devel.sh',
     configuration: make_devel_conf_data,
 )
-make_devel = f'@current_build_dir@/make-devel.sh'
 run_target('devel', command: [CD_AND_RUN, current_source_dir, make_devel])

diff --git a/doc/sphinx/meson.build b/doc/sphinx/meson.build
index d3a9ee28a4e5cfe9f43f4dcaa2a09817aa73dab1..cc869cd446a45ba19b783a845aa45715ec570514 100644 (file)
--- a/doc/sphinx/meson.build
+++ b/doc/sphinx/meson.build
@@ -6,7 +6,7 @@ current_build_dir = meson.current_build_dir()
 current_source_dir = meson.current_source_dir()
 
 sphinxbuilddir = './_build'
-abs_sphinxbuilddir = f'@current_build_dir@/_build'
+abs_sphinxbuilddir = current_build_dir / '_build'
 
 sphinxopts = ['-v', '-E', '-a', '-W', f'-c @current_source_dir@']
 
@@ -46,7 +46,7 @@ endforeach
 
 man_sources = rst_man_sources + ['conf.py']
 
-api_dir = f'@TOP_SOURCE_DIR@/src/share/api'
+api_dir = TOP_SOURCE_DIR / 'src/share/api'
 list = run_command(GRABBER, api_dir, '*.json', check: true)
 api_files = list.stdout().strip().split('\n')
 
@@ -112,10 +112,10 @@ else
 endif
 doc_conf.set('man8s', ' '.join(man8s))
 doc_conf.set('PREFIX', PREFIX)
-docdir = f'@DATADIR@/doc/kea'
+docdir = DATADIR / 'doc/kea'
 doc_conf.set('docdir', docdir)
 doc_conf.set('INSTALL', INSTALL.full_path())
-mandir8 = f'@MANDIR@/man8/'
+mandir8 = MANDIR / 'man8'
 doc_conf.set('mandir8', mandir8)
 
 make_doc = configure_file(

diff --git a/meson.build b/meson.build
index 26a4df1778df3a4cca63de3c5c738c95ff5a65aa..5e105701e874db0566c6acceeb5a9570595b2bff 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -82,9 +82,9 @@ PYTHON = find_program('python3', 'python', required: true)
 SPHINX = find_program('sphinx-build', 'sphinx-build-3', required: false)
 XMLLINT = find_program('xmllint', required: false)
 
-CD_AND_RUN = find_program(f'@TOP_SOURCE_DIR@/scripts/cd-and-run.sh')
-ENV = find_program(f'@TOP_SOURCE_DIR@/scripts/env.sh')
-GRABBER = find_program(f'@TOP_SOURCE_DIR@/scripts/grabber.py')
+CD_AND_RUN = find_program(TOP_SOURCE_DIR / 'scripts/cd-and-run.sh')
+ENV = find_program(TOP_SOURCE_DIR / 'scripts/env.sh')
+GRABBER = find_program(TOP_SOURCE_DIR / 'scripts/grabber.py')
 KEA_MSG_COMPILER = disabler()
 
 #### Configuration Data
@@ -510,7 +510,10 @@ report_conf_data.set('TOP_BUILD_DIR', TOP_BUILD_DIR)
 report_conf_data.set('PACKAGE_NAME', 'kea')
 report_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
 report_conf_data.set('PACKAGE_VERSION_TYPE', package_version_type)
-report_conf_data.set('EXTENDED_VERSION', f'@PROJECT_VERSION@ (@extended_version@)')
+report_conf_data.set(
+    'EXTENDED_VERSION',
+    f'@PROJECT_VERSION@ (@extended_version@)',
+)
 report_conf_data.set('OS_TYPE', OS_TYPE)
 report_conf_data.set('PREFIX', PREFIX)
 report_conf_data.set('HOOKS_DIR', DEFAULT_HOOKS_PATH)
@@ -730,7 +733,7 @@ endif
 
 run_target(
     'add-changelog-entry',
-    command: [f'@TOP_SOURCE_DIR@/changelog_unreleased/.add-entry.sh'],
+    command: [TOP_SOURCE_DIR / 'changelog_unreleased/.add-entry.sh'],
 )
 
 if cppcheck.found()
@@ -816,7 +819,7 @@ config_report_sh = configure_file(
 CONFIG_REPORT = configure_file(
     output: 'config.report',
     input: config_report_sh,
-    command: [f'@TOP_BUILD_DIR@/config-report.sh'],
+    command: [TOP_BUILD_DIR / 'config-report.sh'],
 )
 
 # TODO: Change to config.h.in when autotools are removed.

diff --git a/src/bin/admin/meson.build b/src/bin/admin/meson.build
index 3600cd3446cc20832b69e72ddcc3922292b6f308..26ce35c4b1070ae06cdf632437072a46d3eb8741 100644 (file)
--- a/src/bin/admin/meson.build
+++ b/src/bin/admin/meson.build
@@ -1,14 +1,14 @@
 kea_admin_conf_data = configuration_data()
 kea_admin_conf_data.set('prefix', PREFIX)
-kea_admin_conf_data.set('exec_prefix', '${prefix}')
-kea_admin_conf_data.set('datarootdir', '${prefix}/' + DATADIR)
+kea_admin_conf_data.set('exec_prefix', PREFIX)
+kea_admin_conf_data.set('datarootdir', PREFIX / DATADIR)
 kea_admin_conf_data.set('PACKAGE', 'kea')
 kea_admin_conf_data.set('PACKAGE_NAME', 'kea')
 kea_admin_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
 kea_admin_conf_data.set('EXTENDED_VERSION', PROJECT_VERSION + ' (tarball)')
 kea_admin_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
 kea_admin_conf_data.set('abs_top_srcdir', TOP_SOURCE_DIR)
-kea_admin_conf_data.set('sbindir', '${prefix}/' + SBINDIR)
+kea_admin_conf_data.set('sbindir', PREFIX / SBINDIR)
 kea_admin_conf_data.set('variables', 'variables')
 configure_file(
     input: 'kea-admin.in',
@@ -17,7 +17,7 @@ configure_file(
     install: true,
     install_dir: SBINDIR,
 )
-adminscriptsdir = f'@DATADIR@/kea/scripts'
+adminscriptsdir = DATADIR / 'kea/scripts'
 configure_file(
     input: 'admin-utils.sh.in',
     output: 'admin-utils.sh',

diff --git a/src/bin/keactrl/meson.build b/src/bin/keactrl/meson.build
index 3460457d99becffa761cb092c04c389e9a4da3b6..5d72d2e093212558d78005600c5fbcf44b0123e1 100644 (file)
--- a/src/bin/keactrl/meson.build
+++ b/src/bin/keactrl/meson.build
@@ -1,9 +1,9 @@
 keactrl_conf_data = configuration_data()
 keactrl_conf_data.set('prefix', PREFIX)
-keactrl_conf_data.set('sysconfdir', '${prefix}/' + SYSCONFDIR)
+keactrl_conf_data.set('sysconfdir', PREFIX / SYSCONFDIR)
 keactrl_conf_data.set('PACKAGE', 'kea')
-keactrl_conf_data.set('exec_prefix', '${prefix}')
-keactrl_conf_data.set('sbindir', '${prefix}/' + SBINDIR)
+keactrl_conf_data.set('exec_prefix', PREFIX)
+keactrl_conf_data.set('sbindir', PREFIX / SBINDIR)
 if NETCONF_DEP.found()
     keactrl_conf_data.set('HAVE_NETCONF', 'yes')
 else
@@ -13,7 +13,7 @@ keactrl_conf_data.set('EXTENDED_VERSION', PROJECT_VERSION + ' (tarball)')
 keactrl_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
 keactrl_conf_data.set('runstatedir', '${prefix}/' + LOCALSTATEDIR + '/run')
 keactrl_conf_data.set('localstatedir', '${prefix}/' + LOCALSTATEDIR)
-kea_configfiles_destdir = f'@SYSCONFDIR@/kea'
+kea_configfiles_destdir = SYSCONFDIR / 'kea'
 configure_file(
     input: 'keactrl.conf.in',
     output: 'keactrl.conf',
@@ -26,7 +26,7 @@ configure_file(
     configuration: keactrl_conf_data,
     install_dir: SBINDIR,
 )
-path_replacer = f'@TOP_BUILD_DIR@/tools/path_replacer.sh'
+path_replacer = TOP_BUILD_DIR / 'tools/path_replacer.sh'
 configure_file(
     input: 'kea-dhcp4.conf.pre',
     output: 'kea-dhcp4.conf',

diff --git a/src/bin/shell/tests/meson.build b/src/bin/shell/tests/meson.build
index 9df914e2ef0137bf9be6f9d662084dfc3185f405..80039c9610509f7900b1673effdce949166d78cf 100644 (file)
--- a/src/bin/shell/tests/meson.build
+++ b/src/bin/shell/tests/meson.build
@@ -12,7 +12,7 @@ shell_unittest = configure_file(
     configuration: shell_tests_conf_data,
 )
 pythonpath = environment()
-pythonpath.append('PYTHONPATH', f'@TOP_BUILD_DIR@/src/bin/shell')
+pythonpath.append('PYTHONPATH', TOP_BUILD_DIR / 'src/bin/shell')
 test(
     'shell_unittest.py',
     shell_unittest,

diff --git a/src/hooks/dhcp/radius/meson.build b/src/hooks/dhcp/radius/meson.build
index 8101d581cbf0ee9eda42f4dc9b8b4714b46dafbb..2d99d0303dfae6c6a22ba6eddd5299a5f9d88903 100644 (file)
--- a/src/hooks/dhcp/radius/meson.build
+++ b/src/hooks/dhcp/radius/meson.build
@@ -3,7 +3,7 @@ configure_file(
     output: 'dictionary',
     copy: true,
     install: true,
-    install_dir: f'@SYSCONFDIR@/kea/radius',
+    install_dir: SYSCONFDIR / 'kea/radius',
 )
 dhcp_radius_lib = shared_library(
     'dhcp_radius',

diff --git a/src/lib/mysql/tests/meson.build b/src/lib/mysql/tests/meson.build
index af565bbec611e42d6a3cd527d072b93cdec7e6b8..c494058479d9c167b04fd8017fe01d784c4ee9ac 100644 (file)
--- a/src/lib/mysql/tests/meson.build
+++ b/src/lib/mysql/tests/meson.build
@@ -12,7 +12,10 @@ kea_mysql_tests = executable(
     'mysql_binding_unittest.cc',
     'mysql_connection_unittest.cc',
     'run_unittests.cc',
-    cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"', f'-DKEA_ADMIN="@TOP_BUILD_DIR@/src/bin/admin/kea-admin"'],
+    cpp_args: [
+        f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
+        f'-DKEA_ADMIN="@TOP_BUILD_DIR@/src/bin/admin/kea-admin"',
+    ],
     dependencies: [GTEST_DEP, MYSQL_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,

diff --git a/src/lib/pgsql/tests/meson.build b/src/lib/pgsql/tests/meson.build
index c4845e76d69eaadf89525d930e2bccaa6671328b..d86b2213832df1c75e9108248579c18008ea70da 100644 (file)
--- a/src/lib/pgsql/tests/meson.build
+++ b/src/lib/pgsql/tests/meson.build
@@ -13,7 +13,10 @@ kea_pgsql_tests = executable(
     'pgsql_connection_unittest.cc',
     'pgsql_exchange_unittest.cc',
     'run_unittests.cc',
-    cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"', f'-DKEA_ADMIN="@TOP_BUILD_DIR@/src/bin/admin/kea-admin"'],
+    cpp_args: [
+        f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
+        f'-DKEA_ADMIN="@TOP_BUILD_DIR@/src/bin/admin/kea-admin"',
+    ],
     dependencies: [GTEST_DEP, POSTGRESQL_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,

diff --git a/src/lib/process/cfgrpt/meson.build b/src/lib/process/cfgrpt/meson.build
index b768d8478ca8a40b3ad02c7b6e32dd54aa783c0f..3cb953dc1ecbfbad7f71f65e140d4ce6a704ca14 100644 (file)
--- a/src/lib/process/cfgrpt/meson.build
+++ b/src/lib/process/cfgrpt/meson.build
@@ -1,4 +1,4 @@
-mk_cfgrpt = f'@TOP_SOURCE_DIR@/tools/mk_cfgrpt.sh'
+mk_cfgrpt = TOP_SOURCE_DIR / 'tools/mk_cfgrpt.sh'
 config_report_cc = configure_file(
     input: CONFIG_REPORT,
     output: 'config_report.cc',

diff --git a/src/share/yang/modules/meson.build b/src/share/yang/modules/meson.build
index 559119843277e55be2e91adc116f8381ae08541c..043e71276ecf5378acfa2481b6250535c1423a6a 100644 (file)
--- a/src/share/yang/modules/meson.build
+++ b/src/share/yang/modules/meson.build
@@ -4,7 +4,7 @@ endif
 
 subdir('utils')
 
-yangmodulesdir = f'@DATADIR@/kea/yang/modules'
+yangmodulesdir = DATADIR / 'kea/yang/modules'
 yangmodules_list = [
     'ietf-dhcpv6-client@2018-09-04.yang',
     'ietf-dhcpv6-options@2018-09-04.yang',

diff --git a/src/share/yang/modules/utils/meson.build b/src/share/yang/modules/utils/meson.build
index 9b24164edb6bedf4fb19315bfd08f7af63723814..bbd54d7d9493431fe62e54720544447c4417c456 100644 (file)
--- a/src/share/yang/modules/utils/meson.build
+++ b/src/share/yang/modules/utils/meson.build
@@ -1,10 +1,10 @@
-yangdir = f'@DATADIR@/kea/yang/modules/utils'
+yangdir = DATADIR / 'kea/yang/modules/utils'
 yang_utils_conf_data = configuration_data()
 # Comment says sources (vs build)
 yang_utils_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
 # Beware that top_srcdir here must be a relative path.
 yang_utils_conf_data.set('top_srcdir', '../../../../..')
-yang_utils_conf_data.set('datarootdir', f'@PREFIX@/@DATADIR@')
+yang_utils_conf_data.set('datarootdir', PREFIX / DATADIR)
 yang_utils_conf_data.set('prefix', PREFIX)
 yang_utils_conf_data.set(
     'LIBYANG_PREFIX',

diff --git a/subprojects/krb5/meson.build b/subprojects/krb5/meson.build
index 9f7c9ef2f859b0595e33fda095d1344e0bfea51a..a16e70c536b3a1208aea17595d20b4d9def52fae 100644 (file)
--- a/subprojects/krb5/meson.build
+++ b/subprojects/krb5/meson.build
@@ -4,7 +4,7 @@ krb5 = disabler()
 krb5_config = find_program('krb5-config', required: false)
 
 check_heimdal = find_program(
-    f'@current_source_dir@/check-heimdal.sh',
+    current_source_dir / 'check-heimdal.sh',
     required: true,
 )
 if krb5_config.found()