From: Andrei Pavel Date: Wed, 30 Dec 2020 10:51:58 +0000 (+0200) Subject: [#1602] remove tools/.generated-files.txt X-Git-Tag: Kea-1.9.4~142 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=764e8f9788de75f20f8ce258707b423e53bb67e2;p=thirdparty%2Fkea.git [#1602] remove tools/.generated-files.txt --- diff --git a/tools/.generated-files.txt b/tools/.generated-files.txt deleted file mode 100644 index c9314561e4..0000000000 --- a/tools/.generated-files.txt +++ /dev/null @@ -1,112 +0,0 @@ -premium/src/hooks/dhcp/cb_cmds/cb_cmds_messages.cc -premium/src/hooks/dhcp/cb_cmds/cb_cmds_messages.h -premium/src/hooks/dhcp/class_cmds/class_cmds_messages.cc -premium/src/hooks/dhcp/class_cmds/class_cmds_messages.h -premium/src/hooks/dhcp/flex_id/flex_id_messages.cc -premium/src/hooks/dhcp/flex_id/flex_id_messages.h -premium/src/hooks/dhcp/forensic_log/legal_log_messages.cc -premium/src/hooks/dhcp/forensic_log/legal_log_messages.h -premium/src/hooks/dhcp/host_cache/host_cache_messages.cc -premium/src/hooks/dhcp/host_cache/host_cache_messages.h -premium/src/hooks/dhcp/host_cmds/host_cmds_messages.cc -premium/src/hooks/dhcp/host_cmds/host_cmds_messages.h -premium/src/hooks/dhcp/lease_query/lease_query_messages.cc -premium/src/hooks/dhcp/lease_query/lease_query_messages.h -premium/src/hooks/dhcp/radius/radius_messages.cc -premium/src/hooks/dhcp/radius/radius_messages.h -premium/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.cc -premium/src/hooks/dhcp/subnet_cmds/subnet_cmds_messages.h -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/agent/location.hh -src/bin/agent/position.hh -src/bin/agent/stack.hh -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/d2/location.hh -src/bin/d2/position.hh -src/bin/d2/stack.hh -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/dhcp4/location.hh -src/bin/dhcp4/position.hh -src/bin/dhcp4/stack.hh -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/dhcp6/location.hh -src/bin/dhcp6/position.hh -src/bin/dhcp6/stack.hh -src/bin/lfc/lfc_messages.cc -src/bin/lfc/lfc_messages.h -src/bin/netconf/location.hh -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/bin/netconf/position.hh -src/bin/netconf/stack.hh -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/config/config_messages.cc -src/lib/config/config_messages.h -src/lib/database/db_messages.cc -src/lib/database/db_messages.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/dns/rrclass.h -src/lib/dns/rrparamregistry.cc -src/lib/dns/rrtype.h -src/lib/eval/eval_messages.cc -src/lib/eval/eval_messages.h -src/lib/eval/lexer.cc -src/lib/eval/location.hh -src/lib/eval/parser.cc -src/lib/eval/parser.h -src/lib/eval/position.hh -src/lib/eval/stack.hh -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 cb522c8777..6ba2d6693c 100755 --- a/tools/add-config-h.sh +++ b/tools/add-config-h.sh @@ -97,8 +97,8 @@ mandatory_commands() { done } -# Generated files will be filtered out. Hardcoded list -filtered_out=$(cat "${root_path}/tools/.generated-files.txt") +# Generated files will be filtered out. +filtered_out=$("${root_path}/tools/print-generated-files.sh") 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 05e6c7cc7b..bd3f63aaed 100755 --- a/tools/check-for-duplicate-includes.sh +++ b/tools/check-for-duplicate-includes.sh @@ -101,8 +101,8 @@ posix_diff() { # Get root path. root_path=$(cd "$(dirname "${0}")/.." && pwd) -# Generated files will be filtered out. Hardcoded list -filtered_out=$(cat "${root_path}/tools/.generated-files.txt") +# Generated files will be filtered out. +filtered_out=$("${root_path}/tools/print-generated-files.sh") # Exceptions: # src/lib/asiolink/asio_wrapper.h includes in both # conditionals of an #ifdef. diff --git a/tools/print-generated-files.sh b/tools/print-generated-files.sh index da0de42f6f..080df861d8 100755 --- a/tools/print-generated-files.sh +++ b/tools/print-generated-files.sh @@ -39,7 +39,7 @@ print_usage() { Options: [-d|--debug] enable debug mode, showing every executed command [-h|--help] print usage (this text) - [-a|--amend] amend tools/.generated-files.txt and .gitattributes + [-a|--amend] amend .gitattributes ' \ "$(basename "${0}")" } @@ -62,7 +62,7 @@ while test ${#} -gt 0; do # [-h|--help] print usage (this text). '-h'|'--help') print_usage ;; - # [-a|--amend] amend tools/.generated-files.txt and .gitattributes + # [-a|--amend] amend .gitattributes '-a'|'--amend') amend=true ;; # Unrecognized argument @@ -173,9 +173,6 @@ print_all_sorted() { mandatory_commands cut find grep sort if "${amend}"; then - # Write to tools/.generated-files.txt - print_all_sorted > ./tools/.generated-files.txt - # Write to .gitattributes. find . -type f -name '.gitattributes' -exec rm -f {} \; for i in $(print_all_sorted false); do