From 8b8d83e42dd3d10d82e29a8614a7b3e3e94b16c6 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Mon, 1 Jul 2019 21:52:07 +0200 Subject: [PATCH] luci-base: move some generic classes into a separate luci-base-libs package The new package luci-base-libs provides the modules that not strictly relate to the web-interface of luci. By separating these libs they can be used by other packages without having to install the web-components. This change was inspired by providing a shell-only interface for 4MB-flash devices, by keeping as much code common with a full install. Signed-off-by: Sven Roederer --- libs/luci-lib-base/Makefile | 14 ++++++++++++++ .../luci-lib-base}/luasrc/debug.lua | 0 .../luci-lib-base}/luasrc/http.lua | 0 .../luci-lib-base}/luasrc/http.luadoc | 0 .../luci-lib-base}/luasrc/ltn12.lua | 0 .../luci-lib-base}/luasrc/util.lua | 0 .../luci-lib-base}/luasrc/util.luadoc | 0 libs/luci-lib-httpclient/Makefile | 2 +- libs/luci-lib-httpprotoutils/Makefile | 2 +- 9 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 libs/luci-lib-base/Makefile rename {modules/luci-base => libs/luci-lib-base}/luasrc/debug.lua (100%) rename {modules/luci-base => libs/luci-lib-base}/luasrc/http.lua (100%) rename {modules/luci-base => libs/luci-lib-base}/luasrc/http.luadoc (100%) rename {modules/luci-base => libs/luci-lib-base}/luasrc/ltn12.lua (100%) rename {modules/luci-base => libs/luci-lib-base}/luasrc/util.lua (100%) rename {modules/luci-base => libs/luci-lib-base}/luasrc/util.luadoc (100%) diff --git a/libs/luci-lib-base/Makefile b/libs/luci-lib-base/Makefile new file mode 100644 index 0000000000..35b1836ecd --- /dev/null +++ b/libs/luci-lib-base/Makefile @@ -0,0 +1,14 @@ +# +# Copyright (C) 2008-2014 The LuCI Team +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=basic libraries for luci +LUCI_DEPENDS:=+lua +luci-lib-nixio +luci-lib-ip +luci-lib-jsonc +liblucihttp-lua + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/modules/luci-base/luasrc/debug.lua b/libs/luci-lib-base/luasrc/debug.lua similarity index 100% rename from modules/luci-base/luasrc/debug.lua rename to libs/luci-lib-base/luasrc/debug.lua diff --git a/modules/luci-base/luasrc/http.lua b/libs/luci-lib-base/luasrc/http.lua similarity index 100% rename from modules/luci-base/luasrc/http.lua rename to libs/luci-lib-base/luasrc/http.lua diff --git a/modules/luci-base/luasrc/http.luadoc b/libs/luci-lib-base/luasrc/http.luadoc similarity index 100% rename from modules/luci-base/luasrc/http.luadoc rename to libs/luci-lib-base/luasrc/http.luadoc diff --git a/modules/luci-base/luasrc/ltn12.lua b/libs/luci-lib-base/luasrc/ltn12.lua similarity index 100% rename from modules/luci-base/luasrc/ltn12.lua rename to libs/luci-lib-base/luasrc/ltn12.lua diff --git a/modules/luci-base/luasrc/util.lua b/libs/luci-lib-base/luasrc/util.lua similarity index 100% rename from modules/luci-base/luasrc/util.lua rename to libs/luci-lib-base/luasrc/util.lua diff --git a/modules/luci-base/luasrc/util.luadoc b/libs/luci-lib-base/luasrc/util.luadoc similarity index 100% rename from modules/luci-base/luasrc/util.luadoc rename to libs/luci-lib-base/luasrc/util.luadoc diff --git a/libs/luci-lib-httpclient/Makefile b/libs/luci-lib-httpclient/Makefile index b8bd428b28..9c28c35d81 100644 --- a/libs/luci-lib-httpclient/Makefile +++ b/libs/luci-lib-httpclient/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=HTTP(S) client library -LUCI_DEPENDS:=+luci-base +luci-lib-nixio +luci-lib-httpprotoutils +LUCI_DEPENDS:=+luci-lib-base +luci-lib-nixio +luci-lib-httpprotoutils include ../../luci.mk diff --git a/libs/luci-lib-httpprotoutils/Makefile b/libs/luci-lib-httpprotoutils/Makefile index 851a362eb7..95f45d2002 100644 --- a/libs/luci-lib-httpprotoutils/Makefile +++ b/libs/luci-lib-httpprotoutils/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=HTTP protocol utility functions -LUCI_DEPENDS:=+luci-base +LUCI_DEPENDS:=+luci-lib-base include ../../luci.mk