diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2014-12-03 15:17:05 +0100 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-08 16:26:20 +0100 |
commit | 1bb4822dca6113f73e3bc89e2acf15935e6f8e92 (patch) | |
tree | 35e16f100466e4e00657199b38bb3d87d52bf73f /applications/luci-diag-devinfo/luasrc/model/cbi | |
parent | 9edd0e46c3f880727738ce8ca6ff1c8b85f99ef4 (diff) |
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>
Diffstat (limited to 'applications/luci-diag-devinfo/luasrc/model/cbi')
9 files changed, 0 insertions, 299 deletions
diff --git a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua deleted file mode 100644 index baf02c89c..000000000 --- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua +++ /dev/null @@ -1,36 +0,0 @@ ---[[ -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-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua deleted file mode 100644 index 535c46ba7..000000000 --- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua +++ /dev/null @@ -1,33 +0,0 @@ ---[[ -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-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua deleted file mode 100644 index e982bcef6..000000000 --- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua +++ /dev/null @@ -1,30 +0,0 @@ ---[[ -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-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua deleted file mode 100644 index a99ddf9b8..000000000 --- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua +++ /dev/null @@ -1,30 +0,0 @@ ---[[ -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-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua deleted file mode 100644 index 271c114d2..000000000 --- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua +++ /dev/null @@ -1,33 +0,0 @@ ---[[ -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-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua deleted file mode 100644 index ff808d9ef..000000000 --- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua +++ /dev/null @@ -1,33 +0,0 @@ ---[[ -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-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua deleted file mode 100644 index 20b6987f2..000000000 --- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua +++ /dev/null @@ -1,35 +0,0 @@ ---[[ -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-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua deleted file mode 100644 index aff4a98ae..000000000 --- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua +++ /dev/null @@ -1,36 +0,0 @@ ---[[ -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-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua b/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua deleted file mode 100644 index 5b7bb0f0a..000000000 --- a/applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua +++ /dev/null @@ -1,33 +0,0 @@ ---[[ -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 |