Merge pull request #660 from lethosor/jsoncpp

Replace jsonxx with jsoncpp

.gitmodules

@@ -13,6 +13,3 @@
 [submodule "depends/clsocket"]
 	path = depends/clsocket
 	url = git://github.com/DFHack/clsocket.git
-[submodule "depends/jsonxx"]
-	path = depends/jsonxx
-	url = git://github.com/lethosor/jsonxx.git

CMakeLists.txt

@@ -53,8 +53,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 endif()
 
 # make sure all the necessary submodules have been set up
-if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/clsocket/CMakeLists.txt
-    OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/jsonxx/CMakeLists.txt)
+if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/clsocket/CMakeLists.txt)
     message(FATAL_ERROR "One or more required submodules could not be found! Run 'git submodule update --init' from the root DFHack directory. (See the section 'Getting the Code' in Compile.rst or Compile.html)")
 endif()
 
@@ -136,7 +135,7 @@ find_package(ZLIB REQUIRED)
 include_directories(depends/protobuf)
 include_directories(depends/lua/include)
 include_directories(depends/md5)
-include_directories(depends/jsonxx)
+include_directories(depends/jsoncpp)
 include_directories(depends/tinyxml)
 include_directories(depends/tthread)
 include_directories(${ZLIB_INCLUDE_DIRS})

LICENSE

@@ -164,30 +164,29 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 --------------------------------------------------------------------------------
-jsonxx license
+jsoncpp license
 
-Copyright (c) 2010 Hong Jiang
+Copyright (c) 2007-2010 Baptiste Lepilleur
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
 files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+restriction, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 --------------------------------------------------------------------------------
 JSON.lua license

depends/CMakeLists.txt

@@ -4,7 +4,7 @@ add_subdirectory(md5)
 add_subdirectory(protobuf)
 add_subdirectory(tinyxml)
 add_subdirectory(tthread)
-add_subdirectory(jsonxx)
+add_subdirectory(jsoncpp)
 # build clsocket static and only as a dependency. Setting those options here overrides its own default settings.
 OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF)
 OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON)

depends/jsoncpp/CMakeLists.txt

@@ -0,0 +1,2 @@
+PROJECT(jsoncpp)
+ADD_LIBRARY(jsoncpp STATIC jsoncpp.cpp)

depends/jsoncpp/jsoncpp-ex.h

@@ -0,0 +1,31 @@
+#include "jsoncpp.h"
+#pragma once
+
+namespace JsonEx {
+
+    template <typename T> bool is (const Json::Value &val) { return false; }
+    template <typename T> T as (const Json::Value &val);
+    template <typename T> T get (const Json::Value &val, const std::string &key, const T &default_) { return default_; }
+
+#define define_helpers(type, is_func, as_func) \
+        template<> inline bool is<type> (const Json::Value &val) { return val.is_func(); } \
+        template<> inline type as<type> (const Json::Value &val) { return val.as_func(); } \
+        template<> inline type get<type> (const Json::Value &val, const std::string &key, const type &default_) \
+            { Json::Value x = val[key]; return is<type>(x) ? as<type>(x) : default_; }
+    define_helpers(bool,         isBool,    asBool);
+    define_helpers(Json::Int,    isInt,     asInt);
+    define_helpers(Json::UInt,   isUInt,    asUInt);
+    define_helpers(Json::Int64,  isInt64,   asInt64);
+    define_helpers(Json::UInt64, isUInt64,  asUInt64);
+    define_helpers(float,        isDouble,  asFloat);
+    define_helpers(double,       isDouble,  asDouble);
+    define_helpers(std::string,  isString,  asString);
+#undef define_helpers
+
+    inline std::string toSimpleString (const Json::Value &val)
+    {
+        Json::FastWriter w;
+        return w.write(val);
+    }
+
+}

depends/jsonxx

@@ -1 +0,0 @@
-Subproject commit 9a0b18acb0967bfc523dca7af2cb34030d97c02b

library/CMakeLists.txt

@@ -310,7 +310,7 @@ IF(APPLE)
     SET_TARGET_PROPERTIES(dfhack PROPERTIES SOVERSION 1.0.0)
 ENDIF()
 
-TARGET_LINK_LIBRARIES(dfhack protobuf-lite clsocket lua jsonxx dfhack-version ${PROJECT_LIBS})
+TARGET_LINK_LIBRARIES(dfhack protobuf-lite clsocket lua jsoncpp dfhack-version ${PROJECT_LIBS})
 SET_TARGET_PROPERTIES(dfhack PROPERTIES LINK_INTERFACE_LIBRARIES "")
 
 TARGET_LINK_LIBRARIES(dfhack-client protobuf-lite clsocket)

plugins/CMakeLists.txt

@@ -113,7 +113,7 @@ if (BUILD_SUPPORTED)
     DFHACK_PLUGIN(digFlood digFlood.cpp)
     add_subdirectory(diggingInvaders)
     DFHACK_PLUGIN(drybuckets drybuckets.cpp)
-    DFHACK_PLUGIN(dwarfmonitor dwarfmonitor.cpp LINK_LIBRARIES jsonxx lua)
+    DFHACK_PLUGIN(dwarfmonitor dwarfmonitor.cpp LINK_LIBRARIES lua)
     DFHACK_PLUGIN(embark-tools embark-tools.cpp)
     DFHACK_PLUGIN(eventful eventful.cpp LINK_LIBRARIES lua)
     DFHACK_PLUGIN(fastdwarf fastdwarf.cpp)