From 2c6adea15068ff828344c034142b74883fe6a9ae Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 20 Apr 2019 21:55:26 -0400
Subject: refactor 'make dist' archive creation into a shell script

---
 Makefile | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2171d4f4..3cae9299 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,8 @@
-EXTENSIONS:=inkstitch
-
-# This gets the branch name or the name of the tag
-VERSION:=$(subst /,-,$(TRAVIS_BRANCH))
-OS:=$(TRAVIS_OS_NAME)
-ARCH:=$(shell uname -m)
 
 dist: locales inx
-	bin/build-dist $(EXTENSIONS)
+	bin/build-python
 	bin/build-electron
-	cp -a images/examples dist/inkstitch
-	cp -a palettes dist/inkstitch
-	cp -a symbols dist/inkstitch
-	cp -a fonts dist/inkstitch
-	cp -a icons dist/inkstitch/bin
-	cp -a locales dist/inkstitch/bin
-	cp -a print dist/inkstitch/bin
-	if [ "$$BUILD" = "osx" ]; then \
-	    cp -a electron/dist/mac dist/inkstitch/electron; \
-	else \
-	    cp -a electron/dist/*-unpacked dist/inkstitch/electron; \
-	fi
-	for d in inx/*; do \
-		lang=$${d%.*}; \
-		lang=$${lang#*/}; \
-		cp $$d/*.inx dist; \
-		if [ "$$BUILD" = "windows" ]; then \
-			cd dist; zip -r ../inkstitch-$(VERSION)-win32-$$lang.zip *; cd ..; \
-		else \
-			cd dist; tar zcf ../inkstitch-$(VERSION)-$(OS)-$(ARCH)-$$lang.tar.gz *; cd ..; \
-		fi; \
-	done
+	bin/build-distribution-archives
 
 distclean:
 	rm -rf build dist inx locales *.spec *.tar.gz *.zip electron/node_modules electron/dist
-- 
cgit v1.3.1