From 237a8b3b6d86b679cc68b268d3f112c853832e72 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Wed, 5 Feb 2025 01:10:44 +0100 Subject: [PATCH] [#3729] Updated meson.build files --- meson.build | 5 +- src/lib/asiodns/tests/meson.build | 4 ++ src/lib/asiolink/meson.build | 4 +- src/lib/asiolink/tests/meson.build | 4 ++ src/lib/asiolink/testutils/meson.build | 4 ++ src/lib/cc/tests/meson.build | 4 ++ src/lib/config/meson.build | 4 +- src/lib/config_backend/tests/meson.build | 4 ++ src/lib/cryptolink/tests/meson.build | 4 ++ src/lib/database/meson.build | 4 +- src/lib/database/tests/meson.build | 4 ++ src/lib/database/testutils/meson.build | 4 ++ src/lib/dhcp/meson.build | 22 ++++---- src/lib/dhcp_ddns/tests/meson.build | 4 ++ src/lib/dhcpsrv/meson.build | 22 ++++---- src/lib/dns/meson.build | 6 +- src/lib/dns/tests/meson.build | 4 ++ src/lib/eval/meson.build | 2 +- src/lib/eval/tests/meson.build | 4 ++ src/lib/exceptions/tests/meson.build | 4 ++ src/lib/hooks/meson.build | 6 +- src/lib/http/meson.build | 8 +-- src/lib/log/interprocess/tests/meson.build | 4 ++ src/lib/log/tests/meson.build | 4 ++ src/lib/mysql/tests/meson.build | 4 ++ src/lib/mysql/testutils/meson.build | 5 +- src/lib/pgsql/tests/meson.build | 4 ++ src/lib/pgsql/testutils/meson.build | 5 +- src/lib/process/meson.build | 2 +- src/lib/stats/tests/meson.build | 4 ++ src/lib/tcp/meson.build | 2 +- src/lib/testutils/meson.build | 4 ++ src/lib/util/tests/meson.build | 4 ++ src/lib/util/unittests/meson.build | 4 ++ src/lib/yang/meson.build | 4 +- src/share/database/scripts/mysql/meson.build | 48 +++++++++++++++- src/share/database/scripts/pgsql/meson.build | 58 ++++++++++++++++---- 37 files changed, 230 insertions(+), 57 deletions(-) diff --git a/meson.build b/meson.build index 9fc51f2193..c6b4a174e8 100644 --- a/meson.build +++ b/meson.build @@ -19,6 +19,10 @@ TOP_SOURCE_DIR = meson.current_source_dir() KEA_ADMIN = f'@TOP_BUILD_DIR@/src/bin/admin/kea-admin' KEA_LFC = f'@TOP_BUILD_DIR@/src/bin/lfc/kea-lfc' TEST_CA_DIR = f'@TOP_SOURCE_DIR@/src/lib/asiolink/testutils/ca' +DATABASE_SCRIPTS_DIR = f'@TOP_BUILD_DIR@/src/share/database/scripts' +RUN_STATE_DIR = get_option('localstatedir') +PREFIX = get_option('prefix') +DHCP_DATA_DIR = f'@PREFIX@/@RUN_STATE_DIR@/run/kea' # TODO: Control it via a build option. FUZZING_IN_CI = false @@ -290,7 +294,6 @@ message(f'Detected system "@SYSTEM@".') #### System-specific Compiler Flags -PREFIX = get_option('prefix') if SYSTEM == 'darwin' add_project_arguments('-D__APPLE_USE_RFC_3542', language: 'cpp') add_project_link_arguments(f'-Wl,-rpath,@PREFIX@/lib', language: 'cpp') diff --git a/src/lib/asiodns/tests/meson.build b/src/lib/asiodns/tests/meson.build index 8f088f5821..d0e99f9be7 100644 --- a/src/lib/asiodns/tests/meson.build +++ b/src/lib/asiodns/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_asiodns_tests = executable( 'kea-asiodns-tests', 'io_fetch_unittest.cc', diff --git a/src/lib/asiolink/meson.build b/src/lib/asiolink/meson.build index fcbb94117c..decfb60ae9 100644 --- a/src/lib/asiolink/meson.build +++ b/src/lib/asiolink/meson.build @@ -25,8 +25,8 @@ subdir('testutils') subdir('tests') kea_asiolink_headers = [ 'addr_utilities.h', - 'asiolink.h', 'asio_wrapper.h', + 'asiolink.h', 'botan_tls.h', 'botan_wrapper.h', 'common_tls.h', @@ -52,9 +52,9 @@ kea_asiolink_headers = [ 'tls_socket.h', 'udp_endpoint.h', 'udp_socket.h', + 'unix_domain_socket.h', 'unix_domain_socket_acceptor.h', 'unix_domain_socket_endpoint.h', - 'unix_domain_socket.h', ] install_headers( kea_asiolink_headers, diff --git a/src/lib/asiolink/tests/meson.build b/src/lib/asiolink/tests/meson.build index d84f512aee..04f03b45f8 100644 --- a/src/lib/asiolink/tests/meson.build +++ b/src/lib/asiolink/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + CURRENT_BUILD_DIR = meson.current_build_dir() configure_file( input: 'process_spawn_app.sh.in', diff --git a/src/lib/asiolink/testutils/meson.build b/src/lib/asiolink/testutils/meson.build index fafe6b9c7d..3cbf1860e7 100644 --- a/src/lib/asiolink/testutils/meson.build +++ b/src/lib/asiolink/testutils/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_asiolink_testutils_lib = static_library( 'kea-asiolink-testutils', 'test_tls.cc', diff --git a/src/lib/cc/tests/meson.build b/src/lib/cc/tests/meson.build index f271113ecf..f51220514b 100644 --- a/src/lib/cc/tests/meson.build +++ b/src/lib/cc/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_cc_tests = executable( 'kea-cc-tests', 'command_interpreter_unittests.cc', diff --git a/src/lib/config/meson.build b/src/lib/config/meson.build index b4130268f5..5387ee25a5 100644 --- a/src/lib/config/meson.build +++ b/src/lib/config/meson.build @@ -24,8 +24,8 @@ kea_config_headers = [ 'base_command_mgr.h', 'client_connection.h', 'cmd_http_listener.h', - 'cmd_response_creator_factory.h', 'cmd_response_creator.h', + 'cmd_response_creator_factory.h', 'cmds_impl.h', 'command_mgr.h', 'config_log.h', @@ -33,8 +33,8 @@ kea_config_headers = [ 'hooked_command_mgr.h', 'http_command_config.h', 'http_command_mgr.h', - 'http_command_response_creator_factory.h', 'http_command_response_creator.h', + 'http_command_response_creator_factory.h', 'timeouts.h', 'unix_command_config.h', 'unix_command_mgr.h', diff --git a/src/lib/config_backend/tests/meson.build b/src/lib/config_backend/tests/meson.build index 1c9f30849f..eda6565cf6 100644 --- a/src/lib/config_backend/tests/meson.build +++ b/src/lib/config_backend/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_config_backend_tests = executable( 'kea-config_backend-tests', 'config_backend_mgr_unittest.cc', diff --git a/src/lib/cryptolink/tests/meson.build b/src/lib/cryptolink/tests/meson.build index 0ec4e66046..aec940ae4f 100644 --- a/src/lib/cryptolink/tests/meson.build +++ b/src/lib/cryptolink/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_cryptolink_tests = executable( 'kea-cryptolink-tests', 'crypto_unittests.cc', diff --git a/src/lib/database/meson.build b/src/lib/database/meson.build index 5b01dcbe24..374ad068c3 100644 --- a/src/lib/database/meson.build +++ b/src/lib/database/meson.build @@ -22,12 +22,12 @@ kea_database_headers = [ 'audit_entry.h', 'backend_selector.h', 'database_connection.h', - 'dbaccess_parser.h', 'db_exceptions.h', 'db_log.h', 'db_messages.h', - 'server_collection.h', + 'dbaccess_parser.h', 'server.h', + 'server_collection.h', 'server_selector.h', ] install_headers( diff --git a/src/lib/database/tests/meson.build b/src/lib/database/tests/meson.build index 781e5254d4..742fbf6781 100644 --- a/src/lib/database/tests/meson.build +++ b/src/lib/database/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_database_tests = executable( 'kea-database-tests', 'audit_entry_unittest.cc', diff --git a/src/lib/database/testutils/meson.build b/src/lib/database/testutils/meson.build index 36fca23c40..4f198804d5 100644 --- a/src/lib/database/testutils/meson.build +++ b/src/lib/database/testutils/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_database_testutils_lib = static_library( 'kea-database-testutils', 'schema.cc', diff --git a/src/lib/dhcp/meson.build b/src/lib/dhcp/meson.build index 0206596c07..e74be1a7ae 100644 --- a/src/lib/dhcp/meson.build +++ b/src/lib/dhcp/meson.build @@ -66,13 +66,14 @@ kea_dhcp_headers = [ 'dhcp4.h', 'dhcp6.h', 'docsis3_option_defs.h', - 'duid_factory.h', 'duid.h', + 'duid_factory.h', 'hwaddr.h', - 'iface_mgr_error_handler.h', 'iface_mgr.h', + 'iface_mgr_error_handler.h', 'libdhcp++.h', 'opaque_data_tuple.h', + 'option.h', 'option4_addrlst.h', 'option4_client_fqdn.h', 'option4_dnr.h', @@ -80,8 +81,8 @@ kea_dhcp_headers = [ 'option6_auth.h', 'option6_client_fqdn.h', 'option6_dnr.h', - 'option6_iaaddr.h', 'option6_ia.h', + 'option6_iaaddr.h', 'option6_iaprefix.h', 'option6_pdexclude.h', 'option6_status_code.h', @@ -89,30 +90,29 @@ kea_dhcp_headers = [ 'option_custom.h', 'option_data_types.h', 'option_definition.h', - 'option.h', - 'option_int_array.h', 'option_int.h', + 'option_int_array.h', 'option_opaque_data_tuples.h', - 'option_space_container.h', 'option_space.h', + 'option_space_container.h', 'option_string.h', - 'option_vendor_class.h', 'option_vendor.h', + 'option_vendor_class.h', 'packet_queue.h', + 'packet_queue_mgr.h', 'packet_queue_mgr4.h', 'packet_queue_mgr6.h', - 'packet_queue_mgr.h', 'packet_queue_ring.h', + 'pkt.h', 'pkt4.h', 'pkt4o6.h', 'pkt6.h', + 'pkt_filter.h', 'pkt_filter6.h', 'pkt_filter_bpf.h', - 'pkt_filter.h', - 'pkt_filter_inet6.h', 'pkt_filter_inet.h', + 'pkt_filter_inet6.h', 'pkt_filter_lpf.h', - 'pkt.h', 'pkt_template.h', 'protocol_util.h', 'socket_info.h', diff --git a/src/lib/dhcp_ddns/tests/meson.build b/src/lib/dhcp_ddns/tests/meson.build index 434156a8a4..6a632243fc 100644 --- a/src/lib/dhcp_ddns/tests/meson.build +++ b/src/lib/dhcp_ddns/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_dhcp_ddns_tests = executable( 'kea-dhcp_ddns-tests', 'ncr_udp_unittests.cc', diff --git a/src/lib/dhcpsrv/meson.build b/src/lib/dhcpsrv/meson.build index 4208db59eb..96599c582d 100644 --- a/src/lib/dhcpsrv/meson.build +++ b/src/lib/dhcpsrv/meson.build @@ -86,7 +86,7 @@ kea_dhcpsrv_lib = library( 'timer_mgr.cc', 'tracking_lease_mgr.cc', cpp_args: [ - f'-DDHCP_DATA_DIR="@TOP_BUILD_DIR@"', + f'-DDHCP_DATA_DIR="@DHCP_DATA_DIR@"', f'-DKEA_LFC_EXECUTABLE="@KEA_LFC@"', ], dependencies: [crypto], @@ -97,17 +97,17 @@ kea_dhcpsrv_lib = library( ) LIBS_BUILT_SO_FAR = [kea_dhcpsrv_lib] + LIBS_BUILT_SO_FAR kea_dhcpsrv_headers = [ - 'allocation_state.h', - 'allocator.h', 'alloc_engine.h', 'alloc_engine_log.h', 'alloc_engine_messages.h', + 'allocation_state.h', + 'allocator.h', 'base_host_data_source.h', 'cache_host_data_source.h', 'callout_handle_store.h', + 'cb_ctl_dhcp.h', 'cb_ctl_dhcp4.h', 'cb_ctl_dhcp6.h', - 'cb_ctl_dhcp.h', 'cfg_4o6.h', 'cfg_consistency.h', 'cfg_db_access.h', @@ -119,14 +119,14 @@ kea_dhcpsrv_headers = [ 'cfg_hosts_util.h', 'cfg_iface.h', 'cfg_mac_source.h', - 'cfgmgr.h', 'cfg_multi_threading.h', - 'cfg_option_def.h', 'cfg_option.h', + 'cfg_option_def.h', 'cfg_rsoo.h', 'cfg_shared_networks.h', 'cfg_subnets4.h', 'cfg_subnets6.h', + 'cfgmgr.h', 'client_class_def.h', 'config_backend_dhcp4.h', 'config_backend_dhcp4_mgr.h', @@ -148,9 +148,9 @@ kea_dhcpsrv_headers = [ 'flq_allocator.h', 'fuzz_log.h', 'fuzz_messages.h', + 'host.h', 'host_container.h', 'host_data_source_factory.h', - 'host.h', 'host_mgr.h', 'hosts_log.h', 'hosts_messages.h', @@ -159,11 +159,11 @@ kea_dhcpsrv_headers = [ 'iterative_allocation_state.h', 'iterative_allocator.h', 'key_from_key.h', + 'lease.h', 'lease_file_loader.h', 'lease_file_stats.h', - 'lease.h', - 'lease_mgr_factory.h', 'lease_mgr.h', + 'lease_mgr_factory.h', 'memfile_lease_limits.h', 'memfile_lease_mgr.h', 'memfile_lease_storage.h', @@ -177,14 +177,14 @@ kea_dhcpsrv_headers = [ 'parsers/dhcp_queue_control_parser.h', 'parsers/duid_config_parser.h', 'parsers/expiration_config_parser.h', - 'parsers/host_reservations_list_parser.h', 'parsers/host_reservation_parser.h', + 'parsers/host_reservations_list_parser.h', 'parsers/ifaces_config_parser.h', 'parsers/multi_threading_config_parser.h', 'parsers/option_data_parser.h', 'parsers/sanity_checks_parser.h', - 'parsers/shared_networks_list_parser.h', 'parsers/shared_network_parser.h', + 'parsers/shared_networks_list_parser.h', 'parsers/simple_parser4.h', 'parsers/simple_parser6.h', 'pool.h', diff --git a/src/lib/dns/meson.build b/src/lib/dns/meson.build index 7395b1e436..94403310e9 100644 --- a/src/lib/dns/meson.build +++ b/src/lib/dns/meson.build @@ -42,16 +42,16 @@ kea_dns_headers = [ 'master_lexer.h', 'master_lexer_inputsource.h', 'master_lexer_state.h', - 'master_loader_callbacks.h', 'master_loader.h', + 'master_loader_callbacks.h', 'message.h', 'messagerenderer.h', 'name.h', 'opcode.h', 'question.h', 'rcode.h', - 'rdataclass.h', 'rdata.h', + 'rdataclass.h', 'rrclass.h', 'rrparamregistry.h', 'rrset.h', @@ -59,8 +59,8 @@ kea_dns_headers = [ 'rrtype.h', 'serial.h', 'time_utils.h', - 'tsigerror.h', 'tsig.h', + 'tsigerror.h', 'tsigkey.h', 'tsigrecord.h', 'txt_like.h', diff --git a/src/lib/dns/tests/meson.build b/src/lib/dns/tests/meson.build index 64b80b714d..455d0c0af7 100644 --- a/src/lib/dns/tests/meson.build +++ b/src/lib/dns/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_dns_tests = executable( 'kea-dns-tests', 'dns_exceptions_unittest.cc', diff --git a/src/lib/eval/meson.build b/src/lib/eval/meson.build index 71d6bf8641..a69b4912a1 100644 --- a/src/lib/eval/meson.build +++ b/src/lib/eval/meson.build @@ -18,8 +18,8 @@ LIBS_BUILT_SO_FAR = [kea_eval_lib] + LIBS_BUILT_SO_FAR subdir('tests') kea_eval_headers = [ 'dependency.h', - 'eval_context_decl.h', 'eval_context.h', + 'eval_context_decl.h', 'eval_log.h', 'eval_messages.h', 'evaluate.h', diff --git a/src/lib/eval/tests/meson.build b/src/lib/eval/tests/meson.build index 46aca6af70..2ebabb121c 100644 --- a/src/lib/eval/tests/meson.build +++ b/src/lib/eval/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_eval_tests = executable( 'kea-eval-tests', 'boolean_unittest.cc', diff --git a/src/lib/exceptions/tests/meson.build b/src/lib/exceptions/tests/meson.build index 6bdcceb907..2349b2a29a 100644 --- a/src/lib/exceptions/tests/meson.build +++ b/src/lib/exceptions/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_exceptions_tests = executable( 'kea-exceptions-tests', 'exceptions_unittest.cc', diff --git a/src/lib/hooks/meson.build b/src/lib/hooks/meson.build index e613807aa0..ff51d8dad9 100644 --- a/src/lib/hooks/meson.build +++ b/src/lib/hooks/meson.build @@ -22,19 +22,19 @@ kea_hooks_lib = library( ) LIBS_BUILT_SO_FAR = [kea_hooks_lib] + LIBS_BUILT_SO_FAR kea_hooks_headers = [ - 'callout_handle_associate.h', 'callout_handle.h', + 'callout_handle_associate.h', 'callout_manager.h', - 'hooks_config.h', 'hooks.h', + 'hooks_config.h', 'hooks_log.h', 'hooks_manager.h', 'hooks_messages.h', 'hooks_parser.h', 'libinfo.h', 'library_handle.h', - 'library_manager_collection.h', 'library_manager.h', + 'library_manager_collection.h', 'parking_lots.h', 'pointer_converter.h', 'server_hooks.h', diff --git a/src/lib/http/meson.build b/src/lib/http/meson.build index 7df8fe538f..b829068b18 100644 --- a/src/lib/http/meson.build +++ b/src/lib/http/meson.build @@ -36,8 +36,8 @@ kea_http_headers = [ 'auth_config.h', 'auth_log.h', 'auth_messages.h', - 'basic_auth_config.h', 'basic_auth.h', + 'basic_auth_config.h', 'cfg_http_header.h', 'client.h', 'connection.h', @@ -55,13 +55,13 @@ kea_http_headers = [ 'listener_impl.h', 'post_request.h', 'post_request_json.h', - 'request_context.h', 'request.h', + 'request_context.h', 'request_parser.h', + 'response.h', 'response_context.h', - 'response_creator_factory.h', 'response_creator.h', - 'response.h', + 'response_creator_factory.h', 'response_json.h', 'response_parser.h', 'url.h', diff --git a/src/lib/log/interprocess/tests/meson.build b/src/lib/log/interprocess/tests/meson.build index b4bee667cc..9073165829 100644 --- a/src/lib/log/interprocess/tests/meson.build +++ b/src/lib/log/interprocess/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_log_interprocess_tests = executable( 'kea-log-interprocess-tests', 'interprocess_sync_file_unittest.cc', diff --git a/src/lib/log/tests/meson.build b/src/lib/log/tests/meson.build index 445c2e638e..433e3d717c 100644 --- a/src/lib/log/tests/meson.build +++ b/src/lib/log/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_log_tests = executable( 'kea-log-tests', 'buffer_appender_unittest.cc', diff --git a/src/lib/mysql/tests/meson.build b/src/lib/mysql/tests/meson.build index 7efaac3ba9..072ee040f1 100644 --- a/src/lib/mysql/tests/meson.build +++ b/src/lib/mysql/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + libs_testutils = [ kea_mysql_testutils_lib, kea_database_testutils_lib, diff --git a/src/lib/mysql/testutils/meson.build b/src/lib/mysql/testutils/meson.build index 3edbda1747..3eddcb6f25 100644 --- a/src/lib/mysql/testutils/meson.build +++ b/src/lib/mysql/testutils/meson.build @@ -1,4 +1,7 @@ -DATABASE_SCRIPTS_DIR = f'@TOP_BUILD_DIR@/src/share/database/scripts' +if not gtest.found() + subdir_done() +endif + kea_mysql_testutils_lib = static_library( 'kea-mysql-testutils', 'mysql_schema.cc', diff --git a/src/lib/pgsql/tests/meson.build b/src/lib/pgsql/tests/meson.build index e3a97d07e5..1ccd29f738 100644 --- a/src/lib/pgsql/tests/meson.build +++ b/src/lib/pgsql/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + libs_testutils = [ kea_pgsql_testutils_lib, kea_database_testutils_lib, diff --git a/src/lib/pgsql/testutils/meson.build b/src/lib/pgsql/testutils/meson.build index 06ca630ca4..c9f58e0592 100644 --- a/src/lib/pgsql/testutils/meson.build +++ b/src/lib/pgsql/testutils/meson.build @@ -1,4 +1,7 @@ -DATABASE_SCRIPTS_DIR = f'@TOP_BUILD_DIR@/src/share/database/scripts' +if not gtest.found() + subdir_done() +endif + kea_pgsql_testutils_lib = static_library( 'kea-pgsql-testutils', 'pgsql_schema.cc', diff --git a/src/lib/process/meson.build b/src/lib/process/meson.build index 0f6cef14a2..7f836d193f 100644 --- a/src/lib/process/meson.build +++ b/src/lib/process/meson.build @@ -12,7 +12,7 @@ kea_process_lib = library( 'log_parser.cc', 'process_messages.cc', 'redact_config.cc', - cpp_args: [f'-DDATA_DIR="@TOP_BUILD_DIR@"'], + cpp_args: [f'-DDATA_DIR="@DHCP_DATA_DIR@"'], dependencies: [boost], include_directories: [include_directories('.')] + INCLUDES, install: true, diff --git a/src/lib/stats/tests/meson.build b/src/lib/stats/tests/meson.build index 7f25125fea..910360db44 100644 --- a/src/lib/stats/tests/meson.build +++ b/src/lib/stats/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_stats_tests = executable( 'kea-stats-tests', 'context_unittest.cc', diff --git a/src/lib/tcp/meson.build b/src/lib/tcp/meson.build index 5ef4f3e1ad..d466f3c476 100644 --- a/src/lib/tcp/meson.build +++ b/src/lib/tcp/meson.build @@ -16,8 +16,8 @@ kea_tcp_lib = library( LIBS_BUILT_SO_FAR = [kea_tcp_lib] + LIBS_BUILT_SO_FAR kea_tcp_headers = [ 'mt_tcp_listener_mgr.h', - 'tcp_connection_acceptor.h', 'tcp_connection.h', + 'tcp_connection_acceptor.h', 'tcp_connection_pool.h', 'tcp_listener.h', 'tcp_log.h', diff --git a/src/lib/testutils/meson.build b/src/lib/testutils/meson.build index 719675e4c6..bb8a2fc6cd 100644 --- a/src/lib/testutils/meson.build +++ b/src/lib/testutils/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_testutils_lib = static_library( 'kea-testutils', 'io_utils.cc', diff --git a/src/lib/util/tests/meson.build b/src/lib/util/tests/meson.build index be98fb8d45..cbfeb74bff 100644 --- a/src/lib/util/tests/meson.build +++ b/src/lib/util/tests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_util_tests = executable( 'kea-util-tests', 'bigint_unittest.cc', diff --git a/src/lib/util/unittests/meson.build b/src/lib/util/unittests/meson.build index a373ad130a..827ee45e13 100644 --- a/src/lib/util/unittests/meson.build +++ b/src/lib/util/unittests/meson.build @@ -1,3 +1,7 @@ +if not gtest.found() + subdir_done() +endif + kea_util_unittests_lib = static_library( 'kea-util-unittests', 'check_valgrind.cc', diff --git a/src/lib/yang/meson.build b/src/lib/yang/meson.build index c5c5f9520c..8d1d7896f5 100644 --- a/src/lib/yang/meson.build +++ b/src/lib/yang/meson.build @@ -32,18 +32,18 @@ kea_yang_lib = library( ) LIBS_BUILT_SO_FAR = [kea_yang_lib] + LIBS_BUILT_SO_FAR kea_yang_headers = [ - 'adaptor_config.h', 'adaptor.h', + 'adaptor_config.h', 'adaptor_host.h', 'adaptor_option.h', 'adaptor_pool.h', 'adaptor_subnet.h', 'netconf_error.h', + 'translator.h', 'translator_class.h', 'translator_config.h', 'translator_control_socket.h', 'translator_database.h', - 'translator.h', 'translator_host.h', 'translator_logger.h', 'translator_option_data.h', diff --git a/src/share/database/scripts/mysql/meson.build b/src/share/database/scripts/mysql/meson.build index 988704049e..2c39f8eff7 100644 --- a/src/share/database/scripts/mysql/meson.build +++ b/src/share/database/scripts/mysql/meson.build @@ -18,5 +18,51 @@ configure_file( output: 'dhcpdb_drop.mysql', copy: true, ) -# configure upgrade scripts +upgrade_scripts = [ + 'upgrade_001.0_to_002.0.sh', + 'upgrade_002.0_to_003.0.sh', + 'upgrade_003.0_to_004.0.sh', + 'upgrade_004.0_to_004.1.sh', + 'upgrade_004.1_to_005.0.sh', + 'upgrade_005.0_to_005.1.sh', + 'upgrade_005.1_to_005.2.sh', + 'upgrade_005.2_to_006.0.sh', + 'upgrade_006.0_to_007.0.sh', + 'upgrade_007.0_to_008.0.sh', + 'upgrade_008.0_to_008.1.sh', + 'upgrade_008.1_to_008.2.sh', + 'upgrade_008.2_to_009.0.sh', + 'upgrade_009.0_to_009.1.sh', + 'upgrade_009.1_to_009.2.sh', + 'upgrade_009.2_to_009.3.sh', + 'upgrade_009.3_to_009.4.sh', + 'upgrade_009.4_to_009.5.sh', + 'upgrade_009.5_to_009.6.sh', + 'upgrade_009.6_to_010.0.sh', + 'upgrade_010_to_011.sh', + 'upgrade_011_to_012.sh', + 'upgrade_012_to_013.sh', + 'upgrade_013_to_014.sh', + 'upgrade_014_to_015.sh', + 'upgrade_015_to_016.sh', + 'upgrade_016_to_017.sh', + 'upgrade_017_to_018.sh', + 'upgrade_018_to_019.sh', + 'upgrade_019_to_020.sh', + 'upgrade_020_to_021.sh', + 'upgrade_021_to_022.sh', + 'upgrade_022_to_023.sh', + 'upgrade_023_to_024.sh', + 'upgrade_024_to_025.sh', + 'upgrade_025_to_026.sh', + 'upgrade_026_to_027.sh', + 'upgrade_027_to_028.sh', +] +foreach file : upgrade_scripts + configure_file( + input: file + '.in', + output: file, + configuration: mysql_script_conf_data, + ) +endforeach # install diff --git a/src/share/database/scripts/pgsql/meson.build b/src/share/database/scripts/pgsql/meson.build index 15427d23f2..f179fd2d7d 100644 --- a/src/share/database/scripts/pgsql/meson.build +++ b/src/share/database/scripts/pgsql/meson.build @@ -1,15 +1,12 @@ -postgresql_script_conf_data = configuration_data() -postgresql_script_conf_data.set('prefix', get_option('prefix')) -postgresql_script_conf_data.set('abs_top_builddir', TOP_BUILD_DIR) -postgresql_script_conf_data.set( - 'datarootdir', - '${prefix}/' + get_option('datadir'), -) -postgresql_script_conf_data.set('PACKAGE_NAME', 'kea') +pgsql_script_conf_data = configuration_data() +pgsql_script_conf_data.set('prefix', get_option('prefix')) +pgsql_script_conf_data.set('abs_top_builddir', TOP_BUILD_DIR) +pgsql_script_conf_data.set('datarootdir', '${prefix}/' + get_option('datadir')) +pgsql_script_conf_data.set('PACKAGE_NAME', 'kea') configure_file( input: 'wipe_data.sh.in', output: 'wipe_data.sh', - configuration: postgresql_script_conf_data, + configuration: pgsql_script_conf_data, ) configure_file( input: 'dhcpdb_create.pgsql', @@ -21,5 +18,46 @@ configure_file( output: 'dhcpdb_drop.pgsql', copy: true, ) -# configure upgrade scripts +upgrade_scripts = [ + 'upgrade_001.0_to_002.0.sh', + 'upgrade_002.0_to_003.0.sh', + 'upgrade_003.0_to_003.1.sh', + 'upgrade_003.1_to_003.2.sh', + 'upgrade_003.2_to_003.3.sh', + 'upgrade_003.3_to_004.0.sh', + 'upgrade_004.0_to_005.0.sh', + 'upgrade_005.0_to_005.1.sh', + 'upgrade_005.1_to_006.0.sh', + 'upgrade_006.0_to_006.1.sh', + 'upgrade_006.1_to_006.2.sh', + 'upgrade_006.2_to_007.0.sh', + 'upgrade_007_to_008.sh', + 'upgrade_008_to_009.sh', + 'upgrade_009_to_010.sh', + 'upgrade_010_to_011.sh', + 'upgrade_011_to_012.sh', + 'upgrade_012_to_013.sh', + 'upgrade_013_to_014.sh', + 'upgrade_014_to_015.sh', + 'upgrade_015_to_016.sh', + 'upgrade_016_to_017.sh', + 'upgrade_017_to_018.sh', + 'upgrade_018_to_019.sh', + 'upgrade_019_to_020.sh', + 'upgrade_020_to_021.sh', + 'upgrade_021_to_022.sh', + 'upgrade_022_to_023.sh', + 'upgrade_023_to_024.sh', + 'upgrade_024_to_025.sh', + 'upgrade_025_to_026.sh', + 'upgrade_026_to_027.sh', + 'upgrade_027_to_028.sh', +] +foreach file : upgrade_scripts + configure_file( + input: file + '.in', + output: file, + configuration: pgsql_script_conf_data, + ) +endforeach # install -- 2.47.3