From 93ff578ac8f0cd4772285a6ea983cf02cc9be620 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 27 May 2008 09:33:52 +0000 Subject: [PATCH] * 3rd Package reorgnaisation * Moved core, web, cbi to libs * Refactored OpenWRT Makefile to separate Libraries, Webinterface Components, Freifunk packages --- contrib/package/luci/Makefile | 125 ++++++++++-------- core/Makefile | 2 - {applications => libs}/cbi/Makefile | 0 .../cbi/root/www/resources/cbi.js | 0 {applications => libs}/cbi/src/cbi.lua | 0 .../cbi/src/view/cbi/dvalue.htm | 0 .../cbi/src/view/cbi/footer.htm | 0 .../cbi/src/view/cbi/full_valuefooter.htm | 0 .../cbi/src/view/cbi/full_valueheader.htm | 0 .../cbi/src/view/cbi/fvalue.htm | 0 .../cbi/src/view/cbi/header.htm | 0 .../cbi/src/view/cbi/lvalue.htm | 0 .../cbi/src/view/cbi/map.htm | 0 .../cbi/src/view/cbi/mvalue.htm | 0 .../cbi/src/view/cbi/nsection.htm | 0 .../cbi/src/view/cbi/tblsection.htm | 0 .../cbi/src/view/cbi/tiny_valuefooter.htm | 0 .../cbi/src/view/cbi/tiny_valueheader.htm | 0 .../cbi/src/view/cbi/tsection.htm | 0 .../cbi/src/view/cbi/ucisection.htm | 0 .../cbi/src/view/cbi/value.htm | 0 .../cbi/src/view/cbi/valuefooter.htm | 0 .../cbi/src/view/cbi/valueheader.htm | 0 libs/core/Makefile | 2 + {core => libs/core}/src/bits.lua | 0 {core => libs/core}/src/debug.lua | 0 {core => libs/core}/src/fs.lua | 0 {core => libs/core}/src/init.lua | 0 {core => libs/core}/src/model/ipkg.lua | 0 {core => libs/core}/src/model/uci.lua | 0 {core => libs/core}/src/model/uci/libuci.lua | 0 {core => libs/core}/src/model/uci/wrapper.lua | 0 {core => libs/core}/src/sys.lua | 0 {core => libs/core}/src/sys/iptparser.lua | 0 {core => libs/core}/src/util.lua | 0 {applications => libs}/sgi-haserl/Makefile | 0 .../sgi-haserl/root/www/cgi-bin/index.cgi | 0 .../sgi-haserl/root/www/cgi-bin/luci | 0 .../sgi-haserl/root/www/cgi-bin/luci-upload | 0 .../sgi-haserl/root/www/index.html | 0 .../sgi-haserl/src/sgi/haserl.lua | 0 {applications => libs}/sgi-webuci/Makefile | 0 .../sgi-webuci/root/lib/webuci/main.lua | 0 .../sgi-webuci/src/sgi/webuci.lua | 0 libs/web/Makefile | 2 + {web => libs/web}/root/etc/config/luci | 0 {web => libs/web}/src/config.lua | 0 {web => libs/web}/src/dispatcher.lua | 0 {web => libs/web}/src/http.lua | 0 {web => libs/web}/src/i18n.lua | 0 {web => libs/web}/src/template.lua | 0 web/Makefile | 2 - 52 files changed, 76 insertions(+), 57 deletions(-) delete mode 100644 core/Makefile rename {applications => libs}/cbi/Makefile (100%) rename {applications => libs}/cbi/root/www/resources/cbi.js (100%) rename {applications => libs}/cbi/src/cbi.lua (100%) rename {applications => libs}/cbi/src/view/cbi/dvalue.htm (100%) rename {applications => libs}/cbi/src/view/cbi/footer.htm (100%) rename {applications => libs}/cbi/src/view/cbi/full_valuefooter.htm (100%) rename {applications => libs}/cbi/src/view/cbi/full_valueheader.htm (100%) rename {applications => libs}/cbi/src/view/cbi/fvalue.htm (100%) rename {applications => libs}/cbi/src/view/cbi/header.htm (100%) rename {applications => libs}/cbi/src/view/cbi/lvalue.htm (100%) rename {applications => libs}/cbi/src/view/cbi/map.htm (100%) rename {applications => libs}/cbi/src/view/cbi/mvalue.htm (100%) rename {applications => libs}/cbi/src/view/cbi/nsection.htm (100%) rename {applications => libs}/cbi/src/view/cbi/tblsection.htm (100%) rename {applications => libs}/cbi/src/view/cbi/tiny_valuefooter.htm (100%) rename {applications => libs}/cbi/src/view/cbi/tiny_valueheader.htm (100%) rename {applications => libs}/cbi/src/view/cbi/tsection.htm (100%) rename {applications => libs}/cbi/src/view/cbi/ucisection.htm (100%) rename {applications => libs}/cbi/src/view/cbi/value.htm (100%) rename {applications => libs}/cbi/src/view/cbi/valuefooter.htm (100%) rename {applications => libs}/cbi/src/view/cbi/valueheader.htm (100%) create mode 100644 libs/core/Makefile rename {core => libs/core}/src/bits.lua (100%) rename {core => libs/core}/src/debug.lua (100%) rename {core => libs/core}/src/fs.lua (100%) rename {core => libs/core}/src/init.lua (100%) rename {core => libs/core}/src/model/ipkg.lua (100%) rename {core => libs/core}/src/model/uci.lua (100%) rename {core => libs/core}/src/model/uci/libuci.lua (100%) rename {core => libs/core}/src/model/uci/wrapper.lua (100%) rename {core => libs/core}/src/sys.lua (100%) rename {core => libs/core}/src/sys/iptparser.lua (100%) rename {core => libs/core}/src/util.lua (100%) rename {applications => libs}/sgi-haserl/Makefile (100%) rename {applications => libs}/sgi-haserl/root/www/cgi-bin/index.cgi (100%) rename {applications => libs}/sgi-haserl/root/www/cgi-bin/luci (100%) rename {applications => libs}/sgi-haserl/root/www/cgi-bin/luci-upload (100%) rename {applications => libs}/sgi-haserl/root/www/index.html (100%) rename {applications => libs}/sgi-haserl/src/sgi/haserl.lua (100%) rename {applications => libs}/sgi-webuci/Makefile (100%) rename {applications => libs}/sgi-webuci/root/lib/webuci/main.lua (100%) rename {applications => libs}/sgi-webuci/src/sgi/webuci.lua (100%) create mode 100644 libs/web/Makefile rename {web => libs/web}/root/etc/config/luci (100%) rename {web => libs/web}/src/config.lua (100%) rename {web => libs/web}/src/dispatcher.lua (100%) rename {web => libs/web}/src/http.lua (100%) rename {web => libs/web}/src/i18n.lua (100%) rename {web => libs/web}/src/template.lua (100%) delete mode 100644 web/Makefile diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 3c5e1d87e..f2a26245d 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -30,35 +30,65 @@ define Build/Compile endef -define Package/luci/template +### Templates ### + +define Package/luci/libtemplate SECTION:=admin CATEGORY:=Administration TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.freifunk-halle.net/ MAINTAINER:=Steven Barth + SUBMENU:=LuCI - Libraries + DEPENDS:=+luci-core +endef + +define Package/luci/fftemplate + $(call Package/luci/libtemplate) + SUBMENU:=LuCI - Freifunk Support + DEPENDS:=+luci-mod-freifunk +endef + +define Package/luci/webtemplate + $(call Package/luci/libtemplate) + SUBMENU:=LuCI - Webinterface Components endef + define Package/luci/install/template $(CP) $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R endef -define Package/luci - $(call Package/luci/template) - MENU:=1 + +### Core package ### + +define Package/luci-core + $(call Package/luci/libtemplate) DEPENDS:=+lua +luaposix + TITLE:=LuCI core libraries +endef + +define Package/luci-core/install + $(call Package/luci/install/template,$(1),libs/core) endef -define Package/luci/install - $(call Package/luci/install/template,$(1),core) + +### Libraries ### +define Package/luci-cbi + $(call Package/luci/libtemplate) + DEPENDS+=+luci-web + TITLE:=Configuration Binding Interface +endef + +define Package/luci-cbi/install + $(call Package/luci/install/template,$(1),libs/cbi) endef -### Web Packages ### define Package/luci-web - $(call Package/luci/template) - DEPENDS:=luci +luci-addons - TITLE:=LuCI - Webframework + $(call Package/luci/libtemplate) + DEPENDS+=+luci-addons + TITLE:=MVC Webframework endef define Package/luci-web/conffiles @@ -66,7 +96,7 @@ define Package/luci-web/conffiles endef define Package/luci-web/install - $(call Package/luci/install/template,$(1),web) + $(call Package/luci/install/template,$(1),libs/web) $(call Package/luci/install/template,$(1),themes/fledermaus) endef @@ -75,9 +105,9 @@ endef ### Community Packages ### define Package/luci-ff-halle - $(call Package/luci/template) - DEPENDS:=luci \ - +luci-sgi-haserl +luci-mod-freifunk +luci-app-splash \ + $(call Package/luci/fftemplate) + DEPENDS+= \ + +luci-sgi-haserl +luci-app-splash \ +luci-app-ffwizard-leipzig \ +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \ +kmod-tun +ip @@ -89,9 +119,9 @@ endef define Package/luci-ff-leipzig - $(call Package/luci/template) - DEPENDS:=luci \ - +luci-sgi-haserl +luci-mod-freifunk +luci-app-splash \ + $(call Package/luci/fftemplate) + DEPENDS+= \ + +luci-sgi-haserl +luci-app-splash \ +luci-app-ffwizard-leipzig \ +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \ +kmod-tun +ip @@ -105,9 +135,9 @@ endef define Package/luci-ff-hannover - $(call Package/luci/template) - DEPENDS:=luci \ - +luci-sgi-haserl +luci-mod-freifunk +luci-app-splash \ + $(call Package/luci/fftemplate) + DEPENDS+= \ + +luci-sgi-haserl +luci-app-splash \ +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice TITLE:=Freifunk Hannover Community Meta-Package URL:=http://www.freifunk-hannover.de/ @@ -123,9 +153,9 @@ endef ### Modules ### define Package/luci-mod-admin-core - $(call Package/luci/template) - DEPENDS:=luci +luci-web +luci-app-cbi - TITLE:=Core administrative pages + $(call Package/luci/webtemplate) + DEPENDS+=+luci-web +luci-cbi + TITLE:=Administration module endef define Package/luci-mod-admin-core/install @@ -134,9 +164,9 @@ endef define Package/luci-mod-freifunk - $(call Package/luci/template) - DEPENDS:=luci +luci-mod-admin-core +luci-app-firewall - TITLE:=Freifunk public and administrative pages + $(call Package/luci/fftemplate) + DEPENDS:=+luci-mod-admin-core + TITLE:=LuCI Freifunk module endef define Package/luci-mod-freifunk/conffiles @@ -151,20 +181,9 @@ endef ### Applications ### -define Package/luci-app-cbi - $(call Package/luci/template) - DEPENDS:=luci +luci-web - TITLE:=Configuration Binding Interface -endef - -define Package/luci-app-cbi/install - $(call Package/luci/install/template,$(1),applications/cbi) -endef - - define Package/luci-app-ffwizard-leipzig - $(call Package/luci/template) - DEPENDS:=luci +luci-mod-freifunk + $(call Package/luci/fftemplate) + DEPENDS+=+luci-app-firewall TITLE:=Freifunk Leipzig configuration wizard endef @@ -174,8 +193,8 @@ endef define Package/luci-app-firewall - $(call Package/luci/template) - DEPENDS:=luci +luci-mod-admin-core + $(call Package/luci/webtemplate) + DEPENDS+=+luci-mod-admin-core TITLE:=Firewall and Portforwarding application endef @@ -190,8 +209,8 @@ endef define Package/luci-app-splash - $(call Package/luci/template) - DEPENDS:=luci +luci-mod-freifunk +luci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt + $(call Package/luci/fftemplate) + DEPENDS+=+luci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt TITLE:=Freifunk DHCP-Splash application endef @@ -210,8 +229,8 @@ endef define Package/luci-app-statistics - $(call Package/luci/template) - DEPENDS:=luci +luci-mod-admin-core +collectd +collectd-mod-rrdtool1 +rrdtool1 + $(call Package/luci/webtemplate) + DEPENDS+=+luci-mod-admin-core +collectd +collectd-mod-rrdtool1 +rrdtool1 TITLE:=LuCI Statistics Application (incomplete) endef @@ -229,31 +248,32 @@ endef ### Server Gateway Interfaces ### define Package/luci-sgi-haserl - $(call Package/luci/template) - DEPENDS:=luci +luci-web +haserl-lua + $(call Package/luci/libtemplate) + DEPENDS+=+luci-web +haserl-lua TITLE:=SGI for Haserl endef define Package/luci-sgi-haserl/install - $(call Package/luci/install/template,$(1),applications/sgi-haserl) + $(call Package/luci/install/template,$(1),libs/sgi-haserl) $(CP) -a ./ipkg/luci-sgi-haserl.postinst $(1)/CONTROL/postinst endef define Package/luci-sgi-webuci - $(call Package/luci/template) - DEPENDS:=luci +luci-web + $(call Package/luci/libtemplate) + DEPENDS+=+luci-web TITLE:=SGI for Webuci endef define Package/luci-sgi-webuci/install - $(call Package/luci/install/template,$(1),applications/sgi-webuci) + $(call Package/luci/install/template,$(1),libs/sgi-webuci) endef -$(eval $(call BuildPackage,luci)) +$(eval $(call BuildPackage,luci-core)) +$(eval $(call BuildPackage,luci-cbi)) $(eval $(call BuildPackage,luci-web)) $(eval $(call BuildPackage,luci-ff-halle)) @@ -263,7 +283,6 @@ $(eval $(call BuildPackage,luci-ff-hannover)) $(eval $(call BuildPackage,luci-mod-admin-core)) $(eval $(call BuildPackage,luci-mod-freifunk)) -$(eval $(call BuildPackage,luci-app-cbi)) $(eval $(call BuildPackage,luci-app-ffwizard-leipzig)) $(eval $(call BuildPackage,luci-app-firewall)) $(eval $(call BuildPackage,luci-app-splash)) diff --git a/core/Makefile b/core/Makefile deleted file mode 100644 index 5e64bcd1f..000000000 --- a/core/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -include ../build/config.mk -include ../build/module.mk \ No newline at end of file diff --git a/applications/cbi/Makefile b/libs/cbi/Makefile similarity index 100% rename from applications/cbi/Makefile rename to libs/cbi/Makefile diff --git a/applications/cbi/root/www/resources/cbi.js b/libs/cbi/root/www/resources/cbi.js similarity index 100% rename from applications/cbi/root/www/resources/cbi.js rename to libs/cbi/root/www/resources/cbi.js diff --git a/applications/cbi/src/cbi.lua b/libs/cbi/src/cbi.lua similarity index 100% rename from applications/cbi/src/cbi.lua rename to libs/cbi/src/cbi.lua diff --git a/applications/cbi/src/view/cbi/dvalue.htm b/libs/cbi/src/view/cbi/dvalue.htm similarity index 100% rename from applications/cbi/src/view/cbi/dvalue.htm rename to libs/cbi/src/view/cbi/dvalue.htm diff --git a/applications/cbi/src/view/cbi/footer.htm b/libs/cbi/src/view/cbi/footer.htm similarity index 100% rename from applications/cbi/src/view/cbi/footer.htm rename to libs/cbi/src/view/cbi/footer.htm diff --git a/applications/cbi/src/view/cbi/full_valuefooter.htm b/libs/cbi/src/view/cbi/full_valuefooter.htm similarity index 100% rename from applications/cbi/src/view/cbi/full_valuefooter.htm rename to libs/cbi/src/view/cbi/full_valuefooter.htm diff --git a/applications/cbi/src/view/cbi/full_valueheader.htm b/libs/cbi/src/view/cbi/full_valueheader.htm similarity index 100% rename from applications/cbi/src/view/cbi/full_valueheader.htm rename to libs/cbi/src/view/cbi/full_valueheader.htm diff --git a/applications/cbi/src/view/cbi/fvalue.htm b/libs/cbi/src/view/cbi/fvalue.htm similarity index 100% rename from applications/cbi/src/view/cbi/fvalue.htm rename to libs/cbi/src/view/cbi/fvalue.htm diff --git a/applications/cbi/src/view/cbi/header.htm b/libs/cbi/src/view/cbi/header.htm similarity index 100% rename from applications/cbi/src/view/cbi/header.htm rename to libs/cbi/src/view/cbi/header.htm diff --git a/applications/cbi/src/view/cbi/lvalue.htm b/libs/cbi/src/view/cbi/lvalue.htm similarity index 100% rename from applications/cbi/src/view/cbi/lvalue.htm rename to libs/cbi/src/view/cbi/lvalue.htm diff --git a/applications/cbi/src/view/cbi/map.htm b/libs/cbi/src/view/cbi/map.htm similarity index 100% rename from applications/cbi/src/view/cbi/map.htm rename to libs/cbi/src/view/cbi/map.htm diff --git a/applications/cbi/src/view/cbi/mvalue.htm b/libs/cbi/src/view/cbi/mvalue.htm similarity index 100% rename from applications/cbi/src/view/cbi/mvalue.htm rename to libs/cbi/src/view/cbi/mvalue.htm diff --git a/applications/cbi/src/view/cbi/nsection.htm b/libs/cbi/src/view/cbi/nsection.htm similarity index 100% rename from applications/cbi/src/view/cbi/nsection.htm rename to libs/cbi/src/view/cbi/nsection.htm diff --git a/applications/cbi/src/view/cbi/tblsection.htm b/libs/cbi/src/view/cbi/tblsection.htm similarity index 100% rename from applications/cbi/src/view/cbi/tblsection.htm rename to libs/cbi/src/view/cbi/tblsection.htm diff --git a/applications/cbi/src/view/cbi/tiny_valuefooter.htm b/libs/cbi/src/view/cbi/tiny_valuefooter.htm similarity index 100% rename from applications/cbi/src/view/cbi/tiny_valuefooter.htm rename to libs/cbi/src/view/cbi/tiny_valuefooter.htm diff --git a/applications/cbi/src/view/cbi/tiny_valueheader.htm b/libs/cbi/src/view/cbi/tiny_valueheader.htm similarity index 100% rename from applications/cbi/src/view/cbi/tiny_valueheader.htm rename to libs/cbi/src/view/cbi/tiny_valueheader.htm diff --git a/applications/cbi/src/view/cbi/tsection.htm b/libs/cbi/src/view/cbi/tsection.htm similarity index 100% rename from applications/cbi/src/view/cbi/tsection.htm rename to libs/cbi/src/view/cbi/tsection.htm diff --git a/applications/cbi/src/view/cbi/ucisection.htm b/libs/cbi/src/view/cbi/ucisection.htm similarity index 100% rename from applications/cbi/src/view/cbi/ucisection.htm rename to libs/cbi/src/view/cbi/ucisection.htm diff --git a/applications/cbi/src/view/cbi/value.htm b/libs/cbi/src/view/cbi/value.htm similarity index 100% rename from applications/cbi/src/view/cbi/value.htm rename to libs/cbi/src/view/cbi/value.htm diff --git a/applications/cbi/src/view/cbi/valuefooter.htm b/libs/cbi/src/view/cbi/valuefooter.htm similarity index 100% rename from applications/cbi/src/view/cbi/valuefooter.htm rename to libs/cbi/src/view/cbi/valuefooter.htm diff --git a/applications/cbi/src/view/cbi/valueheader.htm b/libs/cbi/src/view/cbi/valueheader.htm similarity index 100% rename from applications/cbi/src/view/cbi/valueheader.htm rename to libs/cbi/src/view/cbi/valueheader.htm diff --git a/libs/core/Makefile b/libs/core/Makefile new file mode 100644 index 000000000..f7fac7740 --- /dev/null +++ b/libs/core/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk diff --git a/core/src/bits.lua b/libs/core/src/bits.lua similarity index 100% rename from core/src/bits.lua rename to libs/core/src/bits.lua diff --git a/core/src/debug.lua b/libs/core/src/debug.lua similarity index 100% rename from core/src/debug.lua rename to libs/core/src/debug.lua diff --git a/core/src/fs.lua b/libs/core/src/fs.lua similarity index 100% rename from core/src/fs.lua rename to libs/core/src/fs.lua diff --git a/core/src/init.lua b/libs/core/src/init.lua similarity index 100% rename from core/src/init.lua rename to libs/core/src/init.lua diff --git a/core/src/model/ipkg.lua b/libs/core/src/model/ipkg.lua similarity index 100% rename from core/src/model/ipkg.lua rename to libs/core/src/model/ipkg.lua diff --git a/core/src/model/uci.lua b/libs/core/src/model/uci.lua similarity index 100% rename from core/src/model/uci.lua rename to libs/core/src/model/uci.lua diff --git a/core/src/model/uci/libuci.lua b/libs/core/src/model/uci/libuci.lua similarity index 100% rename from core/src/model/uci/libuci.lua rename to libs/core/src/model/uci/libuci.lua diff --git a/core/src/model/uci/wrapper.lua b/libs/core/src/model/uci/wrapper.lua similarity index 100% rename from core/src/model/uci/wrapper.lua rename to libs/core/src/model/uci/wrapper.lua diff --git a/core/src/sys.lua b/libs/core/src/sys.lua similarity index 100% rename from core/src/sys.lua rename to libs/core/src/sys.lua diff --git a/core/src/sys/iptparser.lua b/libs/core/src/sys/iptparser.lua similarity index 100% rename from core/src/sys/iptparser.lua rename to libs/core/src/sys/iptparser.lua diff --git a/core/src/util.lua b/libs/core/src/util.lua similarity index 100% rename from core/src/util.lua rename to libs/core/src/util.lua diff --git a/applications/sgi-haserl/Makefile b/libs/sgi-haserl/Makefile similarity index 100% rename from applications/sgi-haserl/Makefile rename to libs/sgi-haserl/Makefile diff --git a/applications/sgi-haserl/root/www/cgi-bin/index.cgi b/libs/sgi-haserl/root/www/cgi-bin/index.cgi similarity index 100% rename from applications/sgi-haserl/root/www/cgi-bin/index.cgi rename to libs/sgi-haserl/root/www/cgi-bin/index.cgi diff --git a/applications/sgi-haserl/root/www/cgi-bin/luci b/libs/sgi-haserl/root/www/cgi-bin/luci similarity index 100% rename from applications/sgi-haserl/root/www/cgi-bin/luci rename to libs/sgi-haserl/root/www/cgi-bin/luci diff --git a/applications/sgi-haserl/root/www/cgi-bin/luci-upload b/libs/sgi-haserl/root/www/cgi-bin/luci-upload similarity index 100% rename from applications/sgi-haserl/root/www/cgi-bin/luci-upload rename to libs/sgi-haserl/root/www/cgi-bin/luci-upload diff --git a/applications/sgi-haserl/root/www/index.html b/libs/sgi-haserl/root/www/index.html similarity index 100% rename from applications/sgi-haserl/root/www/index.html rename to libs/sgi-haserl/root/www/index.html diff --git a/applications/sgi-haserl/src/sgi/haserl.lua b/libs/sgi-haserl/src/sgi/haserl.lua similarity index 100% rename from applications/sgi-haserl/src/sgi/haserl.lua rename to libs/sgi-haserl/src/sgi/haserl.lua diff --git a/applications/sgi-webuci/Makefile b/libs/sgi-webuci/Makefile similarity index 100% rename from applications/sgi-webuci/Makefile rename to libs/sgi-webuci/Makefile diff --git a/applications/sgi-webuci/root/lib/webuci/main.lua b/libs/sgi-webuci/root/lib/webuci/main.lua similarity index 100% rename from applications/sgi-webuci/root/lib/webuci/main.lua rename to libs/sgi-webuci/root/lib/webuci/main.lua diff --git a/applications/sgi-webuci/src/sgi/webuci.lua b/libs/sgi-webuci/src/sgi/webuci.lua similarity index 100% rename from applications/sgi-webuci/src/sgi/webuci.lua rename to libs/sgi-webuci/src/sgi/webuci.lua diff --git a/libs/web/Makefile b/libs/web/Makefile new file mode 100644 index 000000000..f7fac7740 --- /dev/null +++ b/libs/web/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk diff --git a/web/root/etc/config/luci b/libs/web/root/etc/config/luci similarity index 100% rename from web/root/etc/config/luci rename to libs/web/root/etc/config/luci diff --git a/web/src/config.lua b/libs/web/src/config.lua similarity index 100% rename from web/src/config.lua rename to libs/web/src/config.lua diff --git a/web/src/dispatcher.lua b/libs/web/src/dispatcher.lua similarity index 100% rename from web/src/dispatcher.lua rename to libs/web/src/dispatcher.lua diff --git a/web/src/http.lua b/libs/web/src/http.lua similarity index 100% rename from web/src/http.lua rename to libs/web/src/http.lua diff --git a/web/src/i18n.lua b/libs/web/src/i18n.lua similarity index 100% rename from web/src/i18n.lua rename to libs/web/src/i18n.lua diff --git a/web/src/template.lua b/libs/web/src/template.lua similarity index 100% rename from web/src/template.lua rename to libs/web/src/template.lua diff --git a/web/Makefile b/web/Makefile deleted file mode 100644 index 5e64bcd1f..000000000 --- a/web/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -include ../build/config.mk -include ../build/module.mk \ No newline at end of file -- 2.25.1