From 16061370f48026eb18bdfa30e9ed2faf94e59387 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Wed, 7 Mar 2018 19:26:56 +0100
Subject: [PATCH] Add date to git-rev version (#3723)

Adds an extra part at the end of the git-rev.

Before: `blablabla-21-g076bf406`
After: `blablabla-21-g076bf406_2018-03-05`

Fixes #2896
---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3764f9e5b..5278b44ab 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ KOR_BASE?=base
 -include $(KOR_BASE)/Makefile.defs
 
 # we want VERSION to carry the version of koreader, not koreader-base
-VERSION=$(shell git describe HEAD)
+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
@@ -49,7 +50,7 @@ INSTALL_FILES=reader.lua setupkoenv.lua frontend resources defaults.lua datastor
 all: $(if $(ANDROID),,$(KOR_BASE)/$(OUTPUT_DIR)/luajit)
 	$(MAKE) -C $(KOR_BASE)
 	install -d $(INSTALL_DIR)/koreader
-	rm -f $(INSTALL_DIR)/koreader/git-rev; echo $(VERSION) > $(INSTALL_DIR)/koreader/git-rev
+	rm -f $(INSTALL_DIR)/koreader/git-rev; echo "$(VERSION)" > $(INSTALL_DIR)/koreader/git-rev
 ifneq ($(or $(EMULATE_READER),$(WIN32)),)
 	cp -f $(KOR_BASE)/ev_replay.py $(INSTALL_DIR)/koreader/
 	@echo "[*] create symlink instead of copying files in development mode"