From 5c1c33d33e5699a4516f883d2cb3b599bec0f5eb Mon Sep 17 00:00:00 2001
From: Cory McWilliams <cory@unprompted.com>
Date: Wed, 9 Aug 2023 23:14:16 +0000
Subject: [PATCH] Put the release process in the makefile, and including
 building the tarball contents to avoid another snafu.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4393 ed5197a5-7fde-0310-b194-c3ffbd925b24
---
 Makefile          | 32 ++++++++++++++++++++++++++++++++
 tools/autotest.py |  0
 tools/release.sh  | 25 -------------------------
 3 files changed, 32 insertions(+), 25 deletions(-)
 mode change 100644 => 100755 tools/autotest.py
 delete mode 100755 tools/release.sh

diff --git a/Makefile b/Makefile
index 9de5de85..a3998088 100644
--- a/Makefile
+++ b/Makefile
@@ -524,3 +524,35 @@ apklog:
 clean:
 	rm -rf $(BUILD_DIR)
 .PHONY: clean
+
+dist: apk
+	@echo "[export] $$(svn info --show-item url)"
+	@rm -rf tildefriends-$(VERSION_NUMBER)
+	@svn export -q . tildefriends-$(VERSION_NUMBER)
+	@echo "tildefriends-$(VERSION_NUMBER): $(VERSION_NAME)" > tildefriends-$(VERSION_NUMBER)/VERSION
+	@echo "[tar] tildefriends-$(VERSION_NUMBER).tar.xz"
+	@tar \
+		--exclude=deps/libbacktrace/Isaac.Newton-Opticks.txt \
+		--exclude=deps/libsodium/builds/msvc/vs* \
+		--exclude=deps/libsodium/builds/msvc/build \
+		--exclude=deps/libsodium/builds/msvc/properties \
+		--exclude=deps/libsodium/configure \
+		--exclude=deps/libsodium/test \
+		--exclude=deps/libuv/docs \
+		--exclude=deps/libuv/test \
+		--exclude=deps/openssl \
+		--exclude=deps/speedscope/*.map \
+		--exclude=deps/sqlite/shell.c \
+		--exclude=deps/zlib/contrib/vstudio \
+		--exclude=deps/zlib/doc \
+		-caf tildefriends-$(VERSION_NUMBER).tar.xz tildefriends-$(VERSION_NUMBER)
+	@rm -rf tildefriends-$(VERSION_NUMBER)
+	@echo "[cp] TildeFriends-$(VERSION_NUMBER).apk"
+	@cp out/TildeFriends-release.apk TildeFriends-$(VERSION_NUMBER).apk
+.PHONY: dist
+
+dist-test: dist
+	@tar -xf tildefriends-$(VERSION_NUMBER).tar.xz
+	@$(MAKE) -C tildefriends-$(VERSION_NUMBER)/ debug release
+	@rm -rf tildefriends-$(VERSION_NUMBER)
+.PHONY: dist-test
diff --git a/tools/autotest.py b/tools/autotest.py
old mode 100644
new mode 100755
diff --git a/tools/release.sh b/tools/release.sh
deleted file mode 100755
index 75e3132f..00000000
--- a/tools/release.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash -e
-
-VERSION_NUMBER=`sed -n -e 's/^VERSION_NUMBER := //p' Makefile`
-VERSION_NAME=`sed -n -e 's/^VERSION_NAME := //p' Makefile`
-rm -rfv tildefriends-$VERSION_NUMBER
-svn export . tildefriends-$VERSION_NUMBER
-echo "tildefriends-$VERSION_NUMBER: $VERSION_NAME" > tildefriends-$VERSION_NUMBER/VERSION
-tar \
-	--exclude=deps/libbacktrace/Isaac.Newton-Opticks.txt \
-	--exclude=deps/libsodium/builds/msvc/vs* \
-	--exclude=deps/libsodium/builds/msvc/build \
-	--exclude=deps/libsodium/builds/msvc/properties \
-	--exclude=deps/libsodium/configure \
-	--exclude=deps/libsodium/test \
-	--exclude=deps/libuv/docs \
-	--exclude=deps/libuv/test \
-	--exclude=deps/openssl \
-	--exclude=deps/speedscope/*.map \
-	--exclude=deps/sqlite/shell.c \
-	--exclude=deps/zlib/contrib/vstudio \
-	--exclude=deps/zlib/doc \
-	-caf tildefriends-$VERSION_NUMBER.tar.xz tildefriends-$VERSION_NUMBER
-rm -rfv tildefriends-$VERSION_NUMBER
-make apk
-cp out/TildeFriends-release.apk TildeFriends-$VERSION_NUMBER.apk