From: Andrei Pavel <andrei@isc.org>
Date: Tue, 22 Dec 2020 13:10:52 +0000 (+0200)
Subject: [#1602] centralize generated files
X-Git-Tag: Kea-1.9.4~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f032148383984866077b69166f972bb1291cb1c6;p=thirdparty%2Fkea.git

[#1602] centralize generated files
---

diff --git a/tools/.generated-files.txt b/tools/.generated-files.txt
new file mode 100644
index 0000000000..14463738f0
--- /dev/null
+++ b/tools/.generated-files.txt
@@ -0,0 +1,76 @@
+src/bin/agent/agent_lexer.cc
+src/bin/agent/agent_parser.cc
+src/bin/agent/agent_parser.h
+src/bin/agent/ca_messages.cc
+src/bin/agent/ca_messages.h
+src/bin/d2/d2_lexer.cc
+src/bin/d2/d2_messages.cc
+src/bin/d2/d2_messages.h
+src/bin/d2/d2_parser.cc
+src/bin/d2/d2_parser.h
+src/bin/dhcp4/dhcp4_lexer.cc
+src/bin/dhcp4/dhcp4_messages.cc
+src/bin/dhcp4/dhcp4_messages.h
+src/bin/dhcp4/dhcp4_parser.cc
+src/bin/dhcp4/dhcp4_parser.h
+src/bin/dhcp6/dhcp6_lexer.cc
+src/bin/dhcp6/dhcp6_messages.cc
+src/bin/dhcp6/dhcp6_messages.h
+src/bin/dhcp6/dhcp6_parser.cc
+src/bin/dhcp6/dhcp6_parser.h
+src/bin/lfc/lfc_messages.cc
+src/bin/lfc/lfc_messages.h
+src/bin/netconf/netconf_lexer.cc
+src/bin/netconf/netconf_messages.cc
+src/bin/netconf/netconf_messages.h
+src/bin/netconf/netconf_parser.cc
+src/bin/netconf/netconf_parser.h
+src/hooks/dhcp/bootp/bootp_messages.cc
+src/hooks/dhcp/bootp/bootp_messages.h
+src/hooks/dhcp/flex_option/flex_option_messages.cc
+src/hooks/dhcp/flex_option/flex_option_messages.h
+src/hooks/dhcp/high_availability/ha_messages.cc
+src/hooks/dhcp/high_availability/ha_messages.h
+src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc
+src/hooks/dhcp/lease_cmds/lease_cmds_messages.h
+src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc
+src/hooks/dhcp/mysql_cb/mysql_cb_messages.h
+src/hooks/dhcp/stat_cmds/stat_cmds_messages.cc
+src/hooks/dhcp/stat_cmds/stat_cmds_messages.h
+src/hooks/dhcp/user_chk/user_chk_messages.cc
+src/hooks/dhcp/user_chk/user_chk_messages.h
+src/lib/asiodns/asiodns_messages.cc
+src/lib/asiodns/asiodns_messages.h
+src/lib/cfgrpt/config_report.cc
+src/lib/cfgrpt/config_report.h
+src/lib/config/config_messages.cc
+src/lib/config/config_messages.h
+src/lib/database/db_messages.cc
+src/lib/database/db_messages.h
+src/lib/database/server_selector.cc
+src/lib/database/server_selector.h
+src/lib/dhcpsrv/alloc_engine_messages.cc
+src/lib/dhcpsrv/alloc_engine_messages.h
+src/lib/dhcpsrv/dhcpsrv_messages.cc
+src/lib/dhcpsrv/dhcpsrv_messages.h
+src/lib/dhcpsrv/fuzz_messages.cc
+src/lib/dhcpsrv/fuzz_messages.h
+src/lib/dhcpsrv/hosts_messages.cc
+src/lib/dhcpsrv/hosts_messages.h
+src/lib/dhcp_ddns/dhcp_ddns_messages.cc
+src/lib/dhcp_ddns/dhcp_ddns_messages.h
+src/lib/dns/rdataclass.cc
+src/lib/dns/rdataclass.h
+src/lib/eval/eval_messages.cc
+src/lib/eval/eval_messages.h
+src/lib/eval/lexer.cc
+src/lib/eval/parser.cc
+src/lib/eval/parser.h
+src/lib/hooks/hooks_messages.cc
+src/lib/hooks/hooks_messages.h
+src/lib/http/http_messages.cc
+src/lib/http/http_messages.h
+src/lib/log/tests/log_test_messages.cc
+src/lib/log/tests/log_test_messages.h
+src/lib/process/process_messages.cc
+src/lib/process/process_messages.h
diff --git a/tools/add-config-h.sh b/tools/add-config-h.sh
index 8c33f3d297..c6109a6d97 100755
--- a/tools/add-config-h.sh
+++ b/tools/add-config-h.sh
@@ -71,10 +71,17 @@ root_path=$(cd "$(dirname "${0}")/.." && pwd)
 # Get source files that are missing an '#include <config.h>' line.
 get_source_files() {
   mandatory_commands cut find grep sed sort uniq
-  source_files=$(cd "${root_path}" && find . -type f | grep -Fv '.git' | grep -E '\.cc$' | xargs grep -EL '#include\s*[\"|\<]config.h[\"|\>]' | cut -d ':' -f 1 | sort -uV | uniq)
+
+  # Get the files that are missing the include.
+  source_files=$(cd "${root_path}" && find . -type f | grep -Fv '.git' | \
+    grep -E '\.cc$' | xargs grep -EL '#include\s*[\"|\<]config.h[\"|\>]' | \
+    cut -d ':' -f 1 | sort -uV)
+
+  # Filter out generated files.
   for file in ${filtered_out}; do
-    source_files=$(printf '%s\n' "${source_files}" | sed "s#${file}##g" | sed '/^$/d')
+    source_files=$(printf '%s\n' "${source_files}" | grep -Fv "${file}" | sed '/^$/d')
   done
+
   printf '%s' "${source_files}"
 }
 
@@ -91,49 +98,7 @@ mandatory_commands() {
 }
 
 # Generated files will be filtered out. Hardcoded list
-filtered_out='
-  ./src/bin/admin/messages.cc
-  ./src/bin/agent/agent_lexer.cc
-  ./src/bin/agent/agent_parser.cc
-  ./src/bin/agent/ca_messages.cc
-  ./src/lib/cfgrpt/config_report.cc
-  ./src/bin/d2/d2_lexer.cc
-  ./src/bin/d2/d2_messages.cc
-  ./src/bin/d2/d2_parser.cc
-  ./src/bin/dhcp4/dhcp4_lexer.cc
-  ./src/bin/dhcp4/dhcp4_messages.cc
-  ./src/bin/dhcp4/dhcp4_parser.cc
-  ./src/bin/dhcp6/dhcp6_lexer.cc
-  ./src/bin/dhcp6/dhcp6_messages.cc
-  ./src/bin/dhcp6/dhcp6_parser.cc
-  ./src/bin/lfc/lfc_messages.cc
-  ./src/bin/netconf/netconf_lexer.cc
-  ./src/bin/netconf/netconf_messages.cc
-  ./src/bin/netconf/netconf_parser.cc
-  ./src/hooks/dhcp/bootp/bootp_messages.cc
-  ./src/hooks/dhcp/flex_option/flex_option_messages.cc
-  ./src/hooks/dhcp/high_availability/ha_messages.cc
-  ./src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc
-  ./src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc
-  ./src/hooks/dhcp/stat_cmds/stat_cmds_messages.cc
-  ./src/hooks/dhcp/user_chk/user_chk_messages.cc
-  ./src/lib/asiodns/asiodns_messages.cc
-  ./src/lib/config/config_messages.cc
-  ./src/lib/database/db_messages.cc
-  ./src/lib/database/server_selector.cc
-  ./src/lib/dhcp_ddns/dhcp_ddns_messages.cc
-  ./src/lib/dhcpsrv/alloc_engine_messages.cc
-  ./src/lib/dhcpsrv/dhcpsrv_messages.cc
-  ./src/lib/dhcpsrv/fuzz_messages.cc
-  ./src/lib/dhcpsrv/hosts_messages.cc
-  ./src/lib/eval/eval_messages.cc
-  ./src/lib/eval/lexer.cc
-  ./src/lib/eval/parser.cc
-  ./src/lib/hooks/hooks_messages.cc
-  ./src/lib/http/http_messages.cc
-  ./src/lib/log/tests/log_test_messages.cc
-  ./src/lib/process/process_messages.cc
-'
+filtered_out=$(cat "${root_path}/tools/.generated-files.txt")
 
 if "${name_only}"; then
   # Only display file names.
diff --git a/tools/check-for-duplicate-includes.sh b/tools/check-for-duplicate-includes.sh
index a47ae03f87..60d85acc82 100755
--- a/tools/check-for-duplicate-includes.sh
+++ b/tools/check-for-duplicate-includes.sh
@@ -97,52 +97,11 @@ posix_diff() {
   rm -f "${left_file}" "${right_file}"
 }
 
+# Get root path.
+root_path=$(cd "$(dirname "${0}")/.." && pwd)
+
 # Generated files will be filtered out. Hardcoded list
-filtered_out='
-  ./src/bin/admin/messages.cc
-  ./src/bin/agent/agent_lexer.cc
-  ./src/bin/agent/agent_parser.cc
-  ./src/bin/agent/ca_messages.cc
-  ./src/lib/cfgrpt/config_report.cc
-  ./src/lib/dns/rdataclass.h
-  ./src/lib/dns/rdataclass.cc
-  ./src/bin/d2/d2_lexer.cc
-  ./src/bin/d2/d2_messages.cc
-  ./src/bin/d2/d2_parser.cc
-  ./src/bin/dhcp4/dhcp4_lexer.cc
-  ./src/bin/dhcp4/dhcp4_messages.cc
-  ./src/bin/dhcp4/dhcp4_parser.cc
-  ./src/bin/dhcp6/dhcp6_lexer.cc
-  ./src/bin/dhcp6/dhcp6_messages.cc
-  ./src/bin/dhcp6/dhcp6_parser.cc
-  ./src/bin/lfc/lfc_messages.cc
-  ./src/bin/netconf/netconf_lexer.cc
-  ./src/bin/netconf/netconf_messages.cc
-  ./src/bin/netconf/netconf_parser.cc
-  ./src/hooks/dhcp/bootp/bootp_messages.cc
-  ./src/hooks/dhcp/flex_option/flex_option_messages.cc
-  ./src/hooks/dhcp/high_availability/ha_messages.cc
-  ./src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc
-  ./src/hooks/dhcp/mysql_cb/mysql_cb_messages.cc
-  ./src/hooks/dhcp/stat_cmds/stat_cmds_messages.cc
-  ./src/hooks/dhcp/user_chk/user_chk_messages.cc
-  ./src/lib/asiodns/asiodns_messages.cc
-  ./src/lib/config/config_messages.cc
-  ./src/lib/database/db_messages.cc
-  ./src/lib/database/server_selector.cc
-  ./src/lib/dhcp_ddns/dhcp_ddns_messages.cc
-  ./src/lib/dhcpsrv/alloc_engine_messages.cc
-  ./src/lib/dhcpsrv/dhcpsrv_messages.cc
-  ./src/lib/dhcpsrv/fuzz_messages.cc
-  ./src/lib/dhcpsrv/hosts_messages.cc
-  ./src/lib/eval/eval_messages.cc
-  ./src/lib/eval/lexer.cc
-  ./src/lib/eval/parser.cc
-  ./src/lib/hooks/hooks_messages.cc
-  ./src/lib/http/http_messages.cc
-  ./src/lib/log/tests/log_test_messages.cc
-  ./src/lib/process/process_messages.cc
-'
+filtered_out=$(cat "${root_path}/tools/.generated-files.txt")
 
 found=false
 for i in $(get_source_files); do