From 0166071ec9a7f8146bbacf9a8c218d8825f719c9 Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Fri, 22 Jan 2021 14:17:53 +0300 Subject: [PATCH] mdbx-make: check building amalgamated sources during `make dist`. Related to https://github.com/erthink/libmdbx/issues/155 Change-Id: I45a4f6d3d62052d091c18eae634bbe418829761e --- GNUmakefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index a090a6b1..4de6b817 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -300,18 +300,23 @@ mdbx++-static.o: src/config.h src/mdbx.c++ mdbx.h mdbx.h++ $(lastword $(MAKEFILE $(CXX) $(CXXFLAGS) $(MDBX_OPTIONS) '-DMDBX_CONFIG_H="config.h"' -ULIBMDBX_EXPORTS -c src/mdbx.c++ -o $@ .PHONY: dist release-assets tags -dist: tags libmdbx-sources-$(MDBX_VERSION_SUFFIX).tar.gz $(lastword $(MAKEFILE_LIST)) +dist: tags dist-checked.tag libmdbx-sources-$(MDBX_VERSION_SUFFIX).tar.gz $(lastword $(MAKEFILE_LIST)) tags: git fetch --tags release-assets: libmdbx-sources-$(MDBX_VERSION_SUFFIX).tar.gz libmdbx-sources-$(MDBX_VERSION_SUFFIX).zip -libmdbx-sources-$(MDBX_VERSION_SUFFIX).tar.gz: $(addprefix dist/, $(DIST_SRC) $(DIST_EXTRA)) +dist-checked.tag: $(addprefix dist/, $(DIST_SRC) $(DIST_EXTRA)) + rm -rf $@ && echo "Check amalgamated sources..." \ + && rm -rf dist-check && cp -r -p dist dist-check && $(MAKE) -C dist-check \ + && touch $@ + +libmdbx-sources-$(MDBX_VERSION_SUFFIX).tar.gz: dist-checked.tag $(TAR) -c $(shell LC_ALL=C $(TAR) --help | grep -q -- '--owner' && echo '--owner=0 --group=0') -f - -C dist $(DIST_SRC) $(DIST_EXTRA) | gzip -c -9 > $@ \ && rm dist/@tmp-shared_internals.inc -libmdbx-sources-$(MDBX_VERSION_SUFFIX).zip: $(addprefix dist/, $(DIST_SRC) $(DIST_EXTRA)) +libmdbx-sources-$(MDBX_VERSION_SUFFIX).zip: dist-checked.tag rm -rf $@ && (cd dist && $(ZIP) -9 ../$@ $(DIST_SRC) $(DIST_EXTRA)) || rm -rf $@ dist/mdbx.h: mdbx.h src/version.c $(lastword $(MAKEFILE_LIST))