[#3730] Added generate messages

diff --git a/meson.build b/meson.build
index 8ff23e033d74ae2d551d5df45f3d99894767e9fb..fd4ec04a9ed052ebdd9174ae64b9afcb463bb1a2 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -669,6 +669,7 @@ config_report = custom_target(
 #### Build Starts Here
 
 LIBS_BUILT_SO_FAR = []
+TARGETS_GEN_MESSAGES = []
 subdir('tools')
 subdir('src')
 subdir('fuzz')
@@ -677,4 +678,17 @@ if have_premium
     subdir('premium')
 endif
 
+alias_target('all-targets-gen-messages', TARGETS_GEN_MESSAGES)
+
+top_docs = [
+    'AUTHORS',
+    'COPYING',
+    'ChangeLog',
+    'README',
+    'CONTRIBUTING.md',
+    'SECURITY.md',
+    'platforms.rst',
+    'code_of_conduct.md',
+]
+install_data(top_docs, install_dir: 'share/doc/kea')
 install_emptydir('var/run/kea')

diff --git a/src/bin/agent/meson.build b/src/bin/agent/meson.build
index cc3a942f02d7400ae9b2536fe04acd3925669072..dc7731209fe133fa90e4623c07debbad8f107b0a 100644 (file)
--- a/src/bin/agent/meson.build
+++ b/src/bin/agent/meson.build
@@ -24,3 +24,12 @@ executable(
     link_with: [agent_lib] + LIBS_BUILT_SO_FAR,
 )
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-bin-agent-ca_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/ca_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/bin/dhcp4/meson.build b/src/bin/dhcp4/meson.build
index 4d08bd7d285d538f6873a414136b110efb5e2d6e..d8084ca743f5f61b0a6788ede814341d529e6ad1 100644 (file)
--- a/src/bin/dhcp4/meson.build
+++ b/src/bin/dhcp4/meson.build
@@ -23,3 +23,12 @@ executable(
     link_with: [dhcp4_lib] + LIBS_BUILT_SO_FAR,
 )
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-bin-dhcp4-dhcp4_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/dhcp4_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/bin/dhcp6/meson.build b/src/bin/dhcp6/meson.build
index d46e2aed96f61d90a3192be853194ac46cebe235..9ea8ed620906f39880fe54642408564126a21bfb 100644 (file)
--- a/src/bin/dhcp6/meson.build
+++ b/src/bin/dhcp6/meson.build
@@ -24,3 +24,12 @@ executable(
     link_with: [dhcp6_lib] + LIBS_BUILT_SO_FAR,
 )
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-bin-dhcp6-dhcp6_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/dhcp6_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/bin/lfc/meson.build b/src/bin/lfc/meson.build
index f66e251580645298f8adea0c1164740129968ba4..cfc57042550e045f2cd19d132dba4a048a521cc7 100644 (file)
--- a/src/bin/lfc/meson.build
+++ b/src/bin/lfc/meson.build
@@ -14,3 +14,12 @@ executable(
     link_with: [lfc_lib] + LIBS_BUILT_SO_FAR,
 )
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-bin-lfc-lfc_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/lfc_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/bin/netconf/meson.build b/src/bin/netconf/meson.build
index 8df690567c7db4d1fa5c77e93918251635f7334a..813c1a6e11a4cb5d61c51e39d2f324970e7d0c7e 100644 (file)
--- a/src/bin/netconf/meson.build
+++ b/src/bin/netconf/meson.build
@@ -37,3 +37,15 @@ executable(
 )
 
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-bin-netconf-netconf_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/netconf_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/bootp/meson.build b/src/hooks/dhcp/bootp/meson.build
index ea7519550f9557a0e94551177520a589eae0b1e8..3e605f5f6bce2b27fb924d183f5501c88a286643 100644 (file)
--- a/src/hooks/dhcp/bootp/meson.build
+++ b/src/hooks/dhcp/bootp/meson.build
@@ -16,3 +16,12 @@ dhcp_bootp_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-bootp-bootp_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/bootp_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/flex_option/meson.build b/src/hooks/dhcp/flex_option/meson.build
index 281ea5373f79a1434eaebb355d0dde4b25fabe1e..0d113cecb8634404337da9328743cae6863783b3 100644 (file)
--- a/src/hooks/dhcp/flex_option/meson.build
+++ b/src/hooks/dhcp/flex_option/meson.build
@@ -18,3 +18,15 @@ dhcp_flex_option_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-flex_option-flex_option_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/flex_option_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/high_availability/meson.build b/src/hooks/dhcp/high_availability/meson.build
index 3f8669cadadff019ec62476f1087e96186bf91f1..16cc26ac5727fc10930a105db5f6865c887aef18 100644 (file)
--- a/src/hooks/dhcp/high_availability/meson.build
+++ b/src/hooks/dhcp/high_availability/meson.build
@@ -27,3 +27,12 @@ dhcp_ha_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-high_availability-ha_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/ha_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/lease_cmds/meson.build b/src/hooks/dhcp/lease_cmds/meson.build
index 311f4b9bfcdf810fa6c5d494e86e90b05cdc0b47..e03dbc0b32f0a6f146b2b6bbe648c7ce446cd89c 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/meson.build
+++ b/src/hooks/dhcp/lease_cmds/meson.build
@@ -20,3 +20,15 @@ dhcp_lease_cmds_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-lease_cmds-lease_cmds_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/lease_cmds_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/mysql/meson.build b/src/hooks/dhcp/mysql/meson.build
index 7cb1c5cfa193b019600be1a35dbc8c0ef6886694..2d17e3d5fd845b31aba2f5e686d8424e862749e1 100644 (file)
--- a/src/hooks/dhcp/mysql/meson.build
+++ b/src/hooks/dhcp/mysql/meson.build
@@ -30,3 +30,31 @@ dhcp_mysql_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-mysql-mysql_cb_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/mysql_cb_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-mysql-mysql_hb_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/mysql_hb_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-mysql-mysql_lb_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/mysql_lb_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/perfmon/meson.build b/src/hooks/dhcp/perfmon/meson.build
index 2b5a22a35d2700fa9ecb8093867a1500a34fba37..b8c31b704de2345c18e3f1ba2fc2c07be70f18a7 100644 (file)
--- a/src/hooks/dhcp/perfmon/meson.build
+++ b/src/hooks/dhcp/perfmon/meson.build
@@ -23,3 +23,15 @@ dhcp_perfmon_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-perfmon-perfmon_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/perfmon_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/pgsql/meson.build b/src/hooks/dhcp/pgsql/meson.build
index 9b412cc571dfe7cfa786e7ae4398fb5306104052..278363ecbbb6ec235be663d1a9d06d1e6c86c7fb 100644 (file)
--- a/src/hooks/dhcp/pgsql/meson.build
+++ b/src/hooks/dhcp/pgsql/meson.build
@@ -30,3 +30,31 @@ dhcp_pgsql_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-pgsql-pgsql_cb_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/pgsql_cb_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-pgsql-pgsql_hb_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/pgsql_hb_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-pgsql-pgsql_lb_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/pgsql_lb_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/run_script/meson.build b/src/hooks/dhcp/run_script/meson.build
index 8ef91cdf56e9dda0f5d8b229f0a0eeb5afcce64c..10bc51c33241ea5d06964c69a63edcfa77c1ee73 100644 (file)
--- a/src/hooks/dhcp/run_script/meson.build
+++ b/src/hooks/dhcp/run_script/meson.build
@@ -19,3 +19,15 @@ dhcp_run_script_archive = static_library(
 # Do tests first
 subdir('tests')
 subdir('libloadtests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-run_script-run_script_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/run_script_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/stat_cmds/meson.build b/src/hooks/dhcp/stat_cmds/meson.build
index b166119dea228e1e0e161704e42031737bdd3500..31e4c928d8de23ae3be2b99148ea5051731259a8 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/meson.build
+++ b/src/hooks/dhcp/stat_cmds/meson.build
@@ -18,3 +18,14 @@ dhcp_stat_cmds_archive = static_library(
 )
 subdir('libloadtests')
 subdir('tests')
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-stat_cmds-stat_cmds_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/stat_cmds_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/hooks/dhcp/user_chk/meson.build b/src/hooks/dhcp/user_chk/meson.build
index 981b772b7a64672bb7170b64b8f037b796c9157d..ebeb42436c256adfd5aae2715d246370cf2a781b 100644 (file)
--- a/src/hooks/dhcp/user_chk/meson.build
+++ b/src/hooks/dhcp/user_chk/meson.build
@@ -22,3 +22,15 @@ dhcp_user_chk_archive = static_library(
     objects: dhcp_user_chk_lib.extract_all_objects(recursive: false),
 )
 subdir('tests')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-hooks-dhcp-user_chk-user_chk_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/user_chk_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/asiodns/meson.build b/src/lib/asiodns/meson.build
index 8a2bf5029fc6765931777387a27d59831960e092..a54f65a1186849e295e10cd1f0d4f7efdbba852c 100644 (file)
--- a/src/lib/asiodns/meson.build
+++ b/src/lib/asiodns/meson.build
@@ -12,3 +12,15 @@ LIBS_BUILT_SO_FAR = [kea_asiodns_lib] + LIBS_BUILT_SO_FAR
 subdir('tests')
 kea_asiodns_headers = ['asiodns_messages.h', 'io_fetch.h', 'logger.h']
 install_headers(kea_asiodns_headers, preserve_path: true, subdir: 'kea/asiodns')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-asiodns-asiodns_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/asiodns_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/config/meson.build b/src/lib/config/meson.build
index ec99f408a82591c093d620cb0c42c1fdc105b394..e409f77f11a41c4ce757e9b6b953985f88c91e11 100644 (file)
--- a/src/lib/config/meson.build
+++ b/src/lib/config/meson.build
@@ -41,3 +41,12 @@ kea_config_headers = [
     'unix_command_mgr.h',
 ]
 install_headers(kea_config_headers, preserve_path: true, subdir: 'kea/config')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-config-config_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/config_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/d2srv/meson.build b/src/lib/d2srv/meson.build
index a436c8f97b677c9bf447ee32cdaa8d02e467866d..3ffd92d40922c7143781619924a298fdaaae4b3f 100644 (file)
--- a/src/lib/d2srv/meson.build
+++ b/src/lib/d2srv/meson.build
@@ -34,3 +34,12 @@ kea_d2srv_headers = [
     'nc_trans.h',
 ]
 install_headers(kea_d2srv_headers, preserve_path: true, subdir: 'kea/d2srv')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-d2srv-d2_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/d2_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/database/meson.build b/src/lib/database/meson.build
index 5e3b2b95ca601a8a512be378cfea0609878dda1e..b4d758319ae86e891215c9583c61d56746ce716d 100644 (file)
--- a/src/lib/database/meson.build
+++ b/src/lib/database/meson.build
@@ -34,3 +34,12 @@ install_headers(
     preserve_path: true,
     subdir: 'kea/database',
 )
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-database-db_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/db_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/dhcp_ddns/meson.build b/src/lib/dhcp_ddns/meson.build
index 922b65d9a2ae50c629a740288ce95d987eafc711..7b633b08d1ea9896f7b9c76dea2b5cdec1b582f0 100644 (file)
--- a/src/lib/dhcp_ddns/meson.build
+++ b/src/lib/dhcp_ddns/meson.build
@@ -24,3 +24,15 @@ install_headers(
     preserve_path: true,
     subdir: 'kea/dhcp_ddns',
 )
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-dhcp_ddns-dhcp_ddns_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/dhcp_ddns_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/dhcpsrv/meson.build b/src/lib/dhcpsrv/meson.build
index 1f8562b4696d124a2796c985295e9fb55e1fb26c..e6cb3b05fc42c397dd7c4d00cf9536b0f154a280 100644 (file)
--- a/src/lib/dhcpsrv/meson.build
+++ b/src/lib/dhcpsrv/meson.build
@@ -205,3 +205,33 @@ kea_dhcpsrv_headers = [
     'writable_host_data_source.h',
 ]
 install_headers(kea_dhcpsrv_headers, preserve_path: true, subdir: 'kea/dhcpsrv')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-dhcpsrv-alloc_engine_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/alloc_engine_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+    target_gen_messages = run_target(
+        'src-lib-dhcpsrv-dhcpsrv_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/dhcpsrv_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+    target_gen_messages = run_target(
+        'src-lib-dhcpsrv-hosts_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/hosts_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+    target_gen_messages = run_target(
+        'src-lib-dhcpsrv-fuzz_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/fuzz_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/eval/meson.build b/src/lib/eval/meson.build
index 7f6200073b68e38c4c57a0184342bfc3bf85386f..5df98aba27ace11da61cce2874180eb9042fa540 100644 (file)
--- a/src/lib/eval/meson.build
+++ b/src/lib/eval/meson.build
@@ -26,3 +26,12 @@ kea_eval_headers = [
     'token.h',
 ]
 install_headers(kea_eval_headers, preserve_path: true, subdir: 'kea/eval')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-eval-eval_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/eval_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/hooks/meson.build b/src/lib/hooks/meson.build
index c8808e551f50109a28cabfc44db61cea82dd71ef..b156cf8aaa11385812b74e991da8d11027fc486a 100644 (file)
--- a/src/lib/hooks/meson.build
+++ b/src/lib/hooks/meson.build
@@ -40,3 +40,12 @@ kea_hooks_headers = [
     'server_hooks.h',
 ]
 install_headers(kea_hooks_headers, preserve_path: true, subdir: 'kea/hooks')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-hooks-hooks_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/hooks_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/http/meson.build b/src/lib/http/meson.build
index 601ac37362a54c0d17990342be3a0b21879065dd..a412213498f7868f48d0448fd8aad0bea89003d8 100644 (file)
--- a/src/lib/http/meson.build
+++ b/src/lib/http/meson.build
@@ -68,3 +68,17 @@ kea_http_headers = [
     'url.h',
 ]
 install_headers(kea_http_headers, preserve_path: true, subdir: 'kea/http')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-http-auth_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/auth_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+    target_gen_messages = run_target(
+        'src-lib-http-http_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/http_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/log/compiler/meson.build b/src/lib/log/compiler/meson.build
index c728597c6d68b2e22f94ead4dd86294f4546b2fa..1fcef3297272becc8051b7c023f1c5da7807f86e 100644 (file)
--- a/src/lib/log/compiler/meson.build
+++ b/src/lib/log/compiler/meson.build
@@ -1,6 +1,13 @@
-executable('kea-msg-compiler',
-  'message.cc',
-  include_directories: [include_directories('.')] + INCLUDES,
-  link_with : LIBS_BUILT_SO_FAR,
-  install : true,
+if meson.is_cross_build()
+    HAS_KEA_MSG_COMPILER = false
+    subdir_done()
+endif
+
+kea_msg_compiler = executable(
+    'kea-msg-compiler',
+    'message.cc',
+    include_directories: INCLUDES,
+    install_dir: 'bin',
+    link_with: LIBS_BUILT_SO_FAR,
 )
+HAS_KEA_MSG_COMPILER = true

diff --git a/src/lib/log/meson.build b/src/lib/log/meson.build
index cb667fd8d2f9c07edf2827f11228ad5670f9fcff..b651712baf38a57fe486044f3d3445bfd0771e9d 100644 (file)
--- a/src/lib/log/meson.build
+++ b/src/lib/log/meson.build
@@ -27,6 +27,7 @@ kea_log_lib = library(
     link_with: LIBS_BUILT_SO_FAR,
 )
 LIBS_BUILT_SO_FAR = [kea_log_lib] + LIBS_BUILT_SO_FAR
+subdir('compiler')
 subdir('tests')
 kea_log_headers = [
     'buffer_appender_impl.h',
@@ -53,3 +54,20 @@ kea_log_headers = [
     'output_option.h',
 ]
 install_headers(kea_log_headers, preserve_path: true, subdir: 'kea/log')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-log-log_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/log_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+    target_gen_messages = run_target(
+        'src-lib-log-logimpl_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/logimpl_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/log/tests/meson.build b/src/lib/log/tests/meson.build
index dd06b87b414be2bc907456409519f78262794076..3bfe8b9f4b78cfa6b09f6bc7ba38856a9077051d 100644 (file)
--- a/src/lib/log/tests/meson.build
+++ b/src/lib/log/tests/meson.build
@@ -89,3 +89,15 @@ foreach shtest : shtests
         priority: -1,
     )
 endforeach
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-log-tests-log_test_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/log_test_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/process/meson.build b/src/lib/process/meson.build
index 82bc68adbb130ccff985b23dadebad5cfac46e71..ba7ff1a3c7adac3ea3a69ef207100f82728c6689 100644 (file)
--- a/src/lib/process/meson.build
+++ b/src/lib/process/meson.build
@@ -38,3 +38,15 @@ kea_process_headers = [
     'redact_config.h',
 ]
 install_headers(kea_process_headers, preserve_path: true, subdir: 'kea/process')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-process-process_messages',
+        command: [
+            kea_msg_compiler,
+            f'@current_source_dir@/process_messages.mes',
+        ],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif

diff --git a/src/lib/tcp/meson.build b/src/lib/tcp/meson.build
index d4c10b3410da112eeac1d199f76757cb74aea4d6..b6b95cf7cec3d0b133fe036fdcd29a204c5a75d3 100644 (file)
--- a/src/lib/tcp/meson.build
+++ b/src/lib/tcp/meson.build
@@ -26,3 +26,12 @@ kea_tcp_headers = [
     'tcp_stream_msg.h',
 ]
 install_headers(kea_tcp_headers, preserve_path: true, subdir: 'kea/tcp')
+
+if HAS_KEA_MSG_COMPILER
+    current_source_dir = meson.current_source_dir()
+    target_gen_messages = run_target(
+        'src-lib-tcp-tcp_messages',
+        command: [kea_msg_compiler, f'@current_source_dir@/tcp_messages.mes'],
+    )
+    TARGETS_GEN_MESSAGES += [target_gen_messages]
+endif