X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=12c1d89e0966e19e51480b1d2f15a92db16b528d;hp=d76be9a2de8b0b8b5838a7a4d4a738fca348bed0;hb=e8c070753409e859cfe6be04873466a9cf2fe703;hpb=4365fbe2a373b73af5578d0ed6eddfb2ba9901ef

diff --git a/Makefile b/Makefile
index d76be9a2d..12c1d89e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,75 @@
 include build/config.mk
 
-MODULES = applications/* libs/* modules/* themes/* i18n/*
-LUA_TARGET = compile
+MODULES = applications/* libs/* modules/* themes/* i18n/* contrib/*
+
 OS:=$(shell uname)
 export OS
-ifeq ($(OS),Darwin)
-  MODULES += contrib/luaposix
-endif
 
-.PHONY: all build clean host hostclean
+.PHONY: all build gccbuild luabuild clean host gcchost luahost hostcopy hostclean
 
 all: build
 
-build:
-	for i in $(MODULES); do make -C$$i $(LUA_TARGET); done
+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
 
 clean:
 	for i in $(MODULES); do make -C$$i clean; done
 
-host: build
+
+host: build hostcopy
+
+gcchost: gccbuild hostcopy
+
+luahost: luabuild hostcopy
+
+hostcopy: 
 	mkdir -p host
-	for i in $(MODULES); do cp $$i/dist/* host/ -R 2>/dev/null || true; done
-	ln -sf .$(LUCI_INSTALLDIR) host/luci
-	
+	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
+
+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 host -rf
+	rm -rf host
+
+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					#