From a5ca7a3dd96f4bfc29057537153ec5a95da3cf79 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 18 Jun 2014 10:10:30 +0000 Subject: [PATCH] jsonpath: rename to jsonfilter and rewrite from flex/bison to lemon This commit renames the jsonpath binary to jsonfilter to avoid clashing with a Python extension of the same name. The utility itself has been rewritten to use SQLite3's lemon parser generator instead of a flex/bison combination which results in a much smaller binary. Signed-off-by: Jo-Philipp Wich SVN-Revision: 41258 --- package/utils/{jsonpath => jsonfilter}/Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) rename package/utils/{jsonpath => jsonfilter}/Makefile (64%) diff --git a/package/utils/jsonpath/Makefile b/package/utils/jsonfilter/Makefile similarity index 64% rename from package/utils/jsonpath/Makefile rename to package/utils/jsonfilter/Makefile index be64fed856..1ddb22f3f1 100644 --- a/package/utils/jsonpath/Makefile +++ b/package/utils/jsonfilter/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=jsonpath -PKG_VERSION:=2014-01-08 +PKG_NAME:=jsonfilter +PKG_VERSION:=2014-06-18 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://git.openwrt.org/project/jsonpath.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=f1e3aeb2526ea28db34c7bc714277c1dff26e5fc +PKG_SOURCE_VERSION:=c0e1d4495a8afe51cc1900269d6a6fcf0b51a761 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 @@ -16,16 +16,17 @@ PKG_MAINTAINER:=Jo-Philipp Wich include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk -define Package/jsonpath +define Package/jsonfilter SECTION:=base CATEGORY:=Base system DEPENDS:=+libubox +libjson-c - TITLE:=OpenWrt JSON query utility + TITLE:=OpenWrt JSON filter utility + URL:=http://git.openwrt.org/?p=project/jsonpath.git endef -define Package/jsonpath/install +define Package/jsonfilter/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jsonpath $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jsonpath $(1)/usr/bin/jsonfilter endef -$(eval $(call BuildPackage,jsonpath)) +$(eval $(call BuildPackage,jsonfilter))