From: Remi Gacogne Date: Tue, 3 Jun 2025 08:22:28 +0000 (+0200) Subject: dnsdist: Rename dnsdist-configuration-yaml-items-generated-pre-in.cc X-Git-Tag: dnsdist-2.0.0-beta1~39^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33741a6ee9c4cc886435fa0734ce251ddc06c15a;p=thirdparty%2Fpdns.git dnsdist: Rename dnsdist-configuration-yaml-items-generated-pre-in.cc Signed-off-by: Remi Gacogne --- diff --git a/pdns/dnsdistdist/dnsdist-rust-lib/Makefile.am b/pdns/dnsdistdist/dnsdist-rust-lib/Makefile.am index cfd2756e1f..741b53c152 100644 --- a/pdns/dnsdistdist/dnsdist-rust-lib/Makefile.am +++ b/pdns/dnsdistdist/dnsdist-rust-lib/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = \ - dnsdist-configuration-yaml-items-generated-pre-in.cc \ - dnsdist-configuration-yaml-items-generated.cc \ + dnsdist-configuration-yaml-items-pre-in.cc \ dnsdist-settings-generator.py \ rust-pre-in.rs \ rust-middle-in.rs \ @@ -12,7 +11,7 @@ BUILT_SOURCES=rust/src/lib.rs \ all: rust/src/lib.rs dnsdist-configuration-yaml-items-generated.cc -rust/src/lib.rs dnsdist-configuration-yaml-items-generated.cc: dnsdist-settings-generator.py ../dnsdist-settings-definitions.yml rust-pre-in.rs rust-middle-in.rs rust-post-in.rs dnsdist-configuration-yaml-items-generated-pre-in.cc ../dnsdist-actions-definitions.yml ../dnsdist-response-actions-definitions.yml ../dnsdist-selectors-definitions.yml +rust/src/lib.rs dnsdist-configuration-yaml-items-generated.cc: dnsdist-settings-generator.py ../dnsdist-settings-definitions.yml rust-pre-in.rs rust-middle-in.rs rust-post-in.rs dnsdist-configuration-yaml-items-pre-in.cc ../dnsdist-actions-definitions.yml ../dnsdist-response-actions-definitions.yml ../dnsdist-selectors-definitions.yml @if test "$(PYTHON)" = ":"; then echo "Settings definitions have changed, python is needed to regenerate the related settings files but python was not found. Please install python and re-run configure"; exit 1; fi @if ! $(PYTHON) --version | grep -q "Python 3"; then echo $(PYTHON) should be at least version 3. Please install python 3 and re-run configure; exit 1; fi $(MAKE) -C rust clean diff --git a/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-configuration-yaml-items-generated-pre-in.cc b/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-configuration-yaml-items-pre-in.cc similarity index 100% rename from pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-configuration-yaml-items-generated-pre-in.cc rename to pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-configuration-yaml-items-pre-in.cc diff --git a/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py b/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py index 27dc9fd40b..7f16067675 100644 --- a/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py +++ b/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py @@ -310,7 +310,7 @@ def include_file(out_fp, include_file_name): def generate_flat_settings_for_cxx(definitions, src_dir, out_file_path, build_dir_path): cxx_flat_settings_fp = get_temporary_file_for_generated_code(out_file_path) - include_file(cxx_flat_settings_fp, src_dir + '/dnsdist-configuration-yaml-items-generated-pre-in.cc') + include_file(cxx_flat_settings_fp, src_dir + '/dnsdist-configuration-yaml-items-pre-in.cc') # first we do runtime-settable settings cxx_flat_settings_fp.write('''#if defined(HAVE_YAML_CONFIGURATION) diff --git a/pdns/dnsdistdist/dnsdist-rust-lib/meson.build b/pdns/dnsdistdist/dnsdist-rust-lib/meson.build index 9abacc7dd4..1d2b7c18d7 100644 --- a/pdns/dnsdistdist/dnsdist-rust-lib/meson.build +++ b/pdns/dnsdistdist/dnsdist-rust-lib/meson.build @@ -1,7 +1,7 @@ sources = files( 'dnsdist-settings-generator.py', '../dnsdist-settings-definitions.yml', - 'dnsdist-configuration-yaml-items-generated-pre-in.cc', + 'dnsdist-configuration-yaml-items-pre-in.cc', 'rust-pre-in.rs', 'rust-middle-in.rs', 'rust-post-in.rs',