This is an automated email from the ASF dual-hosted git repository.
Jens-G pushed a commit to branch release/0.24.0
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/release/0.24.0 by this push:
new 6d2ec95f4 Tune make dist: drop generated/build artifacts, add missing
sources
6d2ec95f4 is described below
commit 6d2ec95f450b4ce404afb8929ff479e68770141a
Author: Jens Geyer <[email protected]>
AuthorDate: Sun Jul 5 22:04:17 2026 +0200
Tune make dist: drop generated/build artifacts, add missing sources
Adjust what "make dist" ships in the release tarball.
Dropped (build output and generated code that a built tree leaves behind,
swept in via whole-directory EXTRA_DIST entries and pruned in dist-hook;
none of it is tracked, so a clean checkout never contained it):
- lib/haxe/test/{bin,gen-haxe}, lib/javame/gen-javame
- lib/netstd bin/obj/gen-netstd across the test and benchmark projects
- test/netstd/{Client,Server}/ThriftTest
- tutorial/netstd/Interfaces/{shared,tutorial} (tracked project
scaffolding is kept so the tutorial still builds from the tarball)
- test/cpp/gen-cpp* (nodist generated sources)
- build/__pycache__ and stray *.pyc
Also no longer shipped: the .github/ CI configuration and
doc/thrift-threat-model.md.
Added (tracked sources that were missing from EXTRA_DIST):
- lib/lua/test/{RecursionDepth.thrift,test_recursion_depth.lua}
- lib/netstd/Tests/codegen/run-NetStd-Codegen-Tests.ps1
- test/JsRecursionDepthTest.thrift
- lib/php/{phpstan.neon,phpstan-baseline.neon}
- SECURITY.md
Verified end-to-end with make dist in a clean container: 4317 -> 3480
tarball entries, and the only tracked files removed are .github/* and
doc/thrift-threat-model.md.
Client: netstd,haxe,javame,lua,php,cpp
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
---
Makefile.am | 11 ++++-------
lib/Makefile.am | 6 ++++++
lib/lua/Makefile.am | 4 +++-
lib/netstd/Makefile.am | 6 ++++++
lib/php/Makefile.am | 2 ++
test/Makefile.am | 1 +
test/cpp/Makefile.am | 4 ++++
test/netstd/Makefile.am | 6 ++++++
tutorial/netstd/Makefile.am | 6 ++++++
9 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index b854ad8a6..5bdc3af7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,6 +66,9 @@ dist-hook:
find $(distdir) -type d \( -iname ".deps" -or -iname ".libs" \) | xargs
rm -rf
find $(distdir) -type d \( -iname ".svn" -or -iname ".git" \) | xargs
rm -rf
find $(distdir) -type d -name node_modules -prune -exec rm -rf {} +
+ find $(distdir) -type d -name __pycache__ -prune -exec rm -rf {} +
+ find $(distdir) -type f -name "*.pyc" -exec rm -f {} +
+ rm -f $(distdir)/doc/thrift-threat-model.md
print-version:
@echo $(PACKAGE_VERSION)
@@ -143,13 +146,6 @@ EXTRA_DIST = \
.flake8 \
.gitattributes \
.gitignore \
- .github/dependabot.yml \
- .github/pull_request_template.md \
- .github/stale.yml \
- .github/workflows/build.yml \
- .github/workflows/cmake.yml \
- .github/workflows/pypi.yml \
- .github/workflows/release_rust.yml \
.travis.yml \
ApacheThrift.nuspec \
AGENTS.md \
@@ -178,5 +174,6 @@ EXTRA_DIST = \
package-lock.json \
phpcs.xml.dist \
README.md \
+ SECURITY.md \
rust-toolchain \
sonar-project.properties
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5df353abd..3b753c70c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -101,6 +101,12 @@ endif
distdir:
$(MAKE) $(AM_MAKEFLAGS) distdir-am
+# The libs below ship as whole directories, which sweeps in generated code and
+# build output present in a built tree. Strip those from the distribution.
+dist-hook:
+ rm -rf $(distdir)/haxe/test/bin $(distdir)/haxe/test/gen-haxe
+ rm -rf $(distdir)/javame/gen-javame
+
EXTRA_DIST = \
d \
dart \
diff --git a/lib/lua/Makefile.am b/lib/lua/Makefile.am
index ae67d942e..8c9b1a68c 100644
--- a/lib/lua/Makefile.am
+++ b/lib/lua/Makefile.am
@@ -73,4 +73,6 @@ EXTRA_DIST = \
TProtocol.lua \
TServer.lua \
TSocket.lua \
- TTransport.lua
+ TTransport.lua \
+ test/RecursionDepth.thrift \
+ test/test_recursion_depth.lua
diff --git a/lib/netstd/Makefile.am b/lib/netstd/Makefile.am
index 798881ad3..d811c9ad8 100644
--- a/lib/netstd/Makefile.am
+++ b/lib/netstd/Makefile.am
@@ -67,10 +67,16 @@ clean-local:
distdir:
$(MAKE) $(AM_MAKEFLAGS) distdir-am
+# Several test/benchmark projects ship as whole directories; strip the build
+# output and generated code that a built tree leaves behind.
+dist-hook:
+ find $(distdir) -type d \( -name bin -o -name obj -o -name gen-netstd
\) -prune -exec rm -rf {} +
+
EXTRA_DIST = \
README.md \
Directory.Build.props \
Benchmarks/Thrift.Benchmarks \
+ Tests/codegen/run-NetStd-Codegen-Tests.ps1 \
Tests/Thrift.IntegrationTests/Protocols \
Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj \
Tests/Thrift.Compile.Tests \
diff --git a/lib/php/Makefile.am b/lib/php/Makefile.am
index f9e881392..91d2af639 100644
--- a/lib/php/Makefile.am
+++ b/lib/php/Makefile.am
@@ -140,6 +140,8 @@ EXTRA_DIST = \
src/ext/thrift_protocol/php_thrift_protocol_arginfo.h \
coding_standards.md \
thrift_protocol.ini \
+ phpstan.neon \
+ phpstan-baseline.neon \
phpunit.xml \
README.apache.md \
README.md \
diff --git a/test/Makefile.am b/test/Makefile.am
index c00f7949e..e0affbffd 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -158,6 +158,7 @@ EXTRA_DIST = \
index.html \
Int64Test.thrift \
JsDeepConstructorTest.thrift \
+ JsRecursionDepthTest.thrift \
keys/keygen/.gitignore \
known_failures_Linux.json \
ManyOptionals.thrift \
diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am
index d3895f18c..39dcdb244 100644
--- a/test/cpp/Makefile.am
+++ b/test/cpp/Makefile.am
@@ -260,6 +260,10 @@ style-local:
distdir:
$(MAKE) $(AM_MAKEFLAGS) distdir-am
+# The gen-cpp* trees are nodist generated sources; drop them from the dist.
+dist-hook:
+ find $(distdir) -type d -name 'gen-cpp*' -prune -exec rm -rf {} +
+
EXTRA_DIST = \
src/TestClient.cpp \
src/TestServer.cpp \
diff --git a/test/netstd/Makefile.am b/test/netstd/Makefile.am
index 8ad07d612..05c53b9ce 100644
--- a/test/netstd/Makefile.am
+++ b/test/netstd/Makefile.am
@@ -35,6 +35,12 @@ clean-local:
distdir:
$(MAKE) $(AM_MAKEFLAGS) distdir-am
+# Client and Server ship as whole directories; strip the generated code and
+# build output a built tree leaves behind.
+dist-hook:
+ rm -rf $(distdir)/Client/ThriftTest $(distdir)/Server/ThriftTest
+ find $(distdir) -type d \( -name bin -o -name obj \) -prune -exec rm
-rf {} +
+
EXTRA_DIST = \
Client \
README.md \
diff --git a/tutorial/netstd/Makefile.am b/tutorial/netstd/Makefile.am
index 066d07065..63ad9a12d 100644
--- a/tutorial/netstd/Makefile.am
+++ b/tutorial/netstd/Makefile.am
@@ -34,6 +34,12 @@ clean-local:
distdir:
$(MAKE) $(AM_MAKEFLAGS) distdir-am
+# The projects ship as whole directories; strip the generated code and build
+# output a built tree leaves behind, keeping the tracked project scaffolding.
+dist-hook:
+ rm -rf $(distdir)/Interfaces/shared $(distdir)/Interfaces/tutorial
+ find $(distdir) -type d \( -name bin -o -name obj \) -prune -exec rm
-rf {} +
+
EXTRA_DIST = \
Client \
Interfaces \
