|
@@ -83,8 +83,8 @@ PKG_GITBRANCH?=$(if $(DUMP),x,$(strip $(shell \
|
|
|
|
|
|
PKG_RELEASE?=1
|
|
|
PKG_INSTALL:=$(if $(realpath src/Makefile),1)
|
|
|
-PKG_BUILD_DEPENDS += lua/host luci-base/host $(LUCI_BUILD_DEPENDS)
|
|
|
-PKG_CONFIG_DEPENDS += CONFIG_LUCI_SRCDIET CONFIG_LUCI_JSMIN
|
|
|
+PKG_BUILD_DEPENDS += lua/host luci-base/host LUCI_CSSTIDY:csstidy/host $(LUCI_BUILD_DEPENDS)
|
|
|
+PKG_CONFIG_DEPENDS += CONFIG_LUCI_SRCDIET CONFIG_LUCI_JSMIN CONFIG_LUCI_CSSTIDY
|
|
|
|
|
|
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
|
|
|
|
|
@@ -117,6 +117,10 @@ ifeq ($(PKG_NAME),luci-base)
|
|
|
bool "Minify JavaScript sources"
|
|
|
default y
|
|
|
|
|
|
+ config LUCI_CSSTIDY
|
|
|
+ bool "Minify CSS files"
|
|
|
+ default y
|
|
|
+
|
|
|
menu "Translations"$(foreach lang,$(LUCI_LANGUAGES),
|
|
|
|
|
|
config LUCI_LANG_$(lang)
|
|
@@ -169,6 +173,13 @@ define JsMin
|
|
|
done
|
|
|
endef
|
|
|
|
|
|
+define CssTidy
|
|
|
+ $(FIND) $(1) -type f -name '*.css' | while read src; do \
|
|
|
+ if csstidy "$$$$src" --template=highest --remove_last_semicolon=true "$$$$src.o"; \
|
|
|
+ then mv "$$$$src.o" "$$$$src"; fi; \
|
|
|
+ done
|
|
|
+endef
|
|
|
+
|
|
|
define SubstituteVersion
|
|
|
$(FIND) $(1) -type f -name '*.htm' | while read src; do \
|
|
|
$(SED) 's/<%# *\([^ ]*\)PKG_VERSION *%>/\1$(PKG_VERSION)/g' \
|
|
@@ -189,6 +200,7 @@ define Package/$(PKG_NAME)/install
|
|
|
$(INSTALL_DIR) $(1)$(HTDOCS); \
|
|
|
cp -pR $(PKG_BUILD_DIR)/htdocs/* $(1)$(HTDOCS)/; \
|
|
|
$(if $(CONFIG_LUCI_JSMIN),$(call JsMin,$(1)$(HTDOCS)/),true); \
|
|
|
+ $(if $(CONFIG_LUCI_CSSTIDY),$(call CssTidy,$(1)$(HTDOCS)/),true); \
|
|
|
else true; fi
|
|
|
if [ -d $(PKG_BUILD_DIR)/root ]; then \
|
|
|
$(INSTALL_DIR) $(1)/; \
|