rapidjson: bump to latest GitHub master

PATCH New Philippe Proulx 2 participants 2 messages Nov 18, 2014

lore

Share & tools

lore

Philippe Proulx

author

2014-11-18 04:23 UTC #0 lore raw

PATCH 1/1 rapidjson: bump to latest GitHub master

RapidJSON is now hosted on GitHub and its latest version includes many fixes and features added since 2012.

Signed-off-by Philippe Proulx <[email protected]>

---
 package/rapidjson/rapidjson.mk | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

package/rapidjson/rapidjson.mk +8 -9

index 68e010e..ff516c4 100644
@@ -4,27 +4,26 @@
 #
 ################################################################################
 
-RAPIDJSON_VERSION = 0.11
-RAPIDJSON_SOURCE = rapidjson-$(RAPIDJSON_VERSION).zip
-RAPIDJSON_SITE = http://rapidjson.googlecode.com/files
+RAPIDJSON_VERSION = 39f5eeb764c6d1e1cbff1717410d9710bf943009
+RAPIDJSON_SITE = $(call github,miloyip,rapidjson,$(RAPIDJSON_VERSION))
 RAPIDJSON_LICENSE = MIT
 RAPIDJSON_LICENSE_FILES = license.txt
 RAPIDJSON_INSTALL_TARGET = NO
 RAPIDJSON_INSTALL_STAGING = YES
 
-define RAPIDJSON_EXTRACT_CMDS
-	$(UNZIP) -d $(@D) $(DL_DIR)/$(RAPIDJSON_SOURCE)
-	mv $(@D)/rapidjson/* $(@D)
-	$(RM) -r $(@D)/rapidjson
-endef
-
 define RAPIDJSON_INSTALL_STAGING_CMDS
 	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson
 	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/internal
+	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/error
+	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/msinttypes
 	$(INSTALL) -m 0644 $(@D)/include/rapidjson/*.h \
 		$(STAGING_DIR)/usr/include/rapidjson
 	$(INSTALL) -m 0644 $(@D)/include/rapidjson/internal/*.h \
 		$(STAGING_DIR)/usr/include/rapidjson/internal
+	$(INSTALL) -m 0644 $(@D)/include/rapidjson/error/*.h \
+		$(STAGING_DIR)/usr/include/rapidjson/error
+	$(INSTALL) -m 0644 $(@D)/include/rapidjson/msinttypes/*.h \
+		$(STAGING_DIR)/usr/include/rapidjson/msinttypes
 endef
 
 $(eval $(generic-package))

Signature · 1 line

2.1.3

Thomas Petazzoni

Applied

2014-11-18 13:25 UTC #1 lore raw

PATCH 1/1 rapidjson: bump to latest GitHub master

Dear Philippe Proulx,

Quoted 7 lines · Philippe Proulx

RapidJSON is now hosted on GitHub and its latest version includes many fixes and features added since 2012.
Signed-off-by Philippe Proulx <[email protected]>
---
 package/rapidjson/rapidjson.mk | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Applied to next, thanks. One question below, though.

Quoted 4 lines

define RAPIDJSON_INSTALL_STAGING_CMDS

package/rapidjson/rapidjson.mk +1 -0

 	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson
 	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/internal
+	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/error

package/rapidjson/rapidjson.mk line 27

Quoted 10 lines

package/rapidjson/rapidjson.mk +5 -0

+	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/msinttypes
 	$(INSTALL) -m 0644 $(@D)/include/rapidjson/*.h \
 		$(STAGING_DIR)/usr/include/rapidjson
 	$(INSTALL) -m 0644 $(@D)/include/rapidjson/internal/*.h \
 		$(STAGING_DIR)/usr/include/rapidjson/internal
+	$(INSTALL) -m 0644 $(@D)/include/rapidjson/error/*.h \
+		$(STAGING_DIR)/usr/include/rapidjson/error
+	$(INSTALL) -m 0644 $(@D)/include/rapidjson/msinttypes/*.h \
+		$(STAGING_DIR)/usr/include/rapidjson/msinttypes
 endef

Do you know why we're doing all this dance instead of just copying the entire $(@D)/include/* tree ?

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com