Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: luci.mk: rework package version handling

Browse source 
- Derive the version of packages from the last change of the sources
 - Derive the version of i18n packages from the last change of the po dir

Fixes: #2257
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-04-09 23:11:41 +02:00
parent 59fe4086f3
commit 372c54ec6f
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
luci.mk
View file

@ -59,8 +59,15 @@ LUCI_LC_ALIAS.zh_Hant=zh-tw
PKG_NAME?=$(LUCI_NAME) PKG_NAME?=$(LUCI_NAME)
PKG_VERSION?=$(if $(DUMP),x,$(strip $(shell \ PKG_PO_VERSION?=$(if $(DUMP),x,$(strip $(shell \
set -- $$(git log -1 --format="%ct %h" --abbrev=7); \ set -- $$(git log -1 --format="%ct %h" --abbrev=7 -- po); \
secs="$$(($$1 % 86400))"; \
yday="$$(date --utc --date="@$$1" "+%y.%j")"; \
printf 'git-%s.%05d-%s' "$$yday" "$$secs" "$$2" \
)))
PKG_SRC_VERSION?=$(if $(DUMP),x,$(strip $(shell \
set -- $$(git log -1 --format="%ct %h" --abbrev=7 -- . ':(exclude)po'); \
secs="$$(($$1 % 86400))"; \ secs="$$(($$1 % 86400))"; \
yday="$$(date --utc --date="@$$1" "+%y.%j")"; \ yday="$$(date --utc --date="@$$1" "+%y.%j")"; \
printf 'git-%s.%05d-%s' "$$yday" "$$secs" "$$2" \ printf 'git-%s.%05d-%s' "$$yday" "$$secs" "$$2" \
@ -95,6 +102,7 @@ define Package/$(PKG_NAME)
SUBMENU:=$(if $(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.app)) SUBMENU:=$(if $(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.$(LUCI_TYPE)),$(LUCI_MENU.app))
TITLE:=$(if $(LUCI_TITLE),$(LUCI_TITLE),LuCI $(LUCI_NAME) $(LUCI_TYPE)) TITLE:=$(if $(LUCI_TITLE),$(LUCI_TITLE),LuCI $(LUCI_NAME) $(LUCI_TYPE))
DEPENDS:=$(LUCI_DEPENDS) DEPENDS:=$(LUCI_DEPENDS)
VERSION:=$(PKG_SRC_VERSION)
$(if $(LUCI_EXTRA_DEPENDS),EXTRA_DEPENDS:=$(LUCI_EXTRA_DEPENDS)) $(if $(LUCI_EXTRA_DEPENDS),EXTRA_DEPENDS:=$(LUCI_EXTRA_DEPENDS))
$(if $(LUCI_PKGARCH),PKGARCH:=$(LUCI_PKGARCH)) $(if $(LUCI_PKGARCH),PKGARCH:=$(LUCI_PKGARCH))
endef endef
@ -236,6 +244,7 @@ define LuciTranslation
HIDDEN:=1 HIDDEN:=1
DEFAULT:=LUCI_LANG_$(2)||(ALL&&m) DEFAULT:=LUCI_LANG_$(2)||(ALL&&m)
DEPENDS:=$(PKG_NAME) DEPENDS:=$(PKG_NAME)
VERSION:=$(PKG_PO_VERSION)
PKGARCH:=all PKGARCH:=all
endef endef