X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=build%2Fmodule.mk;h=b69019c56839b363c15ab2108a8199959fe0fe20;hp=7a5cc32cee1d97ca6da4c0d894b8580fe2666a88;hb=8da6c1a49f2ab91d8816a41df0ce5cacb5b9f084;hpb=d1cda67d3f1ee74ba12f6b63fce898819245d510

diff --git a/build/module.mk b/build/module.mk
index 7a5cc32ce..b69019c56 100644
--- a/build/module.mk
+++ b/build/module.mk
@@ -8,34 +8,38 @@ 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 [ -f "$$i" ]\
-	&& $(XSLTPROC) $(MAKEPATH)i18n-lua-xhtml1.xsl $$i > $${i%%[.]xml}.lua; done || true
-
 luasource:
 	mkdir -p dist$(LUA_MODULEDIR)
 	mkdir -p dist$(LUCI_MODULEDIR)
 	mkdir -p dist$(HTDOCS)
-	cp -a root/* dist -R 2>/dev/null || true
-	cp -a luasrc/* dist$(LUCI_MODULEDIR) -R 2>/dev/null || true
-	cp -a lua/* dist$(LUA_MODULEDIR) -R 2>/dev/null || true
-	cp -a htdocs/* dist$(HTDOCS) -R 2>/dev/null || true
-	for i in $$(find dist -name .svn); do rm $$i -rf || true; done
-	for i in dist$(LUCI_MODULEDIR)/i18n/*.xml; do [ -f "$$i" ] && rm $$i; done || true
-
+	cp -pR root/* dist 2>/dev/null || true
+	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 -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
+	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