summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f3f94b49..2171d4f4 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,9 @@ VERSION:=$(subst /,-,$(TRAVIS_BRANCH))
OS:=$(TRAVIS_OS_NAME)
ARCH:=$(shell uname -m)
-dist: distclean locales inx
+dist: locales inx
bin/build-dist $(EXTENSIONS)
+ bin/build-electron
cp -a images/examples dist/inkstitch
cp -a palettes dist/inkstitch
cp -a symbols dist/inkstitch
@@ -14,6 +15,11 @@ dist: distclean locales inx
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#*/}; \
@@ -26,7 +32,7 @@ dist: distclean locales inx
done
distclean:
- rm -rf build dist inx locales *.spec *.tar.gz *.zip
+ rm -rf build dist inx locales *.spec *.tar.gz *.zip electron/node_modules electron/dist
.PHONY: inx
inx: locales
@@ -65,4 +71,4 @@ locales:
.PHONY: style
style:
- flake8 . --count --max-complexity=10 --max-line-length=150 --statistics --exclude=pyembroidery,__init__.py
+ flake8 . --count --max-complexity=10 --max-line-length=150 --statistics --exclude=pyembroidery,__init__.py,electron,build