From: Otto Moerbeek Date: Mon, 3 Feb 2025 11:51:09 +0000 (+0100) Subject: Change directory structure: rename settings subdir int rec-rust-lib, libsettings... X-Git-Tag: dnsdist-2.0.0-alpha1~95^2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6241458b5f0706cf22f68178aaf4c4e49c5edd20;p=thirdparty%2Fpdns.git Change directory structure: rename settings subdir int rec-rust-lib, libsettings.a into librecrust.a --- diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am index 488fc8e926..b0bd9946d8 100644 --- a/pdns/recursordist/Makefile.am +++ b/pdns/recursordist/Makefile.am @@ -1,16 +1,16 @@ JSON11_LIBS = $(top_builddir)/ext/json11/libjson11.la PROBDS_LIBS = $(top_builddir)/ext/probds/libprobds.la ARC4RANDOM_LIBS = $(top_builddir)/ext/arc4random/libarc4random.la -RUST_LIBS = $(top_builddir)/settings/rust/libsettings.a $(LIBDL) +RUST_LIBS = $(top_builddir)/rec-rust-lib/rust/librecrust.a $(LIBDL) AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(LIBSODIUM_CFLAGS) $(NET_SNMP_CFLAGS) $(LIBCAP_CFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\" $(SYSTEMD_CFLAGS) AM_CPPFLAGS += \ -I$(top_srcdir)/ext/json11 \ -I$(top_srcdir)/ext/protozero/include \ - -I$(top_srcdir)/settings \ - -I$(top_builddir)/settings \ - -I$(top_srcdir)/settings/rust/src \ + -I$(top_srcdir)/rec-rust-lib \ + -I$(top_builddir)/rec-rust-lib \ + -I$(top_srcdir)/rec-rust-lib/rust/src \ $(YAHTTP_CFLAGS) \ $(LIBCRYPTO_INCLUDES) \ -DBOOST_CONTAINER_USE_STD_EXCEPTIONS @@ -53,8 +53,8 @@ htmlfiles.h: incfiles ${srcdir}/html/* ${srcdir}/html/js/* rec-metrics-gen%h rec-prometheus-gen%h rec-snmp-gen%h rec-oids-gen%h RECURSOR-MIB%txt: metrics.py metrics_table.py RECURSOR-MIB.in $(PYTHON) metrics.py -# We explicitly build settings in two steps, as settings modifies files in the settings/rust subdir -SUBDIRS=ext settings settings/rust +# We explicitly build rec-rust-lib in two steps, as it modifies files in the rec-rust-lib/rust subdir +SUBDIRS=ext rec-rust-lib rec-rust-lib/rust if LUA AM_CPPFLAGS +=$(LUA_CFLAGS) @@ -188,6 +188,7 @@ pdns_recursor_SOURCES = \ rec-main.hh rec-main.cc \ rec-protozero.cc rec-protozero.hh \ rec-responsestats.hh rec-responsestats.cc \ + rec-rust-lib/cxxsupport.cc \ rec-snmp.hh rec-snmp.cc \ rec-system-resolve.hh rec-system-resolve.cc \ rec-taskqueue.cc rec-taskqueue.hh \ @@ -211,7 +212,6 @@ pdns_recursor_SOURCES = \ rpzloader.cc rpzloader.hh \ secpoll-recursor.cc secpoll-recursor.hh \ secpoll.cc secpoll.hh \ - settings/cxxsupport.cc \ sha.hh \ sholder.hh \ shuffle.cc shuffle.hh \ @@ -242,7 +242,7 @@ pdns_recursor_SOURCES = \ zoneparser-tng.cc zoneparser-tng.hh nodist_pdns_recursor_SOURCES = \ - settings/cxxsettings-generated.cc + rec-rust-lib/cxxsettings-generated.cc if !HAVE_LUA_HPP BUILT_SOURCES += lua.hpp @@ -324,6 +324,7 @@ testrunner_SOURCES = \ rcpgenerator.cc \ rec-eventtrace.cc rec-eventtrace.hh \ rec-responsestats.hh rec-responsestats.cc \ + rec-rust-lib/cxxsupport.cc \ rec-system-resolve.hh rec-system-resolve.cc \ rec-taskqueue.cc rec-taskqueue.hh \ rec-tcounters.cc rec-tcounters.hh \ @@ -337,7 +338,6 @@ testrunner_SOURCES = \ root-dnssec.hh \ rpzloader.cc rpzloader.hh \ secpoll.cc \ - settings/cxxsupport.cc \ sholder.hh \ shuffle.cc shuffle.hh \ sillyrecords.cc \ @@ -407,7 +407,7 @@ testrunner_SOURCES = \ zoneparser-tng.cc zoneparser-tng.hh nodist_testrunner_SOURCES = \ - settings/cxxsettings-generated.cc + rec-rust-lib/cxxsettings-generated.cc testrunner_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -540,11 +540,11 @@ rec_control_SOURCES = \ qtype.cc \ rcpgenerator.cc rcpgenerator.hh \ rec-lua-conf.cc rec-lua-conf.hh \ + rec-rust-lib/cxxsupport.cc \ rec-system-resolve.cc rec-system-resolve.hh \ rec-web-stubs.hh \ rec_channel.cc rec_channel.hh \ rec_control.cc \ - settings/cxxsupport.cc \ sillyrecords.cc \ sortlist.cc sortlist.hh \ svc-records.cc svc-records.hh \ @@ -552,7 +552,7 @@ rec_control_SOURCES = \ unix_utility.cc nodist_rec_control_SOURCES = \ - settings/cxxsettings-generated.cc + rec-rust-lib/cxxsettings-generated.cc dnslabeltext.cc: dnslabeltext.rl $(AM_V_GEN)$(RAGEL) $< -o dnslabeltext.cc diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac index db122a4d95..84432232fd 100644 --- a/pdns/recursordist/configure.ac +++ b/pdns/recursordist/configure.ac @@ -192,8 +192,8 @@ AC_CONFIG_FILES([Makefile ext/probds/Makefile ext/yahttp/Makefile ext/yahttp/yahttp/Makefile - settings/Makefile - settings/rust/Makefile]) + rec-rust-lib/Makefile + rec-rust-lib/rust/Makefile]) AC_OUTPUT diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build index 5f276d25fc..1d2280c73a 100644 --- a/pdns/recursordist/meson.build +++ b/pdns/recursordist/meson.build @@ -74,7 +74,7 @@ subdir('meson' / 'libresolv') # res_query subdir('meson' / 'dnstap') # DNSTAP through libfstream subdir('meson' / 'libcurl') # Curl -subdir('settings') +subdir('rec-rust-lib') common_sources = [] @@ -299,7 +299,7 @@ dep_metrics = declare_dependency( deps = [ dep_pdns, dep_no_config_in_source, - dep_rust_settings, + dep_rust_recrust, dep_boost, dep_boost_context, dep_threads, @@ -397,7 +397,7 @@ librec_common = declare_dependency( config_h, dependencies: [ deps, - dep_settings_ch, + dep_recrust_ch, librec_dnslabeltext, ], ) @@ -424,8 +424,8 @@ tools = { dep_protozero, dep_yahttp_header_only, dep_json11, - dep_settings, - dep_rust_settings, + dep_recrust, + dep_rust_recrust, dep_systemd, librec_signers_openssl, librec_signers_sodium, @@ -437,8 +437,8 @@ tools = { 'manpages': ['rec_control.1'], 'deps-extra': [ dep_boost, - dep_settings, - dep_rust_settings, + dep_recrust, + dep_rust_recrust, ], }, } @@ -511,8 +511,8 @@ if get_option('unit-tests') dep_boost_test, dep_lua, dep_nod, - dep_settings, - dep_rust_settings, + dep_recrust, + dep_rust_recrust, librec_signers_openssl, librec_signers_sodium, ], diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc index 9e3ebb9765..0c2de94667 100644 --- a/pdns/recursordist/rec-main.cc +++ b/pdns/recursordist/rec-main.cc @@ -39,12 +39,12 @@ #include "secpoll-recursor.hh" #include "logging.hh" #include "dnsseckeeper.hh" -#include "settings/cxxsettings.hh" +#include "rec-rust-lib/cxxsettings.hh" #include "json.hh" #include "rec-system-resolve.hh" #include "root-dnssec.hh" #include "ratelimitedlog.hh" -#include "settings/rust/web.rs.h" +#include "rec-rust-lib/rust/web.rs.h" #ifdef NOD_ENABLED #include "nod.hh" diff --git a/pdns/recursordist/settings/.gitignore b/pdns/recursordist/rec-rust-lib/.gitignore similarity index 100% rename from pdns/recursordist/settings/.gitignore rename to pdns/recursordist/rec-rust-lib/.gitignore diff --git a/pdns/recursordist/settings/Makefile.am b/pdns/recursordist/rec-rust-lib/Makefile.am similarity index 100% rename from pdns/recursordist/settings/Makefile.am rename to pdns/recursordist/rec-rust-lib/Makefile.am diff --git a/pdns/recursordist/settings/README.md b/pdns/recursordist/rec-rust-lib/README.md similarity index 100% rename from pdns/recursordist/settings/README.md rename to pdns/recursordist/rec-rust-lib/README.md diff --git a/pdns/recursordist/settings/cxxsettings-private.hh b/pdns/recursordist/rec-rust-lib/cxxsettings-private.hh similarity index 100% rename from pdns/recursordist/settings/cxxsettings-private.hh rename to pdns/recursordist/rec-rust-lib/cxxsettings-private.hh diff --git a/pdns/recursordist/settings/cxxsettings.hh b/pdns/recursordist/rec-rust-lib/cxxsettings.hh similarity index 100% rename from pdns/recursordist/settings/cxxsettings.hh rename to pdns/recursordist/rec-rust-lib/cxxsettings.hh diff --git a/pdns/recursordist/settings/cxxsupport.cc b/pdns/recursordist/rec-rust-lib/cxxsupport.cc similarity index 99% rename from pdns/recursordist/settings/cxxsupport.cc rename to pdns/recursordist/rec-rust-lib/cxxsupport.cc index ea27ea26e1..bbc7f60dd1 100644 --- a/pdns/recursordist/settings/cxxsupport.cc +++ b/pdns/recursordist/rec-rust-lib/cxxsupport.cc @@ -41,8 +41,8 @@ #include "threadname.hh" #include "iputils.hh" #include "bridge.hh" -#include "settings/rust/web.rs.h" -#include "settings/rust/misc.rs.h" +#include "rec-rust-lib/rust/web.rs.h" +#include "rec-rust-lib/rust/misc.rs.h" ::rust::Vec<::rust::String> pdns::settings::rec::getStrings(const std::string& name) { diff --git a/pdns/recursordist/settings/docs-new-preamble-in.rst b/pdns/recursordist/rec-rust-lib/docs-new-preamble-in.rst similarity index 100% rename from pdns/recursordist/settings/docs-new-preamble-in.rst rename to pdns/recursordist/rec-rust-lib/docs-new-preamble-in.rst diff --git a/pdns/recursordist/settings/docs-old-preamble-in.rst b/pdns/recursordist/rec-rust-lib/docs-old-preamble-in.rst similarity index 100% rename from pdns/recursordist/settings/docs-old-preamble-in.rst rename to pdns/recursordist/rec-rust-lib/docs-old-preamble-in.rst diff --git a/pdns/recursordist/settings/generate.py b/pdns/recursordist/rec-rust-lib/generate.py similarity index 100% rename from pdns/recursordist/settings/generate.py rename to pdns/recursordist/rec-rust-lib/generate.py diff --git a/pdns/recursordist/settings/meson.build b/pdns/recursordist/rec-rust-lib/meson.build similarity index 71% rename from pdns/recursordist/settings/meson.build rename to pdns/recursordist/rec-rust-lib/meson.build index 1ecdf79c0e..a38f87c5eb 100644 --- a/pdns/recursordist/settings/meson.build +++ b/pdns/recursordist/rec-rust-lib/meson.build @@ -13,21 +13,21 @@ generated = [ python = find_program('python3') -settings = custom_target( - command: [python, '@INPUT0@', '@SOURCE_ROOT@/settings', '@BUILD_ROOT@/settings'], +recrust = custom_target( + command: [python, '@INPUT0@', '@SOURCE_ROOT@/rec-rust-lib', '@BUILD_ROOT@/rec-rust-lib'], input: sources, output: generated, ) # librec_common depends on this, so the sources get linked -dep_settings_ch = declare_dependency( - sources: [settings, 'cxxsupport.cc'], +dep_recrust_ch = declare_dependency( + sources: [recrust, 'cxxsupport.cc'], include_directories: [include_directories('.'), ] ) # The rust parts depend on this, no sources listed, which avoid duplicates object files -# In turn deps (defined in the main meson.build file, includes dep_rust_settings) -dep_settings = declare_dependency( +# In turn deps (defined in the main meson.build file, includes dep_rust_recrust) +dep_recrust = declare_dependency( include_directories: [include_directories('.'), ] ) diff --git a/pdns/recursordist/settings/rust-bridge-in.rs b/pdns/recursordist/rec-rust-lib/rust-bridge-in.rs similarity index 100% rename from pdns/recursordist/settings/rust-bridge-in.rs rename to pdns/recursordist/rec-rust-lib/rust-bridge-in.rs diff --git a/pdns/recursordist/settings/rust-preamble-in.rs b/pdns/recursordist/rec-rust-lib/rust-preamble-in.rs similarity index 100% rename from pdns/recursordist/settings/rust-preamble-in.rs rename to pdns/recursordist/rec-rust-lib/rust-preamble-in.rs diff --git a/pdns/recursordist/settings/rust/.gitignore b/pdns/recursordist/rec-rust-lib/rust/.gitignore similarity index 100% rename from pdns/recursordist/settings/rust/.gitignore rename to pdns/recursordist/rec-rust-lib/rust/.gitignore diff --git a/pdns/recursordist/settings/rust/Cargo.lock b/pdns/recursordist/rec-rust-lib/rust/Cargo.lock similarity index 99% rename from pdns/recursordist/settings/rust/Cargo.lock rename to pdns/recursordist/rec-rust-lib/rust/Cargo.lock index 68014e7988..2dcdbdbe56 100644 --- a/pdns/recursordist/settings/rust/Cargo.lock +++ b/pdns/recursordist/rec-rust-lib/rust/Cargo.lock @@ -429,6 +429,31 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "recrust" +version = "5.3.0" +dependencies = [ + "base64", + "bytes", + "cxx", + "cxx-build", + "form_urlencoded", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "once_cell", + "rustls", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_yml", + "tokio", + "tokio-rustls", + "uuid", +] + [[package]] name = "ring" version = "0.17.8" @@ -536,31 +561,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "settings" -version = "5.2.0" -dependencies = [ - "base64", - "bytes", - "cxx", - "cxx-build", - "form_urlencoded", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "ipnet", - "once_cell", - "rustls", - "rustls-pemfile", - "rustls-pki-types", - "serde", - "serde_yml", - "tokio", - "tokio-rustls", - "uuid", -] - [[package]] name = "shlex" version = "1.3.0" diff --git a/pdns/recursordist/settings/rust/Cargo.toml b/pdns/recursordist/rec-rust-lib/rust/Cargo.toml similarity index 94% rename from pdns/recursordist/settings/rust/Cargo.toml rename to pdns/recursordist/rec-rust-lib/rust/Cargo.toml index 01b5e80342..aba4fa7f2a 100644 --- a/pdns/recursordist/settings/rust/Cargo.toml +++ b/pdns/recursordist/rec-rust-lib/rust/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "settings" +name = "recrust" # Convention: major/minor is equal to rec's major/minor -version = "5.2.0" +version = "5.3.0" edition = "2021" [lib] -name = "settings" +name = "recrust" crate-type = ["staticlib"] [dependencies] diff --git a/pdns/recursordist/settings/rust/Makefile.am b/pdns/recursordist/rec-rust-lib/rust/Makefile.am similarity index 51% rename from pdns/recursordist/settings/rust/Makefile.am rename to pdns/recursordist/rec-rust-lib/rust/Makefile.am index 5045189136..8ff27e5ae8 100644 --- a/pdns/recursordist/settings/rust/Makefile.am +++ b/pdns/recursordist/rec-rust-lib/rust/Makefile.am @@ -1,6 +1,6 @@ CARGO ?= cargo -all install: libsettings.a +all install: librecrust.a EXTRA_DIST = \ Cargo.lock \ @@ -12,7 +12,7 @@ EXTRA_DIST = \ src/web.rs # should actually end up in a target specific dir... -libsettings.a lib.rs.h web.rs.h misc.rs.h: \ +librecrust.a lib.rs.h web.rs.h misc.rs.h: \ Cargo.lock \ Cargo.toml \ build.rs \ @@ -22,11 +22,11 @@ libsettings.a lib.rs.h web.rs.h misc.rs.h: \ src/misc.rs \ src/web.rs SYSCONFDIR=$(sysconfdir) NODCACHEDIRNOD=$(localstatedir)/nod NODCACHEDIRUDR=$(localstatedir)/udr $(CARGO) build --release $(RUST_TARGET) --target-dir=$(builddir)/target --manifest-path ${srcdir}/Cargo.toml - cp target/$(RUSTC_TARGET_ARCH)/release/libsettings.a libsettings.a - cp target/$(RUSTC_TARGET_ARCH)/cxxbridge/settings/src/lib.rs.h lib.rs.h - cp target/$(RUSTC_TARGET_ARCH)/cxxbridge/settings/src/web.rs.h web.rs.h - cp target/$(RUSTC_TARGET_ARCH)/cxxbridge/settings/src/misc.rs.h misc.rs.h - cp target/$(RUSTC_TARGET_ARCH)/cxxbridge/rust/cxx.h cxx.h + cp -pv target/$(RUSTC_TARGET_ARCH)/release/librecrust.a librecrust.a + cp -pv target/$(RUSTC_TARGET_ARCH)/cxxbridge/recrust/src/lib.rs.h lib.rs.h + cp -pv target/$(RUSTC_TARGET_ARCH)/cxxbridge/recrust/src/web.rs.h web.rs.h + cp -pv target/$(RUSTC_TARGET_ARCH)/cxxbridge/recrust/src/misc.rs.h misc.rs.h + cp -pv target/$(RUSTC_TARGET_ARCH)/cxxbridge/rust/cxx.h cxx.h clean-local: - rm -rf libsettings.a src/lib.rs lib.rs.h web.rs.h cxx.h misc.rs.h target + rm -rf librecrust.a src/lib.rs lib.rs.h web.rs.h cxx.h misc.rs.h target diff --git a/pdns/recursordist/settings/rust/build.rs b/pdns/recursordist/rec-rust-lib/rust/build.rs similarity index 100% rename from pdns/recursordist/settings/rust/build.rs rename to pdns/recursordist/rec-rust-lib/rust/build.rs diff --git a/pdns/recursordist/rec-rust-lib/rust/build_recrust b/pdns/recursordist/rec-rust-lib/rust/build_recrust new file mode 100755 index 0000000000..f598a38a75 --- /dev/null +++ b/pdns/recursordist/rec-rust-lib/rust/build_recrust @@ -0,0 +1,17 @@ +#!/bin/sh -e + +#echo "PWD=$PWD" +#echo "srcdir=$srcdir" +#echo "builddir=$builddir" + +$CARGO build --release $RUST_TARGET --target-dir=$builddir/target --manifest-path $srcdir/Cargo.toml + +cp -vp target/$RUSTC_TARGET_ARCH/release/librecrust.a $builddir/rec-rust-lib/rust/librecrust.a +cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/recrust/src/lib.rs.h $srcdir/lib.rs.h +cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/recrust/src/lib.rs.h $builddir/rec-rust-lib/rust/lib.rs.h +cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/rust/cxx.h $srcdir/cxx.h +cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/rust/cxx.h $builddir/rec-rust-lib/rust/cxx.h +cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/recrust/src/web.rs.h $srcdir/web.rs.h +cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/recrust/src/web.rs.h $builddir/rec-rust-lib/rust/web.rs.h +cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/recrust/src/misc.rs.h $srcdir/misc.rs.h +cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/recrust/src/misc.rs.h $builddir/rec-rust-lib/rust/misc.rs.h diff --git a/pdns/recursordist/settings/rust/meson.build b/pdns/recursordist/rec-rust-lib/rust/meson.build similarity index 75% rename from pdns/recursordist/settings/rust/meson.build rename to pdns/recursordist/rec-rust-lib/rust/meson.build index 014ca29273..579514f1d3 100644 --- a/pdns/recursordist/settings/rust/meson.build +++ b/pdns/recursordist/rec-rust-lib/rust/meson.build @@ -1,8 +1,8 @@ -build = find_program('build_settings') +build = find_program('build_recrust') cargo = find_program('cargo') infile = 'Cargo.toml' -outfile = 'libsettings.a' +outfile = 'librecrust.a' env = environment() @@ -15,7 +15,7 @@ env.append('srcdir', meson.current_source_dir()) env.append('RUST_TARGET', '') env.append('RUSTC_TARGET_ARCH', '') -lib_settings = custom_target('libsettings.a', +lib_recrust = custom_target('librecrust.a', output: [outfile, 'cxx.h'], input: infile, command: [build, @@ -25,13 +25,13 @@ lib_settings = custom_target('libsettings.a', 'src/bridge.rs', 'src/helpers.rs', ], - depends: settings, + depends: recrust, env: env, console: true, ) -dep_rust_settings = declare_dependency( - link_with: lib_settings[0], - sources: lib_settings[1], +dep_rust_recrust = declare_dependency( + link_with: lib_recrust[0], + sources: lib_recrust[1], include_directories: [include_directories('.'), include_directories('src')], ) diff --git a/pdns/recursordist/settings/rust/src/bridge.hh b/pdns/recursordist/rec-rust-lib/rust/src/bridge.hh similarity index 100% rename from pdns/recursordist/settings/rust/src/bridge.hh rename to pdns/recursordist/rec-rust-lib/rust/src/bridge.hh diff --git a/pdns/recursordist/settings/rust/src/bridge.rs b/pdns/recursordist/rec-rust-lib/rust/src/bridge.rs similarity index 100% rename from pdns/recursordist/settings/rust/src/bridge.rs rename to pdns/recursordist/rec-rust-lib/rust/src/bridge.rs diff --git a/pdns/recursordist/settings/rust/src/helpers.rs b/pdns/recursordist/rec-rust-lib/rust/src/helpers.rs similarity index 100% rename from pdns/recursordist/settings/rust/src/helpers.rs rename to pdns/recursordist/rec-rust-lib/rust/src/helpers.rs diff --git a/pdns/recursordist/settings/rust/src/misc.rs b/pdns/recursordist/rec-rust-lib/rust/src/misc.rs similarity index 100% rename from pdns/recursordist/settings/rust/src/misc.rs rename to pdns/recursordist/rec-rust-lib/rust/src/misc.rs diff --git a/pdns/recursordist/settings/rust/src/web.rs b/pdns/recursordist/rec-rust-lib/rust/src/web.rs similarity index 100% rename from pdns/recursordist/settings/rust/src/web.rs rename to pdns/recursordist/rec-rust-lib/rust/src/web.rs diff --git a/pdns/recursordist/settings/table.py b/pdns/recursordist/rec-rust-lib/table.py similarity index 100% rename from pdns/recursordist/settings/table.py rename to pdns/recursordist/rec-rust-lib/table.py diff --git a/pdns/recursordist/rec_channel_rec.cc b/pdns/recursordist/rec_channel_rec.cc index 76fa3a6015..ad30bca393 100644 --- a/pdns/recursordist/rec_channel_rec.cc +++ b/pdns/recursordist/rec_channel_rec.cc @@ -40,7 +40,7 @@ #include "rec-main.hh" #include "rec-system-resolve.hh" -#include "settings/cxxsettings.hh" +#include "rec-rust-lib/cxxsettings.hh" /* g++ defines __SANITIZE_THREAD__ clang++ supports the nice __has_feature(thread_sanitizer), diff --git a/pdns/recursordist/rec_control.cc b/pdns/recursordist/rec_control.cc index cda2f939fa..9b65630cf8 100644 --- a/pdns/recursordist/rec_control.cc +++ b/pdns/recursordist/rec_control.cc @@ -32,7 +32,7 @@ #include "credentials.hh" #include "namespaces.hh" #include "rec_channel.hh" -#include "settings/cxxsettings.hh" +#include "rec-rust-lib/cxxsettings.hh" #include "logger.hh" #include "logging.hh" diff --git a/pdns/recursordist/reczones.cc b/pdns/recursordist/reczones.cc index 859894d703..b92d6daed6 100644 --- a/pdns/recursordist/reczones.cc +++ b/pdns/recursordist/reczones.cc @@ -32,7 +32,7 @@ #include "logger.hh" #include "syncres.hh" #include "zoneparser-tng.hh" -#include "settings/cxxsettings.hh" +#include "rec-rust-lib/cxxsettings.hh" #include "rec-system-resolve.hh" // XXX consider including rec-main.hh? diff --git a/pdns/recursordist/settings/rust/build_settings b/pdns/recursordist/settings/rust/build_settings deleted file mode 100755 index 073479a9da..0000000000 --- a/pdns/recursordist/settings/rust/build_settings +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -e - -#echo "PWD=$PWD" -#echo "srcdir=$srcdir" -#echo "builddir=$builddir" - -$CARGO build --release $RUST_TARGET --target-dir=$builddir/target --manifest-path $srcdir/Cargo.toml - -cp -vp target/$RUSTC_TARGET_ARCH/release/libsettings.a $builddir/settings/rust/libsettings.a -cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/settings/src/lib.rs.h $srcdir/lib.rs.h -cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/settings/src/lib.rs.h $builddir/settings/rust/lib.rs.h -cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/rust/cxx.h $srcdir/cxx.h -cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/rust/cxx.h $builddir/settings/rust/cxx.h -cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/settings/src/web.rs.h $srcdir/web.rs.h -cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/settings/src/web.rs.h $builddir/settings/rust/web.rs.h -cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/settings/src/misc.rs.h $srcdir/misc.rs.h -cp -vp target/$RUSTC_TARGET_ARCH/cxxbridge/settings/src/misc.rs.h $builddir/settings/rust/misc.rs.h diff --git a/pdns/recursordist/test-settings.cc b/pdns/recursordist/test-settings.cc index 25b649df4f..517c9edf34 100644 --- a/pdns/recursordist/test-settings.cc +++ b/pdns/recursordist/test-settings.cc @@ -9,7 +9,7 @@ #include #include -#include "settings/cxxsettings.hh" +#include "rec-rust-lib/cxxsettings.hh" BOOST_AUTO_TEST_SUITE(test_settings) diff --git a/pdns/recursordist/ws-recursor.cc b/pdns/recursordist/ws-recursor.cc index b03a0c1730..69969d50ec 100644 --- a/pdns/recursordist/ws-recursor.cc +++ b/pdns/recursordist/ws-recursor.cc @@ -43,10 +43,10 @@ #include "rec-lua-conf.hh" #include "rpzloader.hh" #include "rec-main.hh" -#include "settings/cxxsettings.hh" // IWYU pragma: keep, needed by included generated file -#include "settings/rust/src/bridge.hh" -#include "settings/rust/web.rs.h" -#include "settings/rust/misc.rs.h" +#include "rec-rust-lib/cxxsettings.hh" // IWYU pragma: keep, needed by included generated file +#include "rec-rust-lib/rust/src/bridge.hh" +#include "rec-rust-lib/rust/web.rs.h" +#include "rec-rust-lib/rust/misc.rs.h" using json11::Json;