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, 295 deletions

diff --git a/applications/luci-ddns/luasrc/tools/ddns.lua b/applications/luci-ddns/luasrc/tools/ddns.lua
deleted file mode 100644
index ad7b5e86f..000000000
--- a/applications/luci-ddns/luasrc/tools/ddns.lua
+++ /dev/null
@@ -1,295 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-shared module for luci-app-ddns
-Copyright 2014 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
-
-function parse_url copied from https://svn.nmap.org/nmap/nselib/url.lua
-Parses a URL and returns a table with all its parts according to RFC 2396.
-@author Diego Nehab	@author Eddie Bell <ejlbell@gmail.com>
-
-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.ddns", package.seeall)
-
-local NX   = require "nixio"
-local NXFS = require "nixio.fs"
-local OPKG = require "luci.model.ipkg"
-local UCI  = require "luci.model.uci"
-local SYS  = require "luci.sys"
-local UTIL = require "luci.util"
-
--- function to calculate seconds from given interval and unit
-function calc_seconds(interval, unit)
-	if not tonumber(interval) then
-		return nil
-	elseif unit == "days" then
-		return (tonumber(interval) * 86400)	-- 60 sec * 60 min * 24 h
-	elseif unit == "hours" then
-		return (tonumber(interval) * 3600)	-- 60 sec * 60 min
-	elseif unit == "minutes" then
-		return (tonumber(interval) * 60)	-- 60 sec
-	elseif unit == "seconds" then
-		return tonumber(interval)
-	else
-		return nil
-	end
-end
-
--- check if IPv6 supported by OpenWrt
-function check_ipv6()
-	return NXFS.access("/proc/net/ipv6_route")
-	   and NXFS.access("/usr/sbin/ip6tables")
-end
-
--- check if Wget with SSL support or cURL installed
-function check_ssl()
-	if (SYS.call([[ grep -iq "\+ssl" /usr/bin/wget 2>/dev/null ]]) == 0) then
-		return true
-	else
-		return NXFS.access("/usr/bin/curl")
-	end
-end
-
--- check if Wget with SSL or cURL with proxy support installed
-function check_proxy()
-	-- we prefere GNU Wget for communication
-	if (SYS.call([[ grep -iq "\+ssl" /usr/bin/wget 2>/dev/null ]]) == 0) then
-		return true
-
-	-- if not installed cURL must support proxy
-	elseif NXFS.access("/usr/bin/curl") then
-		return (SYS.call([[ grep -iq all_proxy /usr/lib/libcurl.so* 2>/dev/null ]]) == 0)
-
-	-- only BusyBox Wget is installed
-	else
-		return NXFS.access("/usr/bin/wget")
-	end
-end
-
--- check if BIND host installed
-function check_bind_host()
-	return NXFS.access("/usr/bin/host")
-end
-
--- convert epoch date to given format
-function epoch2date(epoch, format)
-	if not format or #format < 2 then
-		local uci = UCI.cursor()
-		format    = uci:get("ddns", "global", "date_format") or "%F %R"
-		uci:unload("ddns")
-	end
-	format = format:gsub("%%n", "<br />")	-- replace newline
-	format = format:gsub("%%t", "    ")	-- replace tab
-	return os.date(format, epoch)
-end
-
--- read lastupdate from [section].update file
-function get_lastupd(section)
-	local uci     = UCI.cursor()
-	local run_dir = uci:get("ddns", "global", "run_dir") or "/var/run/ddns"
-	local etime   = tonumber(NXFS.readfile("%s/%s.update" % { run_dir, section } ) or 0 )
-	uci:unload("ddns")
-	return etime
-end
-
--- read PID from run file and verify if still running
-function get_pid(section)
-	local uci     = UCI.cursor()
-	local run_dir = uci:get("ddns", "global", "run_dir") or "/var/run/ddns"
-	local pid     = tonumber(NXFS.readfile("%s/%s.pid" % { run_dir, section } ) or 0 )
-	if pid > 0 and not NX.kill(pid, 0) then
-		pid = 0
-	end
-	uci:unload("ddns")
-	return pid
-end
-
--- read version information for given package if installed
-function ipkg_version(package)
-	if not package then
-		return nil
-	end
-	local info = OPKG.info(package)
-	local data = {}
-	local version = ""
-	local i = 0
-	for k, v in pairs(info) do
-		if v.Package == package and v.Status.installed then
-			version = v.Version
-			i = i + 1
-		end
-	end
-	if i > 1 then	-- more then one valid record
-		return data
-	end
-	local sver = UTIL.split(version, "[%.%-]", nil, true)
-	data = {
-		version = version,
-		major   = tonumber(sver[1]) or 0,
-		minor   = tonumber(sver[2]) or 0,
-		patch   = tonumber(sver[3]) or 0,
-		build   = tonumber(sver[4]) or 0
-	}
-	return data
-end
-
--- replacement of build-in read of UCI option
--- modified AbstractValue.cfgvalue(self, section) from cbi.lua
--- needed to read from other option then current value definition
-function read_value(self, section, option)
-	local value
-	if self.tag_error[section] then
-		value = self:formvalue(section)
-	else
-		value = self.map:get(section, option)
-	end
-
-	if not value then
-		return nil
-	elseif not self.cast or self.cast == type(value) then
-		return value
-	elseif self.cast == "string" then
-		if type(value) == "table" then
-			return value[1]
-		end
-	elseif self.cast == "table" then
-		return { value }
-	end
-end
-
--- replacement of build-in Flag.parse of cbi.lua
--- modified to mark section as changed if value changes
--- current parse did not do this, but it is done AbstaractValue.parse()
-function flag_parse(self, section)
-	local fexists = self.map:formvalue(
-		luci.cbi.FEXIST_PREFIX .. self.config .. "." .. section .. "." .. self.option)
-
-	if fexists then
-		local fvalue = self:formvalue(section) and self.enabled or self.disabled
-		local cvalue = self:cfgvalue(section)
-		if fvalue ~= self.default or (not self.optional and not self.rmempty) then
-			self:write(section, fvalue)
-		else
-			self:remove(section)
-		end
-		if (fvalue ~= cvalue) then self.section.changed = true end
-	else
-		self:remove(section)
-		self.section.changed = true
-	end
-end
-
------------------------------------------------------------------------------
--- copied from https://svn.nmap.org/nmap/nselib/url.lua
--- @author Diego Nehab
--- @author Eddie Bell <ejlbell@gmail.com>
---[[
-    URI parsing, composition and relative URL resolution
-    LuaSocket toolkit.
-    Author: Diego Nehab
-    RCS ID: $Id: url.lua,v 1.37 2005/11/22 08:33:29 diego Exp $
-    parse_query and build_query added For nmap (Eddie Bell <ejlbell@gmail.com>)
-]]--
----
--- Parses a URL and returns a table with all its parts according to RFC 2396.
---
--- The following grammar describes the names given to the URL parts.
--- <code>
--- <url> ::= <scheme>://<authority>/<path>;<params>?<query>#<fragment>
--- <authority> ::= <userinfo>@<host>:<port>
--- <userinfo> ::= <user>[:<password>]
--- <path> :: = {<segment>/}<segment>
--- </code>
---
--- The leading <code>/</code> in <code>/<path></code> is considered part of
--- <code><path></code>.
--- @param url URL of request.
--- @param default Table with default values for each field.
--- @return A table with the following fields, where RFC naming conventions have
---   been preserved:
---     <code>scheme</code>, <code>authority</code>, <code>userinfo</code>,
---     <code>user</code>, <code>password</code>, <code>host</code>,
---     <code>port</code>, <code>path</code>, <code>params</code>,
---     <code>query</code>, and <code>fragment</code>.
------------------------------------------------------------------------------
-function parse_url(url)	--, default)
-	-- initialize default parameters
-	local parsed = {}
---	for i,v in base.pairs(default or parsed) do
---		parsed[i] = v
---	end
-
-	-- remove whitespace
---	url = string.gsub(url, "%s", "")
-	-- get fragment
-	url = string.gsub(url, "#(.*)$",
-		function(f)
-			parsed.fragment = f
-			return ""
-		end)
-	-- get scheme. Lower-case according to RFC 3986 section 3.1.
-	url = string.gsub(url, "^([%w][%w%+%-%.]*)%:",
-		function(s)
-			parsed.scheme = string.lower(s);
-			return ""
-		end)
-	-- get authority
-	url = string.gsub(url, "^//([^/]*)",
-		function(n)
-			parsed.authority = n
-			return ""
-		end)
-	-- get query stringing
-	url = string.gsub(url, "%?(.*)",
-		function(q)
-			parsed.query = q
-			return ""
-		end)
-	-- get params
-	url = string.gsub(url, "%;(.*)",
-		function(p)
-			parsed.params = p
-			return ""
-		end)
-	-- path is whatever was left
-	parsed.path = url
-
-	local authority = parsed.authority
-	if not authority then
-		return parsed
-	end
-	authority = string.gsub(authority,"^([^@]*)@",
-		function(u)
-			parsed.userinfo = u;
-			return ""
-		end)
-	authority = string.gsub(authority, ":([0-9]*)$",
-		function(p)
-			if p ~= "" then
-				parsed.port = p
-			end;
-			return ""
-		end)
-	if authority ~= "" then
-		parsed.host = authority
-	end
-
-	local userinfo = parsed.userinfo
-	if not userinfo then
-		return parsed
-	end
-	userinfo = string.gsub(userinfo, ":([^:]*)$",
-		function(p)
-			parsed.password = p;
-			return ""
-		end)
-	parsed.user = userinfo
-	return parsed
-end