From 34508aa0aea75f1428d6cc8c94c4156b00e753e0 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 4 Sep 2024 20:07:26 -0400 Subject: [PATCH] dist slightly more in parallel. Exclude dotfiles from data.zip. --- GNUmakefile | 20 +++++++++++++++----- core/.test | 0 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 core/.test diff --git a/GNUmakefile b/GNUmakefile index 0de3e020..68f2dd1a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -842,7 +842,7 @@ PACKAGE_DIRS := \ deps/prettier/ \ deps/lit/ -RAW_FILES := $(sort $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f))) +RAW_FILES := $(sort $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f -not -name '.*'))) out/apk/TildeFriends-arm-debug.unsigned.apk: BUILD_TYPE := debug out/apk/TildeFriends-arm-release.unsigned.apk: BUILD_TYPE := release @@ -1083,10 +1083,10 @@ clean: rm -rf $(BUILD_DIR) .PHONY: clean -dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) out/TildeFriends-release.fdroid.apk - @echo [archive] dist/tildefriends-$(VERSION_NUMBER).tar.xz +tarball: + @echo [archive] out/tildefriends-$(VERSION_NUMBER).tar.xz @rm -rf out/tildefriends-$(VERSION_NUMBER) - @mkdir -p dist/ out/tildefriends-$(VERSION_NUMBER) + @mkdir -p out/tildefriends-$(VERSION_NUMBER) @git ls-files --recurse-submodules | tar -c -T- | tar -x -C out/tildefriends-$(VERSION_NUMBER) @tar \ --exclude=apps/welcome* \ @@ -1103,9 +1103,15 @@ dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefrien --exclude=deps/sqlite/shell.c \ --exclude=deps/zlib/contrib/vstudio \ --exclude=deps/zlib/doc \ - -caf dist/tildefriends-$(VERSION_NUMBER).tar.xz \ + -caf out/tildefriends-$(VERSION_NUMBER).tar.xz \ -C out/ \ tildefriends-$(VERSION_NUMBER) +.PHONY: tarball + +dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) out/TildeFriends-release.fdroid.apk appimage + @mkdir -p dist/ + @echo "[cp] tildefriends-$(VERSION_NUMBER).tar.xz" + @cp out/tildefriends-$(VERSION_NUMBER).tar.xz dist/tildefriends-$(VERSION_NUMBER).tar.xz @echo "[cp] TildeFriends-x86-$(VERSION_NUMBER).apk" @cp out/TildeFriends-x86-release.zopfli.apk dist/TildeFriends-x86-$(VERSION_NUMBER).apk @echo "[cp] TildeFriends-arm-$(VERSION_NUMBER).apk" @@ -1114,8 +1120,12 @@ dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefrien @cp out/tildefriends-release.ipa dist/TildeFriends-$(VERSION_NUMBER).ipa @test $(HAVE_WIN) && echo "[cp] tildefriends-$(VERSION_NUMBER).exe" @test $(HAVE_WIN) && cp out/winrelease/tildefriends.standalone.exe dist/tildefriends-$(VERSION_NUMBER).exe + @echo "[cp] TildeFriends-$(VERSION_NUMBER).aab" @cp out/TildeFriends.aab dist/TildeFriends-$(VERSION_NUMBER).aab + @echo "[cp] TildeFriends-$(VERSION_NUMBER).fdroid.apk" @cp out/TildeFriends-release.fdroid.apk dist/TildeFriends-$(VERSION_NUMBER).fdroid.apk + @echo "[cp] TildeFriends-x86_64-$(VERSION_NUMBER).AppImage" + @cp out/Tilde_Friends-x86_64.AppImage dist/TildeFriends-x86_64-$(VERSION_NUMBER).AppImage .PHONY: dist dist-test: dist diff --git a/core/.test b/core/.test new file mode 100644 index 00000000..e69de29b