renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Android] Makefile: only use VERSION, not REVISION (#3811)

Browse Source 
Fixes always reinstalling resource package.

See https://github.com/koreader/koreader/pull/3723#issuecomment-376508917
This commit is contained in:
Frans de Jonge
2018-03-29 16:59:13 +02:00
committed by GitHub
parent 3ead3f0da4
commit 6c3ace9940
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -8,7 +8,6 @@ KOR_BASE?=base
# we want VERSION to carry the version of koreader, not koreader-base
VERSION:=$(shell git describe HEAD)
VERSION:=$(VERSION)_$(shell git describe HEAD | xargs git show -s --format=format:"%cd" --date=short)
REVISION=$(shell git rev-parse --short HEAD)
# set PATH to find CC in managed toolchains
ifeq ($(TARGET), android)
@@ -320,7 +319,7 @@ androidupdate: all
-T ota/package.index --no-recursion
# make android update apk
cd $(INSTALL_DIR)/koreader && 7z a -l -mx=1 \
../../$(ANDROID_LAUNCHER_DIR)/assets/module/koreader-g$(REVISION).7z * \
../../$(ANDROID_LAUNCHER_DIR)/assets/module/koreader-$(VERSION).7z * \
-x!resources/fonts -x!resources/icons/src -x!spec
$(MAKE) -C $(ANDROID_LAUNCHER_DIR) apk
cp $(ANDROID_LAUNCHER_DIR)/bin/NativeActivity-debug.apk \

2
platform/android/luajit-launcher

Submodule platform/android/luajit-launcher updated: 52a76c19e5...132b24664a