X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=build%2Fmodule.mk;h=b69019c56839b363c15ab2108a8199959fe0fe20;hb=9297ef38c47c4e5dea67e98c794d951cacc2d936;hp=70d54dc8528313d689d8dbd8dcf2215829e0e071;hpb=de7842fdd3beaa694cc0cba2275962ab11f1e07b;p=project%2Fluci.git diff --git a/build/module.mk b/build/module.mk index 70d54dc85..b69019c56 100644 --- a/build/module.mk +++ b/build/module.mk @@ -23,22 +23,23 @@ luasource: cp -pR luasrc/* dist$(LUCI_MODULEDIR) 2>/dev/null || true cp -pR lua/* dist$(LUA_MODULEDIR) 2>/dev/null || true cp -pR htdocs/* dist$(HTDOCS) 2>/dev/null || true - for i in $$(find dist -name .svn -or -name .gitignore); do rm -rf $$i || true; done + for i in $$(find dist -name .svn -o -name .gitignore); do rm -rf $$i || true; done ifneq ($(PO),) + mkdir -p dist$(LUCI_I18NDIR) for file in $(PO); do \ - cp $(HOST)/lua-po/$$file.$(if $(PO_LANG),$(PO_LANG),*).lua dist$(LUCI_MODULEDIR)/i18n/; \ + cp $(HOST)/lua-po/$$file.$(if $(PO_LANG),$(PO_LANG),*).* dist$(LUCI_I18NDIR)/ 2>/dev/null || true; \ done endif +luadiet: luasource + for i in $$(find dist -type f -name '*.lua'); do LUA_PATH="../../contrib/luasrcdiet/lua/?.lua" $(LUA) ../../contrib/luasrcdiet/lua/LuaSrcDiet.lua --maximum $$i -o $$i.diet && mv $$i.diet $$i; done + luastrip: luasource for i in $$(find dist -type f -name '*.lua'); do perl -e 'undef $$/; open( F, "< $$ARGV[0]" ) || die $$!; $$src = ; close F; $$src =~ s/--\[\[.*?\]\](--)?//gs; $$src =~ s/^\s*--.*?\n//gm; open( F, "> $$ARGV[0]" ) || die $$!; print F $$src; close F' $$i; done luacompile: luasource - for i in $$(find dist -name *.lua -not -name debug.lua); do $(LUAC) $(LUAC_OPTIONS) -o $$i $$i; done - -luagzip: luacompile - for i in $$(find dist -name *.lua -not -name debug.lua); do gzip -f9 $$i; done + for i in $$(find dist -name *.lua -not -name debug.lua| sort); do if ! $(LUAC) $(LUAC_OPTIONS) -o $$i $$i; then echo "Error compiling $$i"; exit 1; fi; done luaclean: rm -rf dist