Rework LuCI build system

 * Rename subdirectories to their repective OpenWrt package names
 * Make each LuCI module its own standalone package
 * Deploy a shared luci.mk which is used by each module Makefile

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

1 files changed, 0 insertions, 289 deletions

diff --git a/applications/luci-firewall/luasrc/tools/firewall.lua b/applications/luci-firewall/luasrc/tools/firewall.lua
deleted file mode 100644
index 07162cba5c..0000000000
--- a/applications/luci-firewall/luasrc/tools/firewall.lua
+++ /dev/null
@@ -1,289 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2011-2012 Jo-Philipp Wich <xm@subsignal.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-]]--
-
-module("luci.tools.firewall", package.seeall)
-
-local ut = require "luci.util"
-local ip = require "luci.ip"
-local nx = require "nixio"
-
-local translate, translatef = luci.i18n.translate, luci.i18n.translatef
-
-local function tr(...)
-	return tostring(translate(...))
-end
-
-function fmt_neg(x)
-	if type(x) == "string" then
-		local v, neg = x:gsub("^ *! *", "")
-		if neg > 0 then
-			return v, "%s " % tr("not")
-		else
-			return x, ""
-		end
-	end
-	return x, ""
-end
-
-function fmt_mac(x)
-	if x and #x > 0 then
-		local m, n
-		local l = { tr("MAC"), " " }
-		for m in ut.imatch(x) do
-			m, n = fmt_neg(m)
-			l[#l+1] = "<var>%s%s</var>" %{ n, m }
-			l[#l+1] = ", "
-		end
-		if #l > 1 then
-			l[#l] = nil
-			if #l > 3 then
-				l[1] = tr("MACs")
-			end
-			return table.concat(l, "")
-		end
-	end
-end
-
-function fmt_port(x, d)
-	if x and #x > 0 then
-		local p, n
-		local l = { tr("port"), " " }
-		for p in ut.imatch(x) do
-			p, n = fmt_neg(p)
-			local a, b = p:match("(%d+)%D+(%d+)")
-			if a and b then
-				l[1] = tr("ports")
-				l[#l+1] = "<var>%s%d-%d</var>" %{ n, a, b }
-			else
-				l[#l+1] = "<var>%s%d</var>" %{ n, p }
-			end
-			l[#l+1] = ", "
-		end
-		if #l > 1 then
-			l[#l] = nil
-			if #l > 3 then
-				l[1] = tr("ports")
-			end
-			return table.concat(l, "")
-		end
-	end
-	return d and "<var>%s</var>" % d
-end
-
-function fmt_ip(x, d)
-	if x and #x > 0 then
-		local l = { tr("IP"), " " }
-		local v, a, n
-		for v in ut.imatch(x) do
-			v, n = fmt_neg(v)
-			a, m = v:match("(%S+)/(%d+%.%S+)")
-			a = a or v
-			a = a:match(":") and ip.IPv6(a, m) or ip.IPv4(a, m)
-			if a and (a:is6() and a:prefix() < 128 or a:prefix() < 32) then
-				l[1] = tr("IP range")
-				l[#l+1] = "<var title='%s - %s'>%s%s</var>" %{
-					a:minhost():string(),
-					a:maxhost():string(),
-					n, a:string()
-				}
-			else
-				l[#l+1] = "<var>%s%s</var>" %{
-					n,
-					a and a:string() or v
-				}
-			end
-			l[#l+1] = ", "
-		end
-		if #l > 1 then
-			l[#l] = nil
-			if #l > 3 then
-				l[1] = tr("IPs")
-			end
-			return table.concat(l, "")
-		end
-	end
-	return d and "<var>%s</var>" % d
-end
-
-function fmt_zone(x, d)
-	if x == "*" then
-		return "<var>%s</var>" % tr("any zone")
-	elseif x and #x > 0 then
-		return "<var>%s</var>" % x
-	elseif d then
-		return "<var>%s</var>" % d
-	end
-end
-
-function fmt_icmp_type(x)
-	if x and #x > 0 then
-		local t, v, n
-		local l = { tr("type"), " " }
-		for v in ut.imatch(x) do
-			v, n = fmt_neg(v)
-			l[#l+1] = "<var>%s%s</var>" %{ n, v }
-			l[#l+1] = ", "
-		end
-		if #l > 1 then
-			l[#l] = nil
-			if #l > 3 then
-				l[1] = tr("types")
-			end
-			return table.concat(l, "")
-		end
-	end
-end
-
-function fmt_proto(x, icmp_types)
-	if x and #x > 0 then
-		local v, n
-		local l = { }
-		local t = fmt_icmp_type(icmp_types)
-		for v in ut.imatch(x) do
-			v, n = fmt_neg(v)
-			if v == "tcpudp" then
-				l[#l+1] = "TCP"
-				l[#l+1] = ", "
-				l[#l+1] = "UDP"
-				l[#l+1] = ", "
-			elseif v ~= "all" then
-				local p = nx.getproto(v)
-				if p then
-					-- ICMP
-					if (p.proto == 1 or p.proto == 58) and t then
-						l[#l+1] = translatef(
-							"%s%s with %s",
-							n, p.aliases[1] or p.name, t
-						)
-					else
-						l[#l+1] = "%s%s" %{
-							n,
-							p.aliases[1] or p.name
-						}
-					end
-					l[#l+1] = ", "
-				end
-			end
-		end
-		if #l > 0 then
-			l[#l] = nil
-			return table.concat(l, "")
-		end
-	end
-end
-
-function fmt_limit(limit, burst)
-	burst = tonumber(burst)
-	if limit and #limit > 0 then
-		local l, u = limit:match("(%d+)/(%w+)")
-		l = tonumber(l or limit)
-		u = u or "second"
-		if l then
-			if u:match("^s") then
-				u = tr("second")
-			elseif u:match("^m") then
-				u = tr("minute")
-			elseif u:match("^h") then
-				u = tr("hour")
-			elseif u:match("^d") then
-				u = tr("day")
-			end
-			if burst and burst > 0 then
-				return translatef("<var>%d</var> pkts. per <var>%s</var>, \
-				    burst <var>%d</var> pkts.", l, u, burst)
-			else
-				return translatef("<var>%d</var> pkts. per <var>%s</var>", l, u)
-			end
-		end
-	end
-end
-
-function fmt_target(x, dest)
-	if dest and #dest > 0 then
-		if x == "ACCEPT" then
-			return tr("Accept forward")
-		elseif x == "REJECT" then
-			return tr("Refuse forward")
-		elseif x == "NOTRACK" then
-			return tr("Do not track forward")
-		else --if x == "DROP" then
-			return tr("Discard forward")
-		end
-	else
-		if x == "ACCEPT" then
-			return tr("Accept input")
-		elseif x == "REJECT" then
-			return tr("Refuse input")
-		elseif x == "NOTRACK" then
-			return tr("Do not track input")
-		else --if x == "DROP" then
-			return tr("Discard input")
-		end
-	end
-end
-
-
-function opt_enabled(s, t, ...)
-	if t == luci.cbi.Button then
-		local o = s:option(t, "__enabled")
-		function o.render(self, section)
-			if self.map:get(section, "enabled") ~= "0" then
-				self.title      = tr("Rule is enabled")
-				self.inputtitle = tr("Disable")
-				self.inputstyle = "reset"
-			else
-				self.title      = tr("Rule is disabled")
-				self.inputtitle = tr("Enable")
-				self.inputstyle = "apply"
-			end
-			t.render(self, section)
-		end
-		function o.write(self, section, value)
-			if self.map:get(section, "enabled") ~= "0" then
-				self.map:set(section, "enabled", "0")
-			else
-				self.map:del(section, "enabled")
-			end
-		end
-		return o
-	else
-		local o = s:option(t, "enabled", ...)
-		o.default = "1"
-		return o
-	end
-end
-
-function opt_name(s, t, ...)
-	local o = s:option(t, "name", ...)
-
-	function o.cfgvalue(self, section)
-		return self.map:get(section, "name") or
-			self.map:get(section, "_name") or "-"
-	end
-
-	function o.write(self, section, value)
-		if value ~= "-" then
-			self.map:set(section, "name", value)
-			self.map:del(section, "_name")
-		else
-			self:remove(section)
-		end
-	end
-
-	function o.remove(self, section)
-		self.map:del(section, "name")
-		self.map:del(section, "_name")
-	end
-
-	return o
-end