From: Otto Moerbeek Date: Tue, 23 Sep 2025 12:54:43 +0000 (+0200) Subject: rec: Update the Rust library version when generating a tarball X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F16167%2Fhead;p=thirdparty%2Fpdns.git rec: Update the Rust library version when generating a tarball Signed-off-by: Otto Moerbeek --- diff --git a/pdns/recursordist/meson-dist-script.sh b/pdns/recursordist/meson-dist-script.sh index f196c38a7..55bae6543 100755 --- a/pdns/recursordist/meson-dist-script.sh +++ b/pdns/recursordist/meson-dist-script.sh @@ -5,6 +5,11 @@ echo PWD=$(pwd) echo MESON_SOURCE_ROOT=$MESON_SOURCE_ROOT echo MESON_PROJECT_DIST_ROOT=$MESON_PROJECT_DIST_ROOT +if [ -z "${BUILDER_VERSION}" ]; then + echo "BUILDER_VERSION is not set" >&2 + exit 1 +fi + cd "$MESON_PROJECT_DIST_ROOT" # Get all symlinks @@ -25,6 +30,8 @@ echo Running autoreconf -vi so distfile is still usable for autotools building # Run autoconf for people using autotools to build, this creates a configure sc autoreconf -vi rm -rf "$MESON_PROJECT_DIST_ROOT"/autom4te.cache +echo Updating the version of the Rust library to ${BUILDER_VERSION} +"$MESON_SOURCE_ROOT"/../../builder-support/helpers/update-rust-library-version.py "$MESON_PROJECT_DIST_ROOT"/rec-rust-lib/rust/Cargo.toml recrust ${BUILDER_VERSION} cd "$MESON_PROJECT_BUILD_ROOT" diff --git a/pdns/recursordist/rec-rust-lib/rust/Cargo.toml b/pdns/recursordist/rec-rust-lib/rust/Cargo.toml index 2d89e22cc..c14bfa0ee 100644 --- a/pdns/recursordist/rec-rust-lib/rust/Cargo.toml +++ b/pdns/recursordist/rec-rust-lib/rust/Cargo.toml @@ -1,8 +1,12 @@ [package] name = "recrust" +edition = "2021" # Convention: major/minor is equal to rec's major/minor +# Note that this line will be automatically updated to the value +# BUILDER_VERSION when a release tarball is built +# See builder-support/helpers/update-rust-library-version.py +# called from meson-dist-script.sh version = "5.4.0" -edition = "2021" [lib] name = "recrust"