luci-app-openvpn: add missing ncp_ciphers option

[project/luci.git] / luci.mk

diff --git a/luci.mk b/luci.mk
index c39f36cfb5137f0855a70c99f6900885917c30bd..aa2e195e2703fed70714d11851c1088d97c33f51 100644 (file)
--- a/luci.mk
+++ b/luci.mk
@@ -84,7 +84,7 @@ 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
+PKG_CONFIG_DEPENDS += CONFIG_LUCI_SRCDIET CONFIG_LUCI_JSMIN
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
@@ -113,6 +113,10 @@ ifeq ($(PKG_NAME),luci-base)
        bool "Minify Lua sources"
        default n
 
+   config LUCI_JSMIN
+       bool "Minify JavaScript sources"
+       default y
+
    menu "Translations"$(foreach lang,$(LUCI_LANGUAGES),
 
      config LUCI_LANG_$(lang)
@@ -153,7 +157,14 @@ LUCI_LIBRARYDIR = $(LUA_LIBRARYDIR)/luci
 
 define SrcDiet
        $(FIND) $(1) -type f -name '*.lua' | while read src; do \
-               if 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; \
+       done
+endef
+
+define JsMin
+       $(FIND) $(1) -type f -name '*.js' | while read src; do \
+               if jsmin < "$$$$src" > "$$$$src.o"; \
                then mv "$$$$src.o" "$$$$src"; fi; \
        done
 endef
@@ -177,6 +188,7 @@ define Package/$(PKG_NAME)/install
        if [ -d $(PKG_BUILD_DIR)/htdocs ]; then \
          $(INSTALL_DIR) $(1)$(HTDOCS); \
          cp -pR $(PKG_BUILD_DIR)/htdocs/* $(1)$(HTDOCS)/; \
+         $(if $(CONFIG_LUCI_JSMIN),$(call JsMin,$(1)$(HTDOCS)/),true); \
        else true; fi
        if [ -d $(PKG_BUILD_DIR)/root ]; then \
          $(INSTALL_DIR) $(1)/; \