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

build: introduce official way to opt out of source minification

Browse source 
Introduce three new default enabled variables `LUCI_MINIFY_JS`,
`LUCI_MINIFY_LUA` and `LUCI_MINIFY_CSS`  that allow LuCI component
Makefiles to opt out of JavaScript, Lua and CSS compression respectively.

To e.g. inhibit CSSTidy postprocessing in a theme, the corresponding
Makefile can set `LUCI_MINIFY_CSS:=0` prior to including `luci.mk`.

Fixes: #5755
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3646b0cd1f)
This commit is contained in:
Jo-Philipp Wich 2022-04-06 11:39:06 +02:00
parent 43acd5e3ab
commit 162defebe9
1 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
luci.mk
View file

@ -14,6 +14,9 @@ LUCI_SECTION?=luci
LUCI_CATEGORY?=LuCI LUCI_CATEGORY?=LuCI
LUCI_URL?=https://github.com/openwrt/luci LUCI_URL?=https://github.com/openwrt/luci
LUCI_MAINTAINER?=OpenWrt LuCI community LUCI_MAINTAINER?=OpenWrt LuCI community
LUCI_MINIFY_LUA?=1
LUCI_MINIFY_CSS?=1
LUCI_MINIFY_JS?=1
# Language code titles # Language code titles
LUCI_LANG.ar=العربية (Arabic) LUCI_LANG.ar=العربية (Arabic)
@ -217,26 +220,44 @@ endef
endif endif
# some generic macros that can be used by all packages # some generic macros that can be used by all packages
define SrcDiet ifeq ($(LUCI_MINIFY_JS),1)
define SrcDiet
$(FIND) $(1) -type f -name '*.lua' | while read src; do \ $(FIND) $(1) -type f -name '*.lua' | while read src; do \
if LUA_PATH="$(STAGING_DIR_HOSTPKG)/lib/lua/5.1/?.lua" luasrcdiet --noopt-binequiv -o "$$$$src.o" "$$$$src"; \ if LUA_PATH="$(STAGING_DIR_HOSTPKG)/lib/lua/5.1/?.lua" luasrcdiet --noopt-binequiv -o "$$$$src.o" "$$$$src"; \
then mv "$$$$src.o" "$$$$src"; fi; \ then mv "$$$$src.o" "$$$$src"; fi; \
done done
endef endef
else
define SrcDiet
$$(call MESSAGE,$$(LUCI_NAME) does not support Lua source minification)
endef
endif
define JsMin ifeq ($(LUCI_MINIFY_JS),1)
define JsMin
$(FIND) $(1) -type f -name '*.js' | while read src; do \ $(FIND) $(1) -type f -name '*.js' | while read src; do \
if jsmin < "$$$$src" > "$$$$src.o"; \ if jsmin < "$$$$src" > "$$$$src.o"; \
then mv "$$$$src.o" "$$$$src"; fi; \ then mv "$$$$src.o" "$$$$src"; fi; \
done done
endef endef
else
define JsMin
$$(call MESSAGE,$$(LUCI_NAME) does not support JavaScript source minification)
endef
endif
define CssTidy ifeq ($(LUCI_MINIFY_CSS),1)
define CssTidy
$(FIND) $(1) -type f -name '*.css' | while read src; do \ $(FIND) $(1) -type f -name '*.css' | while read src; do \
if csstidy "$$$$src" --template=highest --remove_last_semicolon=true "$$$$src.o"; \ if csstidy "$$$$src" --template=highest --remove_last_semicolon=true "$$$$src.o"; \
then mv "$$$$src.o" "$$$$src"; fi; \ then mv "$$$$src.o" "$$$$src"; fi; \
done done
endef endef
else
define CssTidy
$$(call MESSAGE,$$(LUCI_NAME) does not support CSS source minification)
endef
endif
define SubstituteVersion define SubstituteVersion
$(FIND) $(1) -type f -name '*.htm' | while read src; do \ $(FIND) $(1) -type f -name '*.htm' | while read src; do \