summaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile51
1 files changed, 35 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 8ac0ac664..12c1d89e0 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
@@ -31,26 +30,46 @@ 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
- export LUA_PATH="`pwd`/host$(LUCI_MODULEDIR);;"
- export LUA_CPATH="`pwd`/host$(LUCI_LIBRARYDIR);;"
- 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
- export LUA_PATH="`pwd`/host$(LUCI_MODULEDIR);;"
- export LUA_CPATH="`pwd`/host$(LUCI_LIBRARYDIR);;"
- 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
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 #