From c072f2dbfb92410037987e1552aedb8723f2aff3 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Thu, 7 Jul 2022 22:34:01 +0200 Subject: [PATCH] Updated makefiles --- .gitignore | 3 +++ Makefile | 21 +++++++++++++-------- sbapp/Makefile | 10 ++++++---- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 826df16..8c78462 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ sbapp/build sbapp/dist sbapp/docs/build sbapp/sideband*.egg-info +sbapp/sbapp*.egg-info + .buildozer requirements.txt @@ -27,3 +29,4 @@ build dist docs/build sideband*.egg-info +sbapp*.egg-info \ No newline at end of file diff --git a/Makefile b/Makefile index 63ceaef..24f3e3b 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,26 @@ devapk: - make -C sbapp devapk + make -C sbapp devapk apk: - make -C sbapp apk + make -C sbapp apk install: - make -C sbapp install + make -C sbapp install console: - make -C sbapp conole + make -C sbapp console clean: - @echo Cleaning... - -rm -r ./build - -rm -r ./dist + @echo Cleaning... + -rm -r ./build + -rm -r ./dist + +cleanbuildozer: + make -C sbapp clean + +cleanall: clean cleanbuildozer build_wheel: - python3 setup.py sdist bdist_wheel + python3 setup.py sdist bdist_wheel release: build_wheel apk \ No newline at end of file diff --git a/sbapp/Makefile b/sbapp/Makefile index 4a08167..453b35a 100644 --- a/sbapp/Makefile +++ b/sbapp/Makefile @@ -3,11 +3,15 @@ all: prepare debug prepare: activate cleanrns getrns clean: - buildozer android clean -(rm ./__pycache__ -r) -(rm ./app_storage -r) -(rm ./bin -r) + +cleanlibs: + buildozer android clean +cleanall: clean cleanlibs + activate: (. venv/bin/activate) @@ -17,9 +21,7 @@ debug: release: buildozer android release -postbuild: - cleanrns - @echo Done +postbuild: cleanrns apk: prepare release postbuild