Merge branch 'develop'

Author: cinemast

.gitignore

@@ -3,6 +3,7 @@
 profile
 
 # xcode noise
+build2/*
 build/*
 *.mode1
 *.mode1v3

.travis.yml

@@ -8,7 +8,7 @@ before_install:
     then
      brew update
      brew install jsoncpp argtable curl hiredis redis
-     brew install libmicrohttpd --with-ssl
+     brew install libmicrohttpd
     fi
 
 matrix:

CHANGELOG.md

@@ -4,8 +4,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [v1.1.1] - 2018-10-31
+## [v1.2.0] - 2019-03-29
+### Added
+- The `HttpServer` connector now has a `BindLocalhost` method (#261)
+
+### Fixed
+- Don't precompress and honor GnuInstallDir for manpage of jsonrpcstub (#252)
+- Arch Linux CI build (base image changed)
+- brew CI build (no longer has `--ssl` flag for libmicrohttpd)
+- Catching `Jsoncpp::Exception` for `.parse()` invocations
+- Compile issue when building static only (#263)
+- Update catch2 to 2.7.0 and fix include path (#251)
+- Removed deprecated jsoncpp invocations
+
 
+## [v1.1.1] - 2018-10-31
 ### Fixed
 - Build issue on RHEL7 (#244, #246)
 - Build with empty install prefix (#226)
@@ -80,7 +93,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Invalid pointer handling in HTTP-Server
 
 ### Added
-- HttpServer can now be configured to listen localhost only
 - TCP Server + Client connectors
 
 ## Changed

CMakeLists.txt

@@ -22,8 +22,8 @@ if (${CMAKE_MAJOR_VERSION} GREATER 2)
 endif()
 
 set(MAJOR_VERSION 1)
-set(MINOR_VERSION 1)
-set(PATCH_VERSION 1)
+set(MINOR_VERSION 2)
+set(PATCH_VERSION 0)
 set(SO_VERSION    1)
 
 if(NOT MSVC)

cmake/libjsonrpccpp-client.pc.cmake

@@ -1,5 +1,5 @@
 Name: libjsonrpccpp-client
 Description: A C++ client implementation of json-rpc.
 Version: ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}
-Libs: -L${FULL_PATH_LIBDIR} -ljsoncpp -ljsonrpccpp-common -ljsonrpccpp-client -lcurl -lhiredis
+Libs: -L${FULL_PATH_LIBDIR} -ljsoncpp -ljsonrpccpp-common -ljsonrpccpp-client ${CLIENT_LIBS}
 Cflags: -I${FULL_PATH_INCLUDEDIR}

cmake/libjsonrpccpp-server.pc.cmake

@@ -1,5 +1,5 @@
 Name: libjsonrpccpp-server
 Description: A C++ server implementation of json-rpc.
 Version: ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}
-Libs: -L${FULL_PATH_LIBDIR} -ljsoncpp -ljsonrpccpp-common -ljsonrpccpp-server -lmicrohttpd -lhiredis
+Libs: -L${FULL_PATH_LIBDIR} -ljsoncpp -ljsonrpccpp-common -ljsonrpccpp-server ${SERVER_LIBS}
 Cflags: -I${FULL_PATH_INCLUDEDIR}

docker/ArchLinux.Dockerfile

@@ -1,4 +1,4 @@
-FROM base/archlinux:latest
+FROM archlinux/base:latest
 MAINTAINER Peter Spiess-Knafl <[email protected]>
 ENV OS=arch
 RUN pacman -Sy --noconfirm \

src/catch/CMakeLists.txt

@@ -5,8 +5,8 @@ include(ExternalProject)
 ExternalProject_Add(
     catch
     PREFIX ${CMAKE_BINARY_DIR}/catch
-    URL https://github.com/catchorg/Catch2/archive/v2.0.1.tar.gz
-    URL_HASH SHA1=5c191a031edebd0525640ed2f38cbf64bacb1803
+    URL https://github.com/catchorg/Catch2/archive/v2.7.0.tar.gz
+    URL_HASH SHA1=6df37d5b64a71b840a6a9d8c79c3705aa8a3f56e
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     INSTALL_COMMAND ""

src/jsonrpccpp/CMakeLists.txt

@@ -33,18 +33,22 @@ set(client_connector_libs   "")
 set(server_connector_source "")
 set(server_connector_header "")
 set(server_connector_libs   "")
+set(SERVER_LIBS "")
+set(CLIENT_LIBS "")
 
 # setup sources for http connectors
 if (HTTP_CLIENT)
 	list(APPEND client_connector_header "client/connectors/httpclient.h")
 	list(APPEND client_connector_source "client/connectors/httpclient.cpp")
-	list(APPEND client_connector_libs ${CURL_LIBRARIES})
+    list(APPEND client_connector_libs ${CURL_LIBRARIES})
+    set(CLIENT_LIBS "${CLIENT_LIBS} -lcurl")
 endif()
 
 if (HTTP_SERVER)
 	list(APPEND server_connector_header "server/connectors/httpserver.h")
 	list(APPEND server_connector_source "server/connectors/httpserver.cpp")
-	list(APPEND server_connector_libs ${CMAKE_THREAD_LIBS_INIT} ${MHD_LIBRARIES})
+    list(APPEND server_connector_libs ${CMAKE_THREAD_LIBS_INIT} ${MHD_LIBRARIES})
+    set(SERVER_LIBS "${SERVER_LIBS} -lmicrohttpd")
 endif()
 
 # setup sources for redis connectors
@@ -53,12 +57,14 @@ if (REDIS_CLIENT)
     list(APPEND client_connector_source "client/connectors/redisclient.cpp")
     list(APPEND client_connector_libs ${HIREDIS_LIBRARIES})
     include_directories(${HIREDIS_INCLUDE_DIRS})
+    set(CLIENT_LIBS "${CLIENT_LIBS} -lhiredis")
 endif()
 
 if (REDIS_SERVER)
     list(APPEND server_connector_header "server/connectors/redisserver.h")
     list(APPEND server_connector_source "server/connectors/redisserver.cpp")
     list(APPEND server_connector_libs ${CMAKE_THREAD_LIBS_INIT} ${HIREDIS_LIBRARIES})
+    set(SERVER_LIBS "${SERVER_LIBS} -lhiredis")
 endif()
 
 # setup sources for unix domain socket connectors

src/jsonrpccpp/client/batchcall.cpp

@@ -37,11 +37,12 @@ int BatchCall::addCall(const string &methodname, const Json::Value &params,
 string BatchCall::toString(bool fast) const {
   string result;
   if (fast) {
-    Json::FastWriter writer;
-    result = writer.write(this->result);
+    Json::StreamWriterBuilder wbuilder;
+    wbuilder["indentation"] = "";
+    result = Json::writeString(wbuilder,this->result);
   } else {
-    Json::StyledWriter writer;
-    result = writer.write(this->result);
+    Json::StreamWriterBuilder wbuilder;
+    result = Json::writeString(wbuilder, this->result);
   }
   return result;
 }