X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=558ee352bf9815eef3425be311b99d0d9c9ac825;hp=8ce59c268303a503a5d0cb5660872c1435098050;hb=cac36db0805f0238f374db15408c6820ab08eb60;hpb=4f630d647c7191ac9d8fd2dfcc8e93746faf391a

diff --git a/Makefile b/Makefile
index 8ce59c268..558ee352b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 include build/config.mk
 
-MODULES = applications/* libs/* modules/* themes/* i18n/* contrib/luaposix
-LUA_TARGET = source
+MODULES = applications/* libs/* modules/* themes/* i18n/* contrib/*
 
 OS:=$(shell uname)
 export OS
@@ -10,15 +9,16 @@ export OS
 
 all: build
 
-build: luabuild gccbuild
+build: gccbuild luabuild
 
 gccbuild:
 	for i in $(MODULES); do make -C$$i compile; done	
 
 luabuild:
-	for i in $(MODULES); do make -C$$i lua$(LUA_TARGET); done
+	for i in $(MODULES); do make -C$$i luabuild; done
 
 clean:
+	rm -rf docs
 	for i in $(MODULES); do make -C$$i clean; done
 
 
@@ -31,22 +31,49 @@ luahost: luabuild hostcopy
 hostcopy: 
 	mkdir -p host
 	for i in $(MODULES); do cp -a $$i/dist/* host/ -R 2>/dev/null || true; done
+	for i in $(MODULES); do cp -a $$i/hostfiles/* host/ -R 2>/dev/null || true; done
 	rm -f host/luci
 	ln -s .$(LUCI_MODULEDIR) host/luci
 
-runboa: host
-	libs/sgi-webuci/host/buildconfig.sh `pwd`/host  > host/etc/boa/boa.conf
-	./host/usr/bin/boa -c ./host/etc/boa -d
+hostenv: host ucidefaults
+
+ucidefaults:
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host)/bin/uci-defaults --exclude luci-community-*"
+
+runboa: hostenv
+	libs/sgi-webuci/host/buildconfig.sh $(realpath host) > host/etc/boa/boa.conf
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host/usr/bin/boa) -c $(realpath host/etc/boa) -d"
+
+runhttpd: hostenv
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath libs/httpd/host/runluci) $(realpath host) $(HTDOCS)"
 
 runluci: luahost
-	libs/httpd/host/runluci host$(HTDOCS)
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath libs/httpd/host/runluci) $(realpath host) $(HTDOCS)"
+
+runlua: hostenv
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) lua
+
+runshell: hostenv
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) $$SHELL
 
 hostclean: clean
 	rm -rf host
 
+apidocs: hostenv
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "build/makedocs.sh host/luci/ docs"
+
 run:
-	#	make run is deprecated			#
-	#	Please use:				#
-	#						#
-	#	make runluci to use LuCI HTTPD		#
-	#	make runboa  to use Boa / Webuci	#
+	#	make run is deprecated				#
+	#	Please use:					#
+	#							#
+	#	To run LuCI WebUI using LuCI HTTPD		#
+	#	make runhttpd					#
+	#							#
+	#	To run LuCI WebUI using Boa/Webuci		#
+	#	make runboa 					#
+	#							#
+	#	To start a shell in the LuCI environment	#
+	#	make runshell					#
+	#							#
+	#	To run Lua CLI in the LuCI environment		#
+	#	make runlua					#