[#3729] Checkpoint: put local vars in lower

diff --git a/src/bin/admin/meson.build b/src/bin/admin/meson.build
index 29fa90eb73331484ca8e88f40a3c9c21922dffa1..2d69855dc1a165271ee55078fa05a3ab281701d3 100644 (file)
--- a/src/bin/admin/meson.build
+++ b/src/bin/admin/meson.build
@@ -1,8 +1,8 @@
 kea_admin_conf_data = configuration_data()
 kea_admin_conf_data.set('prefix', PREFIX)
 kea_admin_conf_data.set('exec_prefix', '${prefix}')
-DATADIR = get_option('datadir')
-kea_admin_conf_data.set('datarootdir', '${prefix}/' + DATADIR)
+datadir = get_option('datadir')
+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)
@@ -18,7 +18,7 @@ configure_file(
     install: true,
     install_dir: get_option('sbindir'),
 )
-adminscriptsdir = f'@DATADIR@/kea/scripts'
+adminscriptsdir = f'@datadir@/kea/scripts'
 configure_file(
     input: 'admin-utils.sh.in',
     output: 'admin-utils.sh',

diff --git a/src/bin/dhcp4/tests/meson.build b/src/bin/dhcp4/tests/meson.build
index 6eb415ae9b6bd2e4c0f0d902023b99107c7501e4..420f205479e720bc14ad03404cc403443a71af62 100644 (file)
--- a/src/bin/dhcp4/tests/meson.build
+++ b/src/bin/dhcp4/tests/meson.build
@@ -2,8 +2,8 @@ if not gtest.found()
     subdir_done()
 endif
 
-CURRENT_BUILD_DIR = meson.current_build_dir()
-CURRENT_SOURCE_DIR = meson.current_source_dir()
+current_build_dir = meson.current_build_dir()
+current_source_dir = meson.current_source_dir()
 dhcp4_tests_deps = [boost, crypto, gtest]
 dhcp4_tests_libs = [
     kea_dhcpsrv_testutils_lib,
@@ -42,7 +42,7 @@ dhcp4_process_tests = configure_file(
 test(
     'dhcp4_process_tests.sh',
     dhcp4_process_tests,
-    workdir: CURRENT_BUILD_DIR,
+    workdir: current_build_dir,
     is_parallel: false,
 )
 configure_file(
@@ -93,10 +93,10 @@ dhcp4_unittests = executable(
     'simple_parser4_unittest.cc',
     'vendor_opts_unittest.cc',
     cpp_args: [
-        f'-DTEST_DATA_BUILDDIR="@CURRENT_BUILD_DIR@"',
+        f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
         f'-DCFG_EXAMPLES="@TOP_SOURCE_DIR@/doc/examples/kea4"',
-        f'-DDHCP_DATA_DIR="@CURRENT_BUILD_DIR@"',
-        f'-DSYNTAX_FILE="@CURRENT_SOURCE_DIR@/../dhcp4_parser.yy"',
+        f'-DDHCP_DATA_DIR="@current_build_dir@"',
+        f'-DSYNTAX_FILE="@current_source_dir@/../dhcp4_parser.yy"',
         f'-DKEA_LFC_EXECUTABLE="@KEA_LFC@"',
         f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
     ],

diff --git a/src/bin/keactrl/meson.build b/src/bin/keactrl/meson.build
index 8560118aa27c92c82dd7dd1f3ce60af24a98df0c..2a61f6214741b937f3962048a7b4e8b3570f75ab 100644 (file)
--- a/src/bin/keactrl/meson.build
+++ b/src/bin/keactrl/meson.build
@@ -1,7 +1,7 @@
 keactrl_conf_data = configuration_data()
 keactrl_conf_data.set('prefix', PREFIX)
-SYSCONFDIR = get_option('sysconfdir')
-keactrl_conf_data.set('sysconfdir', '${prefix}/' + SYSCONFDIR)
+sysconfdir = get_option('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}/' + get_option('sbindir'))
@@ -14,7 +14,7 @@ keactrl_conf_data.set('EXTENDED_VERSION', project_version + ' (tarball)')
 keactrl_conf_data.set('PACKAGE_VERSION', project_version)
 keactrl_conf_data.set('runstatedir', '${prefix}/' + RUN_STATE_DIR + '/run')
 keactrl_conf_data.set('localstatedir', '${prefix}/' + RUN_STATE_DIR)
-kea_configfiles_destdir = f'@SYSCONFDIR@/kea'
+kea_configfiles_destdir = f'@sysconfdir@/kea'
 configure_file(
     input: 'keactrl.conf.in',
     output: 'keactrl.conf',

diff --git a/src/bin/lfc/tests/meson.build b/src/bin/lfc/tests/meson.build
index 49c3e6d8e23164e210223fc397a7926d366c971f..c0c5916040202aeeff8757d5960ac4adfdff43ae 100644 (file)
--- a/src/bin/lfc/tests/meson.build
+++ b/src/bin/lfc/tests/meson.build
@@ -2,12 +2,12 @@ if not gtest.found()
     subdir_done()
 endif
 
-CURRENT_BUILD_DIR = meson.current_build_dir()
+current_build_dir = meson.current_build_dir()
 lfc_unittests = executable(
     'lfc-unittests',
     'lfc_controller_unittests.cc',
     'lfc_unittests.cc',
-    cpp_args: [f'-DTEST_DATA_BUILDDIR="@CURRENT_BUILD_DIR@"'],
+    cpp_args: [f'-DTEST_DATA_BUILDDIR="@current_build_dir@"'],
     dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [lfc_lib] + LIBS_BUILT_SO_FAR,

diff --git a/src/bin/shell/meson.build b/src/bin/shell/meson.build
index 5574a5af0fd0aeeb7f4f73b65d1e8f3212486fdc..d1a7614351ee9f911353535d5d089f66cdd89989 100644 (file)
--- a/src/bin/shell/meson.build
+++ b/src/bin/shell/meson.build
@@ -13,9 +13,9 @@ r = run_command(
     'import sysconfig; print(sysconfig.get_paths()[\'purelib\'])',
     check: true,
 )
-PYTHON_SITE_PACKAGE = r.stdout().strip()
-PKGPYTHONDIR = f'@PYTHON_SITE_PACKAGE@/kea'
-kea_shell_conf_data.set('PKGPYTHONDIR', PKGPYTHONDIR)
+python_site_package = r.stdout().strip()
+pkgpythondir = f'@python_site_package@/kea'
+kea_shell_conf_data.set('PKGPYTHONDIR', pkgpythondir)
 configure_file(
     input: 'kea-shell.in',
     output: 'kea-shell',
@@ -29,12 +29,12 @@ configure_file(
     output: 'kea_conn.py',
     copy: true,
     install: false,
-    install_dir: PKGPYTHONDIR,
+    install_dir: pkgpythondir,
 )
 configure_file(
     input: 'kea_connector3.py',
     output: 'kea_connector3.py',
     copy: true,
     install: false,
-    install_dir: PKGPYTHONDIR,
+    install_dir: pkgpythondir,
 )

diff --git a/src/hooks/dhcp/run_script/tests/meson.build b/src/hooks/dhcp/run_script/tests/meson.build
index cc9daf67ffaa889043a61bb00605473f71f6e6d2..29dad7d5fa7524cfcf35ac46ddab42441784a65a 100644 (file)
--- a/src/hooks/dhcp/run_script/tests/meson.build
+++ b/src/hooks/dhcp/run_script/tests/meson.build
@@ -10,19 +10,19 @@ configure_file(
     configuration: run_script_test_conf_data,
 )
 
-CURRENT_BUILD_DIR = meson.current_build_dir()
-HOOK_INCLUDES = [include_directories('..')]
+current_build_dir = meson.current_build_dir()
+hook_includes = [include_directories('..')]
 dhcp_run_script_lib_tests = executable(
     'dhcp-run-script-lib-tests',
     'run_script_unittests.cc',
     'run_unittests.cc',
     cpp_args: [
         f'-DRUN_SCRIPT_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/run_script/libdhcp_run_script.so"',
-        f'-DTEST_LOG_FILE="@CURRENT_BUILD_DIR@/test.log"',
+        f'-DTEST_LOG_FILE="@current_build_dir@/test.log"',
         f'-DRUN_SCRIPT_TEST_SH="@CURRENT_BUILD_DIR@/run_script_test.sh"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.')] + INCLUDES + hook_includes,
     link_with: [dhcp_run_script_archive] + LIBS_BUILT_SO_FAR,
 )
 test('dhcp_run_script_lib_tests', dhcp_run_script_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/user_chk/tests/meson.build b/src/hooks/dhcp/user_chk/tests/meson.build
index 00fbf1d9be9d34a4ce04f05ca073c27cef6898e4..ffef2fd9fc08796ca4b159eba07c253ea4988941 100644 (file)
--- a/src/hooks/dhcp/user_chk/tests/meson.build
+++ b/src/hooks/dhcp/user_chk/tests/meson.build
@@ -10,8 +10,8 @@ configure_file(
     configuration: dhcp_user_chk_config_data,
 )
 
-HOOK_INCLUDES = [include_directories('..')]
-CURRENT_BUILD_DIR = meson.current_build_dir()
+hook_includes = [include_directories('..')]
+current_build_dir = meson.current_build_dir()
 dhcp_user_chk_lib_tests = executable(
     'dhcp-user-chk-lib-tests',
     'run_unittests.cc',
@@ -19,9 +19,9 @@ dhcp_user_chk_lib_tests = executable(
     'user_registry_unittests.cc',
     'user_unittests.cc',
     'userid_unittests.cc',
-    cpp_args: [f'-DTEST_DATA_BUILDDIR="@CURRENT_SOURCE_DIR@"'],
+    cpp_args: [f'-DTEST_DATA_BUILDDIR="@current_source_dir@"'],
     dependencies: [gtest],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.')] + INCLUDES + hook_includes,
     link_with: [dhcp_user_chk_archive] + LIBS_BUILT_SO_FAR,
 )
 test('dhcp_user_chk_lib_tests', dhcp_user_chk_lib_tests, protocol: 'gtest')

diff --git a/src/lib/asiolink/tests/meson.build b/src/lib/asiolink/tests/meson.build
index 04f03b45f8439422ed639cfd9513768c4853c2d1..a23b23d26155217430378fdcfe714fc3cfdabf5a 100644 (file)
--- a/src/lib/asiolink/tests/meson.build
+++ b/src/lib/asiolink/tests/meson.build
@@ -2,7 +2,7 @@ if not gtest.found()
     subdir_done()
 endif
 
-CURRENT_BUILD_DIR = meson.current_build_dir()
+current_build_dir = meson.current_build_dir()
 configure_file(
     input: 'process_spawn_app.sh.in',
     output: 'process_spawn_app.sh',
@@ -33,7 +33,7 @@ kea_asiolink_tests = executable(
     'udp_socket_unittest.cc',
     'unix_domain_socket_unittest.cc',
     cpp_args: [
-        f'-DTEST_SCRIPT_SH="@CURRENT_BUILD_DIR@/process_spawn_app.sh"',
+        f'-DTEST_SCRIPT_SH="@current_build_dir@/process_spawn_app.sh"',
         f'-DINVALID_TEST_SCRIPT_SH="@TOP_SOURCE_DIR@/README"',
         f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
     ],

diff --git a/src/lib/config/tests/meson.build b/src/lib/config/tests/meson.build
index ff842e6dadde168f2d84bd36fc1206a8d8347f50..148365d3ed9f9c0fdfdfe085443d78ee9a113bed 100644 (file)
--- a/src/lib/config/tests/meson.build
+++ b/src/lib/config/tests/meson.build
@@ -2,7 +2,7 @@ if not gtest.found()
     subdir_done()
 endif
 
-CURRENT_BUILD_DIR = meson.current_build_dir()
+current_build_dir = meson.current_build_dir()
 libs_testutils = [kea_testutils_lib, kea_asiolink_testutils_lib]
 kea_config_tests = executable(
     'kea-config-tests',
@@ -20,7 +20,7 @@ kea_config_tests = executable(
     'unix_command_mgr_unittests.cc',
     dependencies: [gtest, crypto],
     cpp_args: [
-        f'-DTEST_DATA_BUILDDIR="@CURRENT_BUILD_DIR@"',
+        f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
         f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
     ],
     include_directories: [include_directories('.')] + INCLUDES,

diff --git a/src/lib/dhcp/tests/meson.build b/src/lib/dhcp/tests/meson.build
index 534553c5df7cddfd39f8b58e7600915d026558b6..1d1995167fd75969f879b3f706427ef8fc477702 100644 (file)
--- a/src/lib/dhcp/tests/meson.build
+++ b/src/lib/dhcp/tests/meson.build
@@ -10,8 +10,7 @@ else
     error(f'Build failed: Unsupported system "@SYSTEM@".')
 endif
 
-CURRENT_BUILD_DIR = meson.current_build_dir()
-CURRENT_SOURCE_DIR = meson.current_source_dir()
+current_build_dir = meson.current_build_dir()
 libs_testutils = [kea_dhcp_testutils_lib, kea_testutils_lib]
 kea_dhcp_tests = executable(
     'kea-dhcp-tests',
@@ -63,7 +62,7 @@ kea_dhcp_tests = executable(
     'run_unittests.cc',
     pkt_filter_xpf_unittest_cc,
     dependencies: [gtest, crypto],
-    cpp_args: [f'-DTEST_DATA_BUILDDIR="@CURRENT_BUILD_DIR@"'],
+    cpp_args: [f'-DTEST_DATA_BUILDDIR="@current_build_dir@"'],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
 )

diff --git a/src/lib/dhcpsrv/tests/meson.build b/src/lib/dhcpsrv/tests/meson.build
index 082ed1f5207f8fe7fd6e9b5635abc58743f7c72f..d374d566b0ff3904fcedb4bbf24e7e14ef01c35f 100644 (file)
--- a/src/lib/dhcpsrv/tests/meson.build
+++ b/src/lib/dhcpsrv/tests/meson.build
@@ -2,7 +2,7 @@ if not gtest.found()
     subdir_done()
 endif
 
-CURRENT_BUILD_DIR = meson.current_build_dir()
+current_build_dir = meson.current_build_dir()
 libs_testutils = [
     kea_dhcpsrv_testutils_lib,
     kea_dhcp_testutils_lib,
@@ -15,7 +15,7 @@ configure_file(
     copy: true,
 )
 kea_dhcpsrv_conf_data = configuration_data()
-kea_dhcpsrv_conf_data.set('abs_builddir', CURRENT_BUILD_DIR)
+kea_dhcpsrv_conf_data.set('abs_builddir', current_build_dir)
 configure_file(
     input: 'meson-test_libraries.h.in',
     output: 'test_libraries.h',
@@ -96,8 +96,8 @@ kea_dhcpsrv_tests = executable(
     'timer_mgr_unittest.cc',
     'tracking_lease_mgr_unittest.cc',
     cpp_args: [
-        f'-DTEST_DATA_BUILDDIR="@CURRENT_BUILD_DIR@"',
-        f'-DDHCP_DATA_DIR="@CURRENT_BUILD_DIR@"',
+        f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
+        f'-DDHCP_DATA_DIR="@current_build_dir@"',
         f'-DKEA_LFC_BUILD_DIR="@TOP_BUILD_DIR@/src/bin/lfc"',
         f'-DDEFAULT_HOOKS_PATH="@DEFAULT_HOOKS_PATH@"',
     ],

diff --git a/src/lib/http/tests/meson.build b/src/lib/http/tests/meson.build
index b29ce4308a06f857b22fd6c74f070b107062bda1..8f0f3cf726fe5d31d421224cf78fe865db0945a1 100644 (file)
--- a/src/lib/http/tests/meson.build
+++ b/src/lib/http/tests/meson.build
@@ -2,7 +2,7 @@ if not gtest.found()
     subdir_done()
 endif
 
-CURRENT_SOURCE_DIR = meson.current_source_dir()
+current_source_dir = meson.current_source_dir()
 libs_testutils = [kea_testutils_lib, kea_asiolink_testutils_lib]
 kea_http_tests = executable(
     'kea-http-tests',
@@ -28,7 +28,7 @@ kea_http_tests = executable(
     'url_unittests.cc',
     cpp_args: [
         f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
-        f'-DDATA_DIR="@CURRENT_SOURCE_DIR@/testdata"',
+        f'-DDATA_DIR="@current_source_dir@/testdata"',
     ],
     dependencies: [gtest, crypto],
     include_directories: [include_directories('.')] + INCLUDES,

diff --git a/src/lib/log/tests/meson.build b/src/lib/log/tests/meson.build
index 83e6962c5f54e9253ade712ac4ac0517f1c465a5..64dc87c494f3d8ef168ca123b8b84b8f2dcf9c4a 100644 (file)
--- a/src/lib/log/tests/meson.build
+++ b/src/lib/log/tests/meson.build
@@ -72,8 +72,8 @@ shtests = [
 ]
 shtests_conf_data = configuration_data()
 shtests_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
-CURRENT_BUILD_DIR = meson.current_build_dir()
-shtests_conf_data.set('abs_builddir', CURRENT_BUILD_DIR)
+current_build_dir = meson.current_build_dir()
+shtests_conf_data.set('abs_builddir', current_build_dir)
 foreach shtest : shtests
     shfile = configure_file(
         input: shtest + '.in',
@@ -81,5 +81,5 @@ foreach shtest : shtests
         configuration: shtests_conf_data,
     )
     name = 'kea_log_' + shtest
-    test(name, shfile, workdir: CURRENT_BUILD_DIR, is_parallel: false)
+    test(name, shfile, workdir: current_build_dir, is_parallel: false)
 endforeach

diff --git a/src/lib/process/tests/meson.build b/src/lib/process/tests/meson.build
index 0e31034391b98e44bbcaf2eba516d8451d5704e8..7ea401c2a9c749d782d84e07afd47df20c501a9b 100644 (file)
--- a/src/lib/process/tests/meson.build
+++ b/src/lib/process/tests/meson.build
@@ -2,7 +2,7 @@ if not gtest.found()
     subdir_done()
 endif
 
-CURRENT_BUILD_DIR = meson.current_build_dir()
+current_build_dir = meson.current_build_dir()
 libs_testutils = [kea_process_testutils_lib, kea_testutils_lib]
 configure_file(
     input: 'process_test.sh.in',
@@ -23,8 +23,8 @@ kea_process_tests = executable(
     'run_unittests.cc',
     dependencies: [gtest],
     cpp_args: [
-        f'-DTEST_DATA_BUILDDIR="@CURRENT_BUILD_DIR@"',
-        f'-DTEST_SCRIPT_SH="@CURRENT_BUILD_DIR@/process_test.sh"',
+        f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
+        f'-DTEST_SCRIPT_SH="@current_build_dir@/process_test.sh"',
         f'-DDATA_DIR="@DHCP_DATA_DIR@"',
     ],
     include_directories: [include_directories('.')] + INCLUDES,