diff --git a/Makefile b/Makefile index 495be5d2fc..4ecd69a3f4 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # A simple static wrapper for a number of standard Makefile targets, # mostly just forwarding to build/Makefile. This is provided only for # convenience and supports only a subset of what CMake's Makefile -# offers. For more, execute that one directly. +# offers. For more, execute that one directly. # BUILD=build @@ -32,18 +32,24 @@ docclean: livehtml: $(MAKE) -C doc $@ +# The COPYFILE_DISABLE flag used in the tar commands below is an undocumented feature +# of the tar binary on macOS. It causes tar to avoid including any of the special files +# that macOS litters around the repository directory, such as ._ resource files, none +# of which should be included in the distribution packages. dist: @test -e ../$(VERSION_FULL) && rm -ri ../$(VERSION_FULL) || true @cp -R . ../$(VERSION_FULL) @for i in . $$(git submodule foreach -q --recursive realpath --relative-to=$$(pwd) .); do ((cd ../$(VERSION_FULL)/$$i && test -f .git && cp -R $(GITDIR) .gitnew && rm -f .git && mv .gitnew .git && sed -i.bak -e 's#[[:space:]]*worktree[[:space:]]*=[[:space:]]*.*##g' .git/config) || true); done @for i in . $$(git submodule foreach -q --recursive realpath --relative-to=$$(pwd) .); do (cd ../$(VERSION_FULL)/$$i && git reset -q --hard && git clean -ffdxq); done @(cd ../$(VERSION_FULL) && find . -name \.git\* | xargs rm -rf) + @(cd ../$(VERSION_FULL) && find . -name \.idea -type d | xargs rm -rf) + @(cd ../$(VERSION_FULL) && find . -name build\* -type d | xargs rm -rf) @mv ../$(VERSION_FULL) . - @tar -czf $(VERSION_FULL).tar.gz $(VERSION_FULL) + @COPYFILE_DISABLE=true tar -czf $(VERSION_FULL).tar.gz $(VERSION_FULL) @echo Package: $(VERSION_FULL).tar.gz @mv $(VERSION_FULL) $(VERSION_MIN) @(cd $(VERSION_MIN) && for i in auxil/*; do rm -rf $$i/*; done) - @tar -czf $(VERSION_MIN).tar.gz $(VERSION_MIN) + @COPYFILE_DISABLE=true tar -czf $(VERSION_MIN).tar.gz $(VERSION_MIN) @echo Package: $(VERSION_MIN).tar.gz @rm -rf $(VERSION_MIN)