X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=54cb7fbf42c8d3e55e937ac25005629f823a952d;hb=c99752055aef7f85fbc4bd575a51e005fc0d119a;hp=af662f8cb36f75ca6ee1c03c8a8f3b9b77816ac3;hpb=92a919d8eec152aa1803e328aff68a3b3c283e77;p=project%2Fluci.git diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index af662f8cb..54cb7fbf4 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -1,27 +1,49 @@ include $(TOPDIR)/rules.mk PKG_BRANCH:=trunk -PKG_SOURCE_URL:=https://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH) -PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p') + +ifeq ($(DUMP),) + USELOCAL:=$(shell grep luci ../../../.project 2>/dev/null >/dev/null && echo 1) +endif PKG_NAME:=luci -PKG_VERSION:=0.6+svn$(PKG_REV) PKG_RELEASE:=1 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz -PKG_SOURCE_PROTO:=svn -PKG_SOURCE_VERSION:=$(PKG_REV) +ifeq ($(USELOCAL),1) + PKG_VERSION:=0.7+svn +else + PKG_SOURCE_URL:=https://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH) + ifeq ($(DUMP),) + PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p') + PKG_VERSION:=0.7+svn$(PKG_REV) + endif + PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) + PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz + PKG_SOURCE_PROTO:=svn + PKG_SOURCE_VERSION:=$(PKG_REV) +endif PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_BUILD_DEPENDS:=libnotimpl LUA_TARGET:=source PKG_SELECTED_MODULES:= include $(INCLUDE_DIR)/package.mk +ifeq ($(USELOCAL),1) + define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(TAR) c -C ../../../ . \ + --exclude=.pc --exclude=.svn --exclude=.git \ + --exclude='boa-0*' --exclude='*.o' --exclude='*.so' \ + --exclude=dist | \ + tar x -C $(PKG_BUILD_DIR)/ + endef +endif + define Build/Configure endef @@ -43,6 +65,12 @@ define Package/luci/fftemplate DEPENDS:=+luci-mod-freifunk endef +define Package/luci/httpdtemplate + $(call Package/luci/libtemplate) + SUBMENU:=LuCI - Non-Forking HTTP-Daemon (EXPERIMENTAL) + DEPENDS:=+luci-httpd +endef + define Package/luci/i18ntemplate $(call Package/luci/libtemplate) SUBMENU:=LuCI - Translations @@ -95,7 +123,7 @@ define Package/luci-core/config endef ifneq ($(CONFIG_PACKAGE_luci-core_compile),) - LUA_TARGET:=compile + LUA_TARGET:=compile endif @@ -132,9 +160,19 @@ define Package/luci-fastindex/install endef +define Package/luci-http + $(call Package/luci/libtemplate) + TITLE:=HTTP Protocol implementation +endef + +define Package/luci-http/install + $(call Package/luci/install/template,$(1),libs/http) +endef + + define Package/luci-web $(call Package/luci/libtemplate) - DEPENDS+=+luci-addons +luci-uci + DEPENDS+=+luci-http +luci-addons +luci-uci TITLE:=MVC Webframework endef @@ -148,12 +186,26 @@ endef +### HTTPD ### + +define Package/luci-httpd + $(call Package/luci/httpdtemplate) + DEPENDS:=+luci-http +luasocket + TITLE:=Server Core +endef + +define Package/luci-httpd/install + $(call Package/luci/install/template,$(1),libs/httpd) +endef + + + ### Community Packages ### define Package/luci-ff-halle $(call Package/luci/fftemplate) DEPENDS+= \ - +luci-sgi-haserl +luci-app-splash +luci-app-olsr \ + +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ +luci-app-ffwizard-leipzig \ +luci-theme-fledermaus \ +luci-i18n-german \ @@ -170,7 +222,7 @@ endef define Package/luci-ff-leipzig $(call Package/luci/fftemplate) DEPENDS+= \ - +luci-sgi-haserl +luci-app-splash +luci-app-olsr \ + +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ +luci-app-ffwizard-leipzig \ +luci-theme-fledermaus \ +luci-i18n-german \ @@ -187,7 +239,7 @@ endef define Package/luci-ff-hannover $(call Package/luci/fftemplate) DEPENDS+= \ - +luci-sgi-haserl +luci-app-splash +luci-app-olsr \ + +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ +luci-theme-fledermaus \ +luci-i18n-german \ +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice @@ -312,16 +364,25 @@ endef ### Server Gateway Interfaces ### -define Package/luci-sgi-haserl +define Package/luci-sgi-cgi $(call Package/luci/libtemplate) - DEPENDS+=+luci-web +haserl-lua - TITLE:=SGI for Haserl + DEPENDS+=+luci-web + TITLE:=SGI for CGI endef -define Package/luci-sgi-haserl/install - $(call Package/luci/install/template,$(1),libs/sgi-haserl) +define Package/luci-sgi-cgi/install + $(call Package/luci/install/template,$(1),libs/sgi-cgi) endef +define Package/luci-sgi-luci + $(call Package/luci/libtemplate) + DEPENDS+=+luci-web +luci-httpd + TITLE:=SGI for LuCI HTTPD +endef + +define Package/luci-sgi-luci/install + $(call Package/luci/install/template,$(1),libs/sgi-luci) +endef define Package/luci-sgi-webuci $(call Package/luci/libtemplate) @@ -385,6 +446,9 @@ endif ifneq ($(CONFIG_PACKAGE_luci-fastindex),) PKG_SELECTED_MODULES+=libs/fastindex endif +ifneq ($(CONFIG_PACKAGE_luci-http),) + PKG_SELECTED_MODULES+=libs/http +endif ifneq ($(CONFIG_PACKAGE_luci-uci),) PKG_SELECTED_MODULES+=libs/uci endif @@ -392,6 +456,10 @@ ifneq ($(CONFIG_PACKAGE_luci-web),) PKG_SELECTED_MODULES+=libs/web endif +ifneq ($(CONFIG_PACKAGE_luci-httpd),) + PKG_SELECTED_MODULES+=libs/httpd +endif + ifneq ($(CONFIG_PACKAGE_luci-ff-halle),) PKG_SELECTED_MODULES+=applications/community-halle endif @@ -428,8 +496,11 @@ ifneq ($(CONFIG_PACKAGE_luci-app-statistics),) PKG_SELECTED_MODULES+=applications/luci-statistics endif -ifneq ($(CONFIG_PACKAGE_luci-sgi-haserl),) - PKG_SELECTED_MODULES+=libs/sgi-haserl +ifneq ($(CONFIG_PACKAGE_luci-sgi-cgi),) + PKG_SELECTED_MODULES+=libs/sgi-cgi +endif +ifneq ($(CONFIG_PACKAGE_luci-sgi-luci),) + PKG_SELECTED_MODULES+=libs/sgi-luci endif ifneq ($(CONFIG_PACKAGE_luci-sgi-webuci),) PKG_SELECTED_MODULES+=libs/sgi-webuci @@ -450,15 +521,24 @@ ifneq ($(CONFIG_PACKAGE_luci-i18n-english),) endif -MAKE_FLAGS += MODULES="$(PKG_SELECTED_MODULES)" LUA_TARGET="$(LUA_TARGET)" CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" LDFLAGS="$(TARGET_LDFLAGS)" +MAKE_FLAGS += \ + MODULES="$(PKG_SELECTED_MODULES)" \ + LUA_TARGET="$(LUA_TARGET)" \ + LUA_SHLIBS="-llua -lm" \ + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ + LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ + OS="Linux" $(eval $(call BuildPackage,luci-core)) $(eval $(call BuildPackage,luci-cbi)) $(eval $(call BuildPackage,luci-fastindex)) +$(eval $(call BuildPackage,luci-http)) $(eval $(call BuildPackage,luci-uci)) $(eval $(call BuildPackage,luci-web)) +$(eval $(call BuildPackage,luci-httpd)) + $(eval $(call BuildPackage,luci-ff-halle)) $(eval $(call BuildPackage,luci-ff-leipzig)) $(eval $(call BuildPackage,luci-ff-hannover)) @@ -473,7 +553,8 @@ $(eval $(call BuildPackage,luci-app-qos)) $(eval $(call BuildPackage,luci-app-splash)) $(eval $(call BuildPackage,luci-app-statistics)) -$(eval $(call BuildPackage,luci-sgi-haserl)) +$(eval $(call BuildPackage,luci-sgi-cgi)) +$(eval $(call BuildPackage,luci-sgi-luci)) $(eval $(call BuildPackage,luci-sgi-webuci)) $(eval $(call BuildPackage,luci-theme-fledermaus))