优化打包脚本
diff --git a/Makefile b/Makefile
index 83637bb..12ce435 100644
--- a/Makefile
+++ b/Makefile
@@ -2,20 +2,32 @@
APPPATH=./app/build/outputs/apk/release
BUILDAPK=app-release.apk
-SIGNAPK=app_sign.apk
+SIGNAPK=posa711dali.apk
+GRADLE=./gradlew
+ZIP=zip
+SALT_KEY=.sign_salt
+SIGN_FILE=hash256.sign
+
+OS=$(shell uname)
+
+ifneq (,$(findstring MINGW,$(OS)))
+GRADLE=gradlew.bat
+else
+GRADLE=./gradlew
+endif
+
+VERSION=$(shell git describe --abbrev=4 --dirty --always --tags)
apk:
@echo "build app apk!"
- gradlew app:assembleRelease
+ $(GRADLE) app:assembleRelease
@echo "build android sign apk"
- java -jar signapk.jar platform.x509.pem platform.pk8 $(APPPATH)/$(BUILDAPK) $(APPPATH)/$(SIGNAPK)
- @echo "build upgrade zip"
- python upgrade.py $(APPPATH)/$(SIGNAPK)
+ java -jar signapk.jar platform.x509.pem platform.pk8 $(APPPATH)/$(BUILDAPK) $(APPPATH)/$(SIGNAPK)
+ @echo "build upgrade app zip"
+ cat $(APPPATH)/$(SIGNAPK) $(SALT_KEY) | sha256sum - | cut -d' ' -f 1 | tr -d '\n' > $(APPPATH)/$(SIGN_FILE)
+ cd $(APPPATH) && $(ZIP) posa711-$(VERSION).zip $(SIGN_FILE) $(SIGNAPK)
+
clean:
@echo "remove build cache apk!"
- rm -rf $(APPPATH)/$(BUILDAPK)
- rm -rf $(APPPATH)/$(SIGNAPK)
- rm -rf $(APPPATH)/hash256.sign
- rm -rf $(APPPATH)/output.json
+ cd $(APPPATH) && rm -rf *.apk *.json *.sign
@echo "remove build cache file success"
-