X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=a9e5e1eb238bd6173ccce4b8de62d99543236f8e;hp=435d59c599b8f908a4cc179e83ac9598d5e8629d;hb=ba7b178943d3c0d67559f83cb30c0a555161e668;hpb=d8e5e32ad8af6f49a10dc0fe18c9c2327f924dcd

diff --git a/Makefile b/Makefile
index 435d59c59..a9e5e1eb2 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,7 +9,7 @@ export OS
 
 all: build
 
-build: luabuild gccbuild
+build: gccbuild luabuild
 
 gccbuild:
 	for i in $(MODULES); do make -C$$i compile; done	
@@ -19,6 +18,7 @@ luabuild:
 	for i in $(MODULES); do make -C$$i lua$(LUA_TARGET); done
 
 clean:
+	rm -rf docs
 	for i in $(MODULES); do make -C$$i clean; done
 
 
@@ -31,12 +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_INSTALLDIR) host/luci
+	ln -s .$(LUCI_MODULEDIR) host/luci
 
-run: 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
+	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:					#
+	#							#
+	#	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					#