X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=558ee352bf9815eef3425be311b99d0d9c9ac825;hp=57b3efd629fe6f73fc2e281ca4aab581c3a5d485;hb=eff278317eed2f87f3e04715ed8b9e52d4ca01c0;hpb=9ba8d2aea994c832316f111354668f52de831043

diff --git a/Makefile b/Makefile
index 57b3efd62..558ee352b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,79 @@
-LUAC = luac
-LUAC_OPTIONS = -s
+include build/config.mk
 
-FILES = ffluci/debug.lua
+MODULES = applications/* libs/* modules/* themes/* i18n/* contrib/*
 
-CFILES = ffluci/util.lua ffluci/http.lua ffluci/fs.lua \
-ffluci/sys.lua ffluci/model/uci.lua ffluci/model/ipkg.lua \
-ffluci/config.lua ffluci/i18n.lua ffluci/template.lua \
-ffluci/cbi.lua ffluci/dispatcher.lua ffluci/menu.lua ffluci/init.lua 
+OS:=$(shell uname)
+export OS
 
-DIRECTORIES = dist/ffluci/model/cbi dist/ffluci/model/menu dist/ffluci/controller dist/ffluci/i18n dist/ffluci/view
+.PHONY: all build gccbuild luabuild clean host gcchost luahost hostcopy hostclean
 
-INFILES = $(CFILES:%=src/%)
-OUTFILE = ffluci/init.lua
+all: build
 
-.PHONY: all dist-compile dist-source examples-compile examples-source dist examples compile source clean
+build: gccbuild luabuild
 
-all: compile
+gccbuild:
+	for i in $(MODULES); do make -C$$i compile; done	
 
-dist-compile: compile dist
-dist-source: source dist
+luabuild:
+	for i in $(MODULES); do make -C$$i luabuild; done
 
-dist:
-	cp src/ffluci/controller/* dist/ffluci/controller/ -R
-	cp src/ffluci/i18n/* dist/ffluci/i18n/
-	cp src/ffluci/view/* dist/ffluci/view/ -R
-	cp src/ffluci/model/cbi/* dist/ffluci/model/cbi/ -R
-	cp src/ffluci/model/menu/* dist/ffluci/model/menu/ -R
+clean:
+	rm -rf docs
+	for i in $(MODULES); do make -C$$i clean; done
 
-compile:
-	mkdir -p $(DIRECTORIES)
-	$(LUAC) $(LUAC_OPTIONS) -o dist/$(OUTFILE) $(INFILES)
-	for i in $(CFILES); do [ -f dist/$$i ] || ln -s `dirname $$i | cut -s -d / -f 2- | sed -e 's/[^/]*\/*/..\//g'``basename $(OUTFILE)` dist/$$i; done
-	for i in $(FILES); do cp src/$$i dist/$$i; done
 
-source:
-	mkdir -p $(DIRECTORIES)
-	for i in $(CFILES); do cp src/$$i dist/$$i; done
-	for i in $(FILES); do cp src/$$i dist/$$i; done
-	
-clean:
-	rm dist -rf
+host: build hostcopy
+
+gcchost: gccbuild hostcopy
+
+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
+
+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					#