projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: rewrite mkversion.sh to use git metadata (#239)
[project/luci.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
3bf8c68
..
70a7e92
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-3,6
+3,8
@@
include build/config.mk
MODULES = contrib/* applications/* libs/* modules/* themes/* i18n/*
OS:=$(shell uname)
MODULES = contrib/* applications/* libs/* modules/* themes/* i18n/*
OS:=$(shell uname)
+MODULES:=$(foreach item,$(wildcard $(MODULES)),$(if $(realpath $(wildcard $(item)/Makefile)),$(item)))
+
export OS
.PHONY: all build gccbuild luabuild clean host gcchost luahost hostcopy hostclean
export OS
.PHONY: all build gccbuild luabuild clean host gcchost luahost hostcopy hostclean
@@
-12,24
+14,26
@@
all: build
build: gccbuild luabuild
gccbuild:
build: gccbuild luabuild
gccbuild:
- make -C
libs/lmo CC="cc" CFLAGS="" LDFLAGS="
" host-install
+ make -C
modules/base CC="cc" CFLAGS="" LDFLAGS="" SDK="$(shell test -f .running-sdk && echo 1)
" host-install
for i in $(MODULES); do \
for i in $(MODULES); do \
- make -C$$i compile || { \
+ make -C$$i
SDK="$(shell test -f .running-sdk && echo 1)"
compile || { \
echo "*** Compilation of $$i failed!"; \
exit 1; \
}; \
done
luabuild: i18nbuild
echo "*** Compilation of $$i failed!"; \
exit 1; \
}; \
done
luabuild: i18nbuild
- for i in $(MODULES); do HOST=$(realpath host) make -C$$i luabuild; done
+ for i in $(MODULES); do HOST=$(realpath host) \
+ SDK="$(shell test -f .running-sdk && echo 1)" make -C$$i luabuild; done
i18nbuild:
mkdir -p host/lua-po
./build/i18n-po2lua.pl ./po host/lua-po
clean:
i18nbuild:
mkdir -p host/lua-po
./build/i18n-po2lua.pl ./po host/lua-po
clean:
+ rm -f .running-sdk
rm -rf docs
rm -rf docs
- make -C
libs/lmo
host-clean
+ make -C
modules/base
host-clean
for i in $(MODULES); do make -C$$i clean; done
for i in $(MODULES); do make -C$$i clean; done
@@
-48,13
+52,17
@@
hostcopy:
ln -s .$(LUCI_MODULEDIR) host/luci
rm -rf /tmp/luci-* || true
ln -s .$(LUCI_MODULEDIR) host/luci
rm -rf /tmp/luci-* || true
-hostenv: host ucidefaults
+hostenv: sdk host ucidefaults
+
+sdk:
+ touch .running-sdk
ucidefaults:
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host)/bin/uci-defaults --exclude luci-freifunk-*"
ucidefaults:
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host)/bin/uci-defaults --exclude luci-freifunk-*"
-runhttpd: hostenv
- build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua build/lucid.lua"
+runuhttpd: hostenv
+ cp $(realpath build)/luci.cgi $(realpath host)/www/cgi-bin/luci
+ build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host)/usr/sbin/uhttpd -p 8080 -h $(realpath host)/www -f"
runlua: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua -i build/setup.lua"
runlua: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua -i build/setup.lua"
@@
-68,9
+76,8
@@
hostclean: clean
apidocs: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "build/makedocs.sh host/luci/ docs"
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)"
+nixiodocs: hostenv
+ build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "build/makedocs.sh libs/nixio/ nixiodocs"
po: host
for L in $${LANGUAGE:-$$(find i18n/ -path 'i18n/*/luasrc/i18n/*' -name 'default.*.lua' | \
po: host
for L in $${LANGUAGE:-$$(find i18n/ -path 'i18n/*/luasrc/i18n/*' -name 'default.*.lua' | \
@@
-82,11
+89,8
@@
run:
# make run is deprecated #
# Please use: #
# #
# make run is deprecated #
# Please use: #
# #
- # To run LuCI WebUI using LuCIttpd #
- # make runhttpd #
- # #
- # To run LuCI WebUI using Boa/Webuci #
- # make runboa #
+ # To run LuCI WebUI using uhttpd #
+ # make runuhttpd #
# #
# To start a shell in the LuCI environment #
# make runshell #
# #
# To start a shell in the LuCI environment #
# make runshell #