X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=6c7d399e76f994520ae2d3f0b732bd2fd5676b42;hp=fa9a407303108e79771325151a829ff21afe718c;hb=9eb8e378ae6a5bb2bb7d23f97b610dccfa6e7609;hpb=6b0b22688c27d290542f8b86d12183b5c4cd43fd diff --git a/Makefile b/Makefile index fa9a40730..6c7d399e7 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 @@ -29,13 +29,56 @@ 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 + mkdir -p host/tmp + 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 + rm -rf /tmp/luci-* || true -run: host - ./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" + +uvldocs: hostenv + build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) \ + "build/uvldoc $(realpath host) $(UVL_SCHEMEDIR) uvldocs $(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 #