X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=build%2Fmodule.mk;h=b69019c56839b363c15ab2108a8199959fe0fe20;hb=0f87ddaec1dc373c7339e30bc86cf0649da0fc15;hp=7fe96cac50946955f55e1fb9b64ed9528aac250b;hpb=64806f32bea453b9a6fc5c4cf4c4b751a749e369;p=project%2Fluci.git

diff --git a/build/module.mk b/build/module.mk
index 7fe96cac5..b69019c56 100644
--- a/build/module.mk
+++ b/build/module.mk
@@ -1,3 +1,7 @@
+MAKEPATH:=$(dir $(lastword $(MAKEFILE_LIST)))
+-include $(MAKEPATH)config.mk
+-include $(MAKEPATH)gccconfig.mk
+
 .PHONY: all build compile luacompile luasource clean luaclean
 
 all: build
@@ -12,13 +16,30 @@ compile:
 clean: luaclean
 
 luasource:
-	mkdir -p dist$(LUCI_INSTALLDIR)
-	cp -a root/* dist -R 2>/dev/null || true
-	cp -a luasrc/* dist$(LUCI_INSTALLDIR) -R 2>/dev/null || true
-	for i in $$(find dist -name .svn); do rm $$i -rf; done  
-	
+	mkdir -p dist$(LUA_MODULEDIR)
+	mkdir -p dist$(LUCI_MODULEDIR)
+	mkdir -p dist$(HTDOCS)
+	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