From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 24 Jan 2025 08:27:51 +0000 (+0100)
Subject: Skip a few files and dirs in the meson dist tarball
X-Git-Tag: dnsdist-2.0.0-alpha1~127^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f2c8964b64d77d4ce36c98e6c8157415da9c9b9;p=thirdparty%2Fpdns.git

Skip a few files and dirs in the meson dist tarball
---

diff --git a/pdns/recursordist/.gitattributes b/pdns/recursordist/.gitattributes
new file mode 100644
index 0000000000..3f006fb339
--- /dev/null
+++ b/pdns/recursordist/.gitattributes
@@ -0,0 +1,7 @@
+Caddyfile export-ignore
+/README.md export-ignore
+docs export-ignore
+examples export-ignore
+make-ext-symlinks.py export-ignore
+recursor-lsan.supp export-ignore
+recursor-tsan.supp export-ignore
diff --git a/pdns/recursordist/meson-dist-script.sh b/pdns/recursordist/meson-dist-script.sh
index 4ce83e3442..a8699d94dd 100755
--- a/pdns/recursordist/meson-dist-script.sh
+++ b/pdns/recursordist/meson-dist-script.sh
@@ -24,9 +24,14 @@ cd "$MESON_PROJECT_BUILD_ROOT"
 ninja man-pages
 cp -vp rec-man-pages/*.1 "$MESON_PROJECT_DIST_ROOT"
 
+rm -rf "$MESON_PROJECT_DIST_ROOT"/autom4te.cache
+
+
 # Generate  a few files to reduce build dependencies
-ninja  librec-dnslabeltext.a.p/dnslabeltext.cc
+echo 'If the below command generates an error, remove dnslabeltext.cc from source dir (remains of an autotools build?) and start again with a clean meson setup'
+ninja librec-dnslabeltext.a.p/dnslabeltext.cc
 cp -vp librec-dnslabeltext.a.p/dnslabeltext.cc "$MESON_PROJECT_DIST_ROOT"
-ninja  effective_tld_names.dat
+echo 'If the below command generates an error, remove effective_tld_names.dat and pubsuffix.cc from source dir (remains of an autotools build?) and start again with a clean meson setup'
+ninja effective_tld_names.dat
 cp -vp effective_tld_names.dat "$MESON_PROJECT_DIST_ROOT"