X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=build%2Fmodule.mk;h=b69019c56839b363c15ab2108a8199959fe0fe20;hp=66b767c7a12b111bad13cffae8c4b7538ad55f55;hb=0ef557b15c766817ed2e9f90634153cde121205e;hpb=1c383dc244323f5c168ee16824cb5788fefc3667

diff --git a/build/module.mk b/build/module.mk
index 66b767c7a1..b69019c568 100644
--- a/build/module.mk
+++ b/build/module.mk
@@ -8,17 +8,13 @@ all: build
 
 build: luabuild gccbuild
 
-luabuild: i18n lua$(LUA_TARGET)
+luabuild: lua$(LUA_TARGET)
 
 gccbuild: compile
 compile:
 
 clean: luaclean
 
-i18n:
-	[ -n "$(XSLTPROC)" ] && for i in luasrc/i18n/*.xml; do [ "$$i" -nt "$${i%%[.]xml}.lua" ]\
-	&& $(XSLTPROC) $(MAKEPATH)i18n-lua-xhtml1.xsl $$i > $${i%%[.]xml}.lua; done || true
-
 luasource:
 	mkdir -p dist$(LUA_MODULEDIR)
 	mkdir -p dist$(LUCI_MODULEDIR)
@@ -27,18 +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); do rm -rf $$i || true; done
-	for i in dist$(LUCI_MODULEDIR)/i18n/*.xml; do [ -f "$$i" ] && rm $$i; done || true
+	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),*).* 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 = <F>; 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