From 1bb4822dca6113f73e3bc89e2acf15935e6f8e92 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 3 Dec 2014 15:17:05 +0100 Subject: 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 --- .../luasrc/model/cbi/luci_diag/mactodevinfo.lua | 36 ++++++++++++++++++++++ .../model/cbi/luci_diag/netdiscover_devinfo.lua | 33 ++++++++++++++++++++ .../cbi/luci_diag/netdiscover_devinfo_config.lua | 30 ++++++++++++++++++ .../luci_diag/netdiscover_devinfo_config_mini.lua | 30 ++++++++++++++++++ .../cbi/luci_diag/netdiscover_devinfo_mini.lua | 33 ++++++++++++++++++++ .../luasrc/model/cbi/luci_diag/smap_devinfo.lua | 33 ++++++++++++++++++++ .../model/cbi/luci_diag/smap_devinfo_config.lua | 35 +++++++++++++++++++++ .../cbi/luci_diag/smap_devinfo_config_mini.lua | 36 ++++++++++++++++++++++ .../model/cbi/luci_diag/smap_devinfo_mini.lua | 33 ++++++++++++++++++++ 9 files changed, 299 insertions(+) create mode 100644 applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua create mode 100644 applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua create mode 100644 applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua create mode 100644 applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua create mode 100644 applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua create mode 100644 applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua create mode 100644 applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua create mode 100644 applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua create mode 100644 applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua (limited to 'applications/luci-app-diag-devinfo/luasrc/model') diff --git a/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua new file mode 100644 index 0000000000..baf02c89cf --- /dev/null +++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua @@ -0,0 +1,36 @@ +--[[ +LuCI - Lua Configuration Interface + +(c) 2009 Daniel Dickinson + +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 + +$Id$ +]]-- + +m = Map("mactodevinfo", luci.i18n.translate("MAC Device Info Overrides"), translate("Override the information returned by the MAC to Device Info Script (mac-to-devinfo) for a specified range of MAC Addresses")) + +s = m:section(TypedSection, "mactodevinfo", translate("MAC Device Override"), translate("MAC range and information used to override system and IEEE databases")) +s.addremove = true +s.anonymous = true + +v = s:option(Value, "name", translate("Name")) +v.optional = true +v = s:option(Value, "maclow", translate("Beginning of MAC address range")) +v.optional = false +v = s:option(Value, "machigh", translate("End of MAC address range")) +v.optional = false +v = s:option(Value, "vendor", translate("Vendor")) +v.optional = false +v = s:option(Value, "devtype", translate("Device Type")) +v.optional = false +v = s:option(Value, "model", translate("Model")) +v.optional = false +v = s:option(Value, "ouiowneroverride", translate("OUI Owner")) +v.optional = true + +return m diff --git a/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua new file mode 100644 index 0000000000..535c46ba7b --- /dev/null +++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua @@ -0,0 +1,33 @@ +--[[ +netdiscover_devinfo - SIP Device Information + +(c) 2009 Daniel Dickinson + +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 + +$Id$ +]]-- + +require("luci.i18n") +require("luci.util") +require("luci.sys") +require("luci.model.uci") +require("luci.controller.luci_diag.netdiscover_common") +require("luci.controller.luci_diag.devinfo_common") + +local debug = false + +m = SimpleForm("luci_devinfo", translate("Network Device Scan"), translate("Scans for devices on specified networks.")) +m.reset = false +m.submit = false + +local outnets = luci.controller.luci_diag.netdiscover_common.get_params() +luci.controller.luci_diag.devinfo_common.run_processes(outnets, luci.controller.luci_diag.netdiscover_common.command_function) +luci.controller.luci_diag.devinfo_common.parse_output(m, outnets, false, "netdiscover", false, debug) +luci.controller.luci_diag.netdiscover_common.action_links(m, false) + +return m diff --git a/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua new file mode 100644 index 0000000000..e982bcef6c --- /dev/null +++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua @@ -0,0 +1,30 @@ +--[[ +LuCI - Lua Configuration Interface + +(c) 2009 Daniel Dickinson + +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 + +$Id$ +]]-- + +require("luci.controller.luci_diag.devinfo_common") + +m = Map("luci_devinfo", translate("Network Device Scanning Configuration"), translate("Configure scanning for devices on specified networks. Decreasing \'Timeout\', \'Repeat Count\', and/or \'Sleep Between Requests\' may speed up scans, but also may fail to find some devices.")) + +s = m:section(SimpleSection, "", translate("Use Configuration")) +b = s:option(DummyValue, "_scans", translate("Perform Scans (this can take a few minutes)")) +b.value = "" +b.titleref = luci.dispatcher.build_url("admin", "status", "netdiscover_devinfo") + +scannet = m:section(TypedSection, "netdiscover_scannet", translate("Scanning Configuration"), translate("Networks to scan for devices")) +scannet.addremove = true +scannet.anonymous = false + +luci.controller.luci_diag.devinfo_common.config_devinfo_scan(m, scannet) + +return m diff --git a/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua new file mode 100644 index 0000000000..a99ddf9b82 --- /dev/null +++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua @@ -0,0 +1,30 @@ +--[[ +LuCI - Lua Configuration Interface + +(c) 2009 Daniel Dickinson + +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 + +$Id$ +]]-- + +require("luci.controller.luci_diag.devinfo_common") + +m = Map("luci_devinfo", translate("Network Device Scanning Configuration"), translate("Configure scanning for devices on specified networks. Decreasing \'Timeout\', \'Repeat Count\', and/or \'Sleep Between Requests\' may speed up scans, but also may fail to find some devices.")) + +s = m:section(SimpleSection, "", translate("Use Configuration")) +b = s:option(DummyValue, "_scans", translate("Perform Scans (this can take a few minutes)")) +b.value = "" +b.titleref = luci.dispatcher.build_url("mini", "diag", "netdiscover_devinfo") + +scannet = m:section(TypedSection, "netdiscover_scannet", translate("Scanning Configuration"), translate("Networks to scan for devices")) +scannet.addremove = true +scannet.anonymous = false + +luci.controller.luci_diag.devinfo_common.config_devinfo_scan(m, scannet) + +return m diff --git a/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua new file mode 100644 index 0000000000..271c114d2b --- /dev/null +++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua @@ -0,0 +1,33 @@ +--[[ +netdiscover_devinfo - SIP Device Information + +(c) 2009 Daniel Dickinson + +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 + +$Id$ +]]-- + +require("luci.i18n") +require("luci.util") +require("luci.sys") +require("luci.model.uci") +require("luci.controller.luci_diag.netdiscover_common") +require("luci.controller.luci_diag.devinfo_common") + +local debug = false + +m = SimpleForm("luci_devinfo", translate("Network Device Scan"), translate("Scan for devices on specified networks.")) +m.reset = false +m.submit = false + +local outnets = luci.controller.luci_diag.netdiscover_common.get_params() +luci.controller.luci_diag.devinfo_common.run_processes(outnets, luci.controller.luci_diag.netdiscover_common.command_function) +luci.controller.luci_diag.devinfo_common.parse_output(m, outnets, false, "netdiscover", true, debug) +luci.controller.luci_diag.netdiscover_common.action_links(m, true) + +return m diff --git a/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua new file mode 100644 index 0000000000..ff808d9ef7 --- /dev/null +++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua @@ -0,0 +1,33 @@ +--[[ +smap_devinfo - SIP Device Information + +(c) 2009 Daniel Dickinson + +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 + +$Id$ +]]-- + +require("luci.i18n") +require("luci.util") +require("luci.sys") +require("luci.model.uci") +require("luci.controller.luci_diag.smap_common") +require("luci.controller.luci_diag.devinfo_common") + +local debug = false + +m = SimpleForm("luci-smap-to-devinfo", translate("SIP Device Information"), translate("Scan for supported SIP devices on specified networks.")) +m.reset = false +m.submit = false + +local outnets = luci.controller.luci_diag.smap_common.get_params() +luci.controller.luci_diag.devinfo_common.run_processes(outnets, luci.controller.luci_diag.smap_common.command_function) +luci.controller.luci_diag.devinfo_common.parse_output(m, outnets, true, "smap", false, debug) +luci.controller.luci_diag.smap_common.action_links(m, false) + +return m diff --git a/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua new file mode 100644 index 0000000000..20b6987f2d --- /dev/null +++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua @@ -0,0 +1,35 @@ +--[[ +LuCI - Lua Configuration Interface + +(c) 2009 Daniel Dickinson + +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 + +$Id$ +]]-- + +require("luci.controller.luci_diag.devinfo_common") + +m = Map("luci_devinfo", translate("SIP Device Scanning Configuration"), translate("Configure scanning for supported SIP devices on specified networks. Decreasing \'Timeout\', \'Repeat Count\', and/or \'Sleep Between Requests\' may speed up scans, but also may fail to find some devices.")) + +s = m:section(SimpleSection, "", translate("Use Configuration")) +b = s:option(DummyValue, "_scans", translate("Perform Scans (this can take a few minutes)")) +b.value = "" +b.titleref = luci.dispatcher.build_url("admin", "status", "smap_devinfo") + +scannet = m:section(TypedSection, "smap_scannet", translate("Scanning Configuration"), translate("Networks to scan for supported devices")) +scannet.addremove = true +scannet.anonymous = false + +local ports +ports = scannet:option(Value, "ports", translate("Ports")) +ports.optional = true +ports.rmempty = true + +luci.controller.luci_diag.devinfo_common.config_devinfo_scan(m, scannet) + +return m diff --git a/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua new file mode 100644 index 0000000000..aff4a98aed --- /dev/null +++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua @@ -0,0 +1,36 @@ +--[[ +LuCI - Lua Configuration Interface + +(c) 2009 Daniel Dickinson + +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 + +$Id$ +]]-- + +require("luci.controller.luci_diag.devinfo_common") + +m = Map("luci_devinfo", translate("Phone Scanning Configuration"), translate("Configure scanning for supported SIP devices on specified networks. Decreasing \'Timeout\', \'Repeat Count\', and/or \'Sleep Between Requests\' may speed up scans, but also may fail to find some devices.")) + +s = m:section(SimpleSection, "", translate("Use Configuration")) +b = s:option(DummyValue, "_scans", translate("Perform Scans (this can take a few minutes)")) +b.value = "" +b.titleref = luci.dispatcher.build_url("mini", "diag", "phone_scan") + +scannet = m:section(TypedSection, "smap_scannet", translate("Scanning Configuration"), translate("Networks to scan for supported devices")) +scannet.addremove = true +scannet.anonymous = false + +local ports +ports = scannet:option(Value, "ports", translate("Ports")) +ports.optional = true +ports.rmempty = true + +luci.controller.luci_diag.devinfo_common.config_devinfo_scan(m, scannet) + + +return m diff --git a/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua new file mode 100644 index 0000000000..5b7bb0f0a4 --- /dev/null +++ b/applications/luci-app-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua @@ -0,0 +1,33 @@ +--[[ +smap_devinfo - SIP Device Information + +(c) 2009 Daniel Dickinson + +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 + +$Id$ +]]-- + +require("luci.i18n") +require("luci.util") +require("luci.sys") +require("luci.model.uci") +require("luci.controller.luci_diag.smap_common") +require("luci.controller.luci_diag.devinfo_common") + +local debug = false + +m = SimpleForm("luci-smap-to-devinfo", translate("Phone Information"), translate("Scan for supported SIP devices on specified networks.")) +m.reset = false +m.submit = false + +local outnets = luci.controller.luci_diag.smap_common.get_params() +luci.controller.luci_diag.devinfo_common.run_processes(outnets, luci.controller.luci_diag.smap_common.command_function) +luci.controller.luci_diag.devinfo_common.parse_output(m, outnets, true, "smap", true, debug) +luci.controller.luci_diag.smap_common.action_links(m, true) + +return m -- cgit v1.2.3