mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 13:37:55 +00:00
Code Issues Releases Wiki Activity

[#3729] Finished variable cleanup

Browse Source
This commit is contained in:
Francis Dupont
2025-02-11 12:10:30 +01:00
committed by Andrei Pavel
parent aedd0ecf58
commit dd9e48cacc
24 changed files with 37 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@@ -20,6 +20,7 @@ TOP_BUILD_DIR = meson.current_build_dir()
TOP_SOURCE_DIR = meson.current_source_dir() TOP_SOURCE_DIR = meson.current_source_dir()
RUN_STATE_DIR = get_option('localstatedir') RUN_STATE_DIR = get_option('localstatedir')
PREFIX = get_option('prefix') PREFIX = get_option('prefix')
DATADIR = get_option('datadir')
SYSCONFDIR = get_option('sysconfdir') SYSCONFDIR = get_option('sysconfdir')
DHCP_DATA_DIR = f'@PREFIX@/@RUN_STATE_DIR@/run/kea' DHCP_DATA_DIR = f'@PREFIX@/@RUN_STATE_DIR@/run/kea'
@@ -28,6 +29,7 @@ KEA_ADMIN = f'@TOP_BUILD_DIR@/src/bin/admin/kea-admin'
KEA_LFC = f'@TOP_BUILD_DIR@/src/bin/lfc/kea-lfc' KEA_LFC = f'@TOP_BUILD_DIR@/src/bin/lfc/kea-lfc'
TEST_CA_DIR = f'@TOP_SOURCE_DIR@/src/lib/asiolink/testutils/ca' TEST_CA_DIR = f'@TOP_SOURCE_DIR@/src/lib/asiolink/testutils/ca'
DATABASE_SCRIPTS_DIR = f'@TOP_BUILD_DIR@/src/share/database/scripts' DATABASE_SCRIPTS_DIR = f'@TOP_BUILD_DIR@/src/share/database/scripts'
LEGAL_LOG_DIR=f'@PREFIX@/@RUN_STATE_DIR@/lib/kea'
# TODO: Control it via a build option. # TODO: Control it via a build option.
FUZZING_IN_CI = false FUZZING_IN_CI = false

5
src/bin/keactrl/meson.build
View File

@@ -1,7 +1,6 @@
keactrl_conf_data = configuration_data() keactrl_conf_data = configuration_data()
keactrl_conf_data.set('prefix', PREFIX) keactrl_conf_data.set('prefix', PREFIX)
sysconfdir = get_option('sysconfdir') keactrl_conf_data.set('sysconfdir', '${prefix}/' + SYSCONFDIR)
keactrl_conf_data.set('sysconfdir', '${prefix}/' + sysconfdir)
keactrl_conf_data.set('PACKAGE', 'kea') keactrl_conf_data.set('PACKAGE', 'kea')
keactrl_conf_data.set('exec_prefix', '${prefix}') keactrl_conf_data.set('exec_prefix', '${prefix}')
keactrl_conf_data.set('sbindir', '${prefix}/' + get_option('sbindir')) keactrl_conf_data.set('sbindir', '${prefix}/' + get_option('sbindir'))
@@ -14,7 +13,7 @@ keactrl_conf_data.set('EXTENDED_VERSION', project_version + ' (tarball)')
keactrl_conf_data.set('PACKAGE_VERSION', project_version) keactrl_conf_data.set('PACKAGE_VERSION', project_version)
keactrl_conf_data.set('runstatedir', '${prefix}/' + RUN_STATE_DIR + '/run') keactrl_conf_data.set('runstatedir', '${prefix}/' + RUN_STATE_DIR + '/run')
keactrl_conf_data.set('localstatedir', '${prefix}/' + RUN_STATE_DIR) keactrl_conf_data.set('localstatedir', '${prefix}/' + RUN_STATE_DIR)
kea_configfiles_destdir = f'@sysconfdir@/kea' kea_configfiles_destdir = f'@SYSCONFDIR@/kea'
configure_file( configure_file(
input: 'keactrl.conf.in', input: 'keactrl.conf.in',
output: 'keactrl.conf', output: 'keactrl.conf',

3
src/hooks/dhcp/bootp/libloadtests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_bootp_libload_tests = executable( dhcp_bootp_libload_tests = executable(
'dhcp-bootp-libload-tests', 'dhcp-bootp-libload-tests',
'load_unload_unittests.cc', 'load_unload_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_bootp_libload_tests = executable(
f'-DLIBDHCP_BOOTP_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/bootp/libdhcp_bootp.so"', f'-DLIBDHCP_BOOTP_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/bootp/libdhcp_bootp.so"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: LIBS_BUILT_SO_FAR, link_with: LIBS_BUILT_SO_FAR,
) )
test('dhcp_bootp_libload_tests', dhcp_bootp_libload_tests, protocol: 'gtest') test('dhcp_bootp_libload_tests', dhcp_bootp_libload_tests, protocol: 'gtest')

3
src/hooks/dhcp/bootp/tests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_bootp_lib_tests = executable( dhcp_bootp_lib_tests = executable(
'dhcp-bootp-lib-tests', 'dhcp-bootp-lib-tests',
'bootp_unittests.cc', 'bootp_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_bootp_lib_tests = executable(
f'-DBOOTP_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/bootp/libdhcp_bootp.so"', f'-DBOOTP_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/bootp/libdhcp_bootp.so"',
], ],
dependencies: [gtest], dependencies: [gtest],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: [dhcp_bootp_archive] + LIBS_BUILT_SO_FAR, link_with: [dhcp_bootp_archive] + LIBS_BUILT_SO_FAR,
) )
test('dhcp_bootp_lib_tests', dhcp_bootp_lib_tests, protocol: 'gtest') test('dhcp_bootp_lib_tests', dhcp_bootp_lib_tests, protocol: 'gtest')

3
src/hooks/dhcp/flex_option/libloadtests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_flex_option_libload_tests = executable( dhcp_flex_option_libload_tests = executable(
'dhcp-flex-option-libload-tests', 'dhcp-flex-option-libload-tests',
'callout_unittests.cc', 'callout_unittests.cc',
@@ -12,7 +11,7 @@ dhcp_flex_option_libload_tests = executable(
f'-DFLEX_OPTION_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/flex_option/libdhcp_flex_option.so"', f'-DFLEX_OPTION_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/flex_option/libdhcp_flex_option.so"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: LIBS_BUILT_SO_FAR, link_with: LIBS_BUILT_SO_FAR,
) )
test( test(

3
src/hooks/dhcp/flex_option/tests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_flex_option_lib_tests = executable( dhcp_flex_option_lib_tests = executable(
'dhcp-flex-option-lib-tests', 'dhcp-flex-option-lib-tests',
'flex_option_unittests.cc', 'flex_option_unittests.cc',
@@ -12,7 +11,7 @@ dhcp_flex_option_lib_tests = executable(
f'-DFLEX_OPTION_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/flex_option/libdhcp_flex_option.so"', f'-DFLEX_OPTION_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/flex_option/libdhcp_flex_option.so"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: [dhcp_flex_option_archive] + LIBS_BUILT_SO_FAR, link_with: [dhcp_flex_option_archive] + LIBS_BUILT_SO_FAR,
) )
test('dhcp_flex_option_lib_tests', dhcp_flex_option_lib_tests, protocol: 'gtest') test('dhcp_flex_option_lib_tests', dhcp_flex_option_lib_tests, protocol: 'gtest')

3
src/hooks/dhcp/high_availability/libloadtests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_ha_libload_tests = executable( dhcp_ha_libload_tests = executable(
'dhcp-ha-libload-tests', 'dhcp-ha-libload-tests',
'close_unittests.cc', 'close_unittests.cc',
@@ -12,7 +11,7 @@ dhcp_ha_libload_tests = executable(
f'-DLIBDHCP_HA_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/high_availability/libdhcp_ha.so"', f'-DLIBDHCP_HA_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/high_availability/libdhcp_ha.so"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: LIBS_BUILT_SO_FAR, link_with: LIBS_BUILT_SO_FAR,
) )
test('dhcp_ha_libload_tests', dhcp_ha_libload_tests, protocol: 'gtest') test('dhcp_ha_libload_tests', dhcp_ha_libload_tests, protocol: 'gtest')

3
src/hooks/dhcp/high_availability/tests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_ha_lib_tests = executable( dhcp_ha_lib_tests = executable(
'dhcp-ha-lib-tests', 'dhcp-ha-lib-tests',
'command_creator_unittest.cc', 'command_creator_unittest.cc',
@@ -23,7 +22,7 @@ dhcp_ha_lib_tests = executable(
f'-DTEST_HTTP_DIR="@TOP_SOURCE_DIR@/src/lib/http/tests/testdata"', f'-DTEST_HTTP_DIR="@TOP_SOURCE_DIR@/src/lib/http/tests/testdata"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: [dhcp_ha_archive] + [kea_testutils_lib] + LIBS_BUILT_SO_FAR, link_with: [dhcp_ha_archive] + [kea_testutils_lib] + LIBS_BUILT_SO_FAR,
) )
test( test(

3
src/hooks/dhcp/lease_cmds/libloadtests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_lease_cmds_libload_tests = executable( dhcp_lease_cmds_libload_tests = executable(
'dhcp-lease-cmds-libload-tests', 'dhcp-lease-cmds-libload-tests',
'load_unload_unittests.cc', 'load_unload_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_lease_cmds_libload_tests = executable(
f'-DLIBDHCP_LEASE_CMDS_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/lease_cmds/libdhcp_lease_cmds.so"', f'-DLIBDHCP_LEASE_CMDS_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/lease_cmds/libdhcp_lease_cmds.so"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: LIBS_BUILT_SO_FAR, link_with: LIBS_BUILT_SO_FAR,
) )
test( test(

3
src/hooks/dhcp/lease_cmds/tests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_lease_cmds_lib_tests = executable( dhcp_lease_cmds_lib_tests = executable(
'dhcp-lease-cmds-lib-tests', 'dhcp-lease-cmds-lib-tests',
'lease_cmds4_unittest.cc', 'lease_cmds4_unittest.cc',
@@ -13,7 +12,7 @@ dhcp_lease_cmds_lib_tests = executable(
f'-DLEASE_CMDS_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/lease_cmds/libdhcp_lease_cmds.so"', f'-DLEASE_CMDS_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/lease_cmds/libdhcp_lease_cmds.so"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: [dhcp_lease_cmds_archive] + LIBS_BUILT_SO_FAR, link_with: [dhcp_lease_cmds_archive] + LIBS_BUILT_SO_FAR,
) )
test('dhcp_lease_cmds_lib_tests', dhcp_lease_cmds_lib_tests, protocol: 'gtest') test('dhcp_lease_cmds_lib_tests', dhcp_lease_cmds_lib_tests, protocol: 'gtest')

3
src/hooks/dhcp/mysql/libloadtests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_mysql_libload_tests = executable( dhcp_mysql_libload_tests = executable(
'dhcp-mysql-libload-tests', 'dhcp-mysql-libload-tests',
'load_unload_unittests.cc', 'load_unload_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_mysql_libload_tests = executable(
f'-DLIBDHCP_MYSQL_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/mysql/libdhcp_mysql.so"', f'-DLIBDHCP_MYSQL_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/mysql/libdhcp_mysql.so"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: LIBS_BUILT_SO_FAR, link_with: LIBS_BUILT_SO_FAR,
) )
test('dhcp_mysql_libload_tests', dhcp_mysql_libload_tests, protocol: 'gtest') test('dhcp_mysql_libload_tests', dhcp_mysql_libload_tests, protocol: 'gtest')

3
src/hooks/dhcp/mysql/tests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
libs_testutils = [ libs_testutils = [
kea_dhcpsrv_testutils_lib, kea_dhcpsrv_testutils_lib,
kea_mysql_testutils_lib, kea_mysql_testutils_lib,
@@ -21,7 +20,7 @@ dhcp_mysql_lib_tests = executable(
'mysql_lease_mgr_unittest.cc', 'mysql_lease_mgr_unittest.cc',
'run_unittests.cc', 'run_unittests.cc',
dependencies: [gtest, crypto, mysql], dependencies: [gtest, crypto, mysql],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: [dhcp_mysql_archive] + libs_testutils + LIBS_BUILT_SO_FAR, link_with: [dhcp_mysql_archive] + libs_testutils + LIBS_BUILT_SO_FAR,
) )
test( test(

3
src/hooks/dhcp/perfmon/libloadtests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_perfmon_libload_tests = executable( dhcp_perfmon_libload_tests = executable(
'dhcp-perfmon-libload-tests', 'dhcp-perfmon-libload-tests',
'load_unload_unittests.cc', 'load_unload_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_perfmon_libload_tests = executable(
f'-DLIBDHCP_PERFMON_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/perfmon/libdhcp_perfmon.so"', f'-DLIBDHCP_PERFMON_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/perfmon/libdhcp_perfmon.so"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: LIBS_BUILT_SO_FAR, link_with: LIBS_BUILT_SO_FAR,
) )
test('dhcp_perfmon_libload_tests', dhcp_perfmon_libload_tests, protocol: 'gtest') test('dhcp_perfmon_libload_tests', dhcp_perfmon_libload_tests, protocol: 'gtest')

3
src/hooks/dhcp/perfmon/tests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_perfmon_lib_tests = executable( dhcp_perfmon_lib_tests = executable(
'dhcp-perfmon-lib-tests', 'dhcp-perfmon-lib-tests',
'alarm_parser_unittests.cc', 'alarm_parser_unittests.cc',
@@ -17,7 +16,7 @@ dhcp_perfmon_lib_tests = executable(
f'-DPERFMON_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/perfmon/libdhcp_perfmon.so"', f'-DPERFMON_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/perfmon/libdhcp_perfmon.so"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: [dhcp_perfmon_archive] + [kea_testutils_lib] + LIBS_BUILT_SO_FAR, link_with: [dhcp_perfmon_archive] + [kea_testutils_lib] + LIBS_BUILT_SO_FAR,
) )
test('dhcp_perfmon_lib_tests', dhcp_perfmon_lib_tests, protocol: 'gtest') test('dhcp_perfmon_lib_tests', dhcp_perfmon_lib_tests, protocol: 'gtest')

3
src/hooks/dhcp/pgsql/libloadtests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_pgsql_libload_tests = executable( dhcp_pgsql_libload_tests = executable(
'dhcp-pgsql-libload-tests', 'dhcp-pgsql-libload-tests',
'load_unload_unittests.cc', 'load_unload_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_pgsql_libload_tests = executable(
f'-DLIBDHCP_PGSQL_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/pgsql/libdhcp_pgsql.so"', f'-DLIBDHCP_PGSQL_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/pgsql/libdhcp_pgsql.so"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: LIBS_BUILT_SO_FAR, link_with: LIBS_BUILT_SO_FAR,
) )
test('dhcp_pgsql_libload_tests', dhcp_pgsql_libload_tests, protocol: 'gtest') test('dhcp_pgsql_libload_tests', dhcp_pgsql_libload_tests, protocol: 'gtest')

3
src/hooks/dhcp/pgsql/tests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
libs_testutils = [ libs_testutils = [
kea_dhcpsrv_testutils_lib, kea_dhcpsrv_testutils_lib,
kea_pgsql_testutils_lib, kea_pgsql_testutils_lib,
@@ -21,7 +20,7 @@ dhcp_pgsql_lib_tests = executable(
'pgsql_lease_mgr_unittest.cc', 'pgsql_lease_mgr_unittest.cc',
'run_unittests.cc', 'run_unittests.cc',
dependencies: [gtest, crypto, postgresql], dependencies: [gtest, crypto, postgresql],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: [dhcp_pgsql_archive] + libs_testutils + LIBS_BUILT_SO_FAR, link_with: [dhcp_pgsql_archive] + libs_testutils + LIBS_BUILT_SO_FAR,
) )
test( test(

5
src/hooks/dhcp/run_script/libloadtests/meson.build
View File

@@ -1,8 +1,7 @@
if not gtest.found() if not gtest.found()
subdir_done() subdir_done()
endif endif
hook_includes = [include_directories('..')]
HOOK_INCLUDES = [include_directories('..')]
dhcp_run_script_libload_tests = executable( dhcp_run_script_libload_tests = executable(
'dhcp-run-script-libload-tests', 'dhcp-run-script-libload-tests',
'load_unload_unittests.cc', 'load_unload_unittests.cc',
@@ -12,7 +11,7 @@ dhcp_run_script_libload_tests = executable(
f'-DRUN_SCRIPT_TEST_SH="@TOP_BUILD_DIR@/src/hooks/dhcp/run_script/tests/run_script_test.sh"', f'-DRUN_SCRIPT_TEST_SH="@TOP_BUILD_DIR@/src/hooks/dhcp/run_script/tests/run_script_test.sh"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: LIBS_BUILT_SO_FAR, link_with: LIBS_BUILT_SO_FAR,
) )
test( test(

5
src/hooks/dhcp/run_script/tests/meson.build
View File

@@ -11,7 +11,6 @@ configure_file(
) )
current_build_dir = meson.current_build_dir() current_build_dir = meson.current_build_dir()
hook_includes = [include_directories('..')]
dhcp_run_script_lib_tests = executable( dhcp_run_script_lib_tests = executable(
'dhcp-run-script-lib-tests', 'dhcp-run-script-lib-tests',
'run_script_unittests.cc', 'run_script_unittests.cc',
@@ -19,10 +18,10 @@ dhcp_run_script_lib_tests = executable(
cpp_args: [ cpp_args: [
f'-DRUN_SCRIPT_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/run_script/libdhcp_run_script.so"', 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"', f'-DRUN_SCRIPT_TEST_SH="@current_build_dir@/run_script_test.sh"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + hook_includes, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: [dhcp_run_script_archive] + LIBS_BUILT_SO_FAR, link_with: [dhcp_run_script_archive] + LIBS_BUILT_SO_FAR,
) )
test('dhcp_run_script_lib_tests', dhcp_run_script_lib_tests, protocol: 'gtest') test('dhcp_run_script_lib_tests', dhcp_run_script_lib_tests, protocol: 'gtest')

3
src/hooks/dhcp/stat_cmds/libloadtests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_stat_cmds_libload_tests = executable( dhcp_stat_cmds_libload_tests = executable(
'dhcp-stat-cmds-libload-tests', 'dhcp-stat-cmds-libload-tests',
'load_unload_unittests.cc', 'load_unload_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_stat_cmds_libload_tests = executable(
f'-DLIBDHCP_STAT_CMDS_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/stat_cmds/libdhcp_stat_cmds.so"', f'-DLIBDHCP_STAT_CMDS_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/stat_cmds/libdhcp_stat_cmds.so"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: LIBS_BUILT_SO_FAR, link_with: LIBS_BUILT_SO_FAR,
) )
test( test(

3
src/hooks/dhcp/stat_cmds/tests/meson.build
View File

@@ -2,7 +2,6 @@ if not gtest.found()
subdir_done() subdir_done()
endif endif
HOOK_INCLUDES = [include_directories('..')]
dhcp_stat_cmds_lib_tests = executable( dhcp_stat_cmds_lib_tests = executable(
'dhcp-stat-cmds-lib-tests', 'dhcp-stat-cmds-lib-tests',
'run_unittests.cc', 'run_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_stat_cmds_lib_tests = executable(
f'-DSTAT_CMDS_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/stat_cmds/libdhcp_stat_cmds.so"', f'-DSTAT_CMDS_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/stat_cmds/libdhcp_stat_cmds.so"',
], ],
dependencies: [gtest, crypto], dependencies: [gtest, crypto],
include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: [dhcp_stat_cmds_archive] + LIBS_BUILT_SO_FAR, link_with: [dhcp_stat_cmds_archive] + LIBS_BUILT_SO_FAR,
) )
test('dhcp_stat_cmds_lib_tests', dhcp_stat_cmds_lib_tests, protocol: 'gtest') test('dhcp_stat_cmds_lib_tests', dhcp_stat_cmds_lib_tests, protocol: 'gtest')

3
src/hooks/dhcp/user_chk/tests/meson.build
View File

@@ -10,7 +10,6 @@ configure_file(
configuration: dhcp_user_chk_config_data, configuration: dhcp_user_chk_config_data,
) )
hook_includes = [include_directories('..')]
current_build_dir = meson.current_build_dir() current_build_dir = meson.current_build_dir()
dhcp_user_chk_lib_tests = executable( dhcp_user_chk_lib_tests = executable(
'dhcp-user-chk-lib-tests', 'dhcp-user-chk-lib-tests',
@@ -21,7 +20,7 @@ dhcp_user_chk_lib_tests = executable(
'userid_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], dependencies: [gtest],
include_directories: [include_directories('.')] + INCLUDES + hook_includes, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
link_with: [dhcp_user_chk_archive] + LIBS_BUILT_SO_FAR, link_with: [dhcp_user_chk_archive] + LIBS_BUILT_SO_FAR,
) )
test('dhcp_user_chk_lib_tests', dhcp_user_chk_lib_tests, protocol: 'gtest') test('dhcp_user_chk_lib_tests', dhcp_user_chk_lib_tests, protocol: 'gtest')

5
src/share/api/meson.build
View File

@@ -1,5 +1,4 @@
list = run_command('grabber.sh', check: true) list = run_command('grabber.sh', check: true)
api_files = list.stdout().strip().split('\n') api_files = list.stdout().strip().split('\n')
DATADIR = get_option('datadir') install_dir = f'@DATADIR@/kea/api'
INSTALL_DIR = f'@DATADIR@/kea/api' install_data(api_files, install_dir: install_dir)
install_data(api_files, install_dir: INSTALL_DIR)

11
src/share/database/scripts/mysql/meson.build
View File

@@ -1,18 +1,17 @@
DATADIR = get_option('datadir') install_dir = f'@DATADIR@/kea/scripts/mysql'
INSTALL_DIR = f'@DATADIR@/kea/scripts/mysql'
configure_file( configure_file(
input: 'dhcpdb_create.mysql', input: 'dhcpdb_create.mysql',
output: 'dhcpdb_create.mysql', output: 'dhcpdb_create.mysql',
copy: true, copy: true,
install: true, install: true,
install_dir: INSTALL_DIR, install_dir: install_dir,
) )
configure_file( configure_file(
input: 'dhcpdb_drop.mysql', input: 'dhcpdb_drop.mysql',
output: 'dhcpdb_drop.mysql', output: 'dhcpdb_drop.mysql',
copy: true, copy: true,
install: true, install: true,
install_dir: INSTALL_DIR, install_dir: install_dir,
) )
mysql_scripts_conf_data = configuration_data() mysql_scripts_conf_data = configuration_data()
@@ -25,7 +24,7 @@ configure_file(
output: 'wipe_data.sh', output: 'wipe_data.sh',
configuration: mysql_scripts_conf_data, configuration: mysql_scripts_conf_data,
install: true, install: true,
install_dir: INSTALL_DIR, install_dir: install_dir,
) )
upgrade_scripts = [ upgrade_scripts = [
'upgrade_001.0_to_002.0.sh', 'upgrade_001.0_to_002.0.sh',
@@ -79,6 +78,6 @@ foreach file : upgrade_scripts
output: file, output: file,
configuration: mysql_scripts_conf_data, configuration: mysql_scripts_conf_data,
install: true, install: true,
install_dir: INSTALL_DIR, install_dir: install_dir,
) )
endforeach endforeach

11
src/share/database/scripts/pgsql/meson.build
View File

@@ -1,18 +1,17 @@
DATADIR = get_option('datadir') install_dir = f'@DATADIR@/kea/scripts/pgsql'
INSTALL_DIR = f'@DATADIR@/kea/scripts/pgsql'
configure_file( configure_file(
input: 'dhcpdb_create.pgsql', input: 'dhcpdb_create.pgsql',
output: 'dhcpdb_create.pgsql', output: 'dhcpdb_create.pgsql',
copy: true, copy: true,
install: true, install: true,
install_dir: INSTALL_DIR, install_dir: install_dir,
) )
configure_file( configure_file(
input: 'dhcpdb_drop.pgsql', input: 'dhcpdb_drop.pgsql',
output: 'dhcpdb_drop.pgsql', output: 'dhcpdb_drop.pgsql',
copy: true, copy: true,
install: true, install: true,
install_dir: INSTALL_DIR, install_dir: install_dir,
) )
pgsql_scripts_conf_data = configuration_data() pgsql_scripts_conf_data = configuration_data()
@@ -25,7 +24,7 @@ configure_file(
output: 'wipe_data.sh', output: 'wipe_data.sh',
configuration: pgsql_scripts_conf_data, configuration: pgsql_scripts_conf_data,
install: true, install: true,
install_dir: INSTALL_DIR, install_dir: install_dir,
) )
upgrade_scripts = [ upgrade_scripts = [
'upgrade_001.0_to_002.0.sh', 'upgrade_001.0_to_002.0.sh',
@@ -74,6 +73,6 @@ foreach file : upgrade_scripts
output: file, output: file,
configuration: pgsql_scripts_conf_data, configuration: pgsql_scripts_conf_data,
install: true, install: true,
install_dir: INSTALL_DIR, install_dir: install_dir,
) )
endforeach endforeach