Merge pull request #1 from open-source-parsers/master

update feom origin

Author: VeenLee

.gitignore

@@ -1,12 +1,12 @@
 /build/
+/build-*/
 *.pyc
 *.swp
 *.actual
 *.actual-rewrite
 *.process-output
 *.rewrite
 /bin/
-/buildscons/
 /libs/
 /doc/doxyfile
 /dist/
@@ -30,9 +30,8 @@
 
 # CMake-generated files:
 CMakeFiles/
-CTestTestFile.cmake
-cmake_install.cmake
-pkg-config/jsoncpp.pc
+*.cmake
+/pkg-config/jsoncpp.pc
 jsoncpp_lib_static.dir/
 
 # In case someone runs cmake in the root-dir:
@@ -45,8 +44,12 @@ jsoncpp_lib_static.dir/
 /src/lib_json/Makefile
 /src/test_lib_json/Makefile
 /src/test_lib_json/jsoncpp_test
+*.a
 
 # eclipse project files
 .project
 .cproject
 /.settings/
+
+# DS_Store
+.DS_Store

.travis.yml

@@ -6,26 +6,38 @@
 # http://stackoverflow.com/questions/22111549/travis-ci-with-clang-3-4-and-c11/30925448#30925448
 # to allow C++11, though we are not yet building with -std=c++11
 
+before_install: pyenv global 3.5
 install:
+- if [[ $TRAVIS_OS_NAME == osx ]]; then
+     brew update;
+     brew install python3 ninja;
+     python3 -m venv venv;
+     source venv/bin/activate;
+  elif [[ $TRAVIS_OS_NAME == linux ]]; then
+     wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip;
+     unzip -q ninja-linux.zip -d build;
+  fi
+- pip3 install meson
 # /usr/bin/gcc is 4.6 always, but gcc-X.Y is available.
-- if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
-# /usr/bin/clang is our version already, and clang-X.Y does not exist.
-#- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+- if [[ $CXX = g++ ]]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
+# /usr/bin/clang has a conflict with gcc, so use clang-X.Y.
+- if [[ $CXX = clang++ ]]; then export CXX="clang++-3.5" CC="clang-3.5"; fi
 - echo ${PATH}
 - ls /usr/local
 - ls /usr/local/bin
-- export PATH=/usr/local/bin:/usr/bin:${PATH}
+- export PATH="${PWD}"/build:/usr/local/bin:/usr/bin:${PATH}
 - echo ${CXX}
 - ${CXX} --version
 - which valgrind
 addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
+    - llvm-toolchain-precise-3.5
     packages:
     - gcc-4.9
     - g++-4.9
-    - clang
+    - clang-3.5
     - valgrind
 os:
   - linux
@@ -36,8 +48,9 @@ compiler:
 script: ./travis.sh
 env:
   matrix:
-    - SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
-    - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE
+    - LIB_TYPE=static BUILD_TYPE=release
+    - LIB_TYPE=shared BUILD_TYPE=debug
 notifications:
   email: false
+dist: trusty
 sudo: false

AUTHORS

@@ -1 +1,111 @@
 Baptiste Lepilleur <[email protected]>
+
+Aaron Jacobs <[email protected]>
+Aaron Jacobs <[email protected]>
+Adam Boseley <[email protected]>
+Adam Boseley <[email protected]>
+Aleksandr Derbenev <[email protected]>
+Alexander Gazarov <[email protected]>
+Alexander V. Brezgin <[email protected]>
+Alexandr Brezgin <[email protected]>
+Alexey Kruchinin <[email protected]>
+Anton Indrawan <[email protected]>
+Baptiste Jonglez <[email protected]>
+Baptiste Lepilleur <[email protected]>
+Baruch Siach <[email protected]>
+Ben Boeckel <[email protected]>
+Benjamin Knecht <[email protected]>
+Bernd Kuhls <[email protected]>
+Billy Donahue <[email protected]>
+Braden McDorman <[email protected]>
+Brandon Myers <[email protected]>
+Brendan Drew <[email protected]>
+chason <[email protected]>
+Chris Gilling <[email protected]>
+Christopher Dawes <[email protected]>
+Christopher Dunn <[email protected]>
+Chuck Atkins <[email protected]>
+Cody P Schafer <[email protected]>
+Connor Manning <[email protected]>
+Cory Quammen <[email protected]>
+Cristóvão B da Cruz e Silva <[email protected]>
+Daniel Krügler <[email protected]>
+Dani-Hub <[email protected]>
+Dan Liu <gzliudan>
+datadiode <[email protected]>
+datadiode <[email protected]>
+David Seifert <[email protected]>
+David West <[email protected]>
+dawesc <[email protected]>
+Dmitry Marakasov <[email protected]>
+dominicpezzuto <[email protected]>
+Don Milham <[email protected]>
+drgler <[email protected]>
+ds283 <[email protected]>
+Egor Tensin <[email protected]>
+eightnoteight <[email protected]>
+Evince <[email protected]>
+filipjs <[email protected]>
+findblar <[email protected]>
+Florian Meier <[email protected]>
+Gaëtan Lehmann <[email protected]>
+Gaurav <[email protected]>
+Gergely Nagy <[email protected]>
+Gida Pataki <[email protected]>
+I3ck <[email protected]>
+Iñaki Baz Castillo <[email protected]>
+Jacco <[email protected]>
+Jean-Christophe Fillion-Robin <[email protected]>
+Jonas Platte <[email protected]>
+Jörg Krause <[email protected]>
+Keith Lea <[email protected]>
+Kevin Grant <[email protected]>
+Kirill V. Lyadvinsky <[email protected]>
+Kirill V. Lyadvinsky <[email protected]>
+Kobi Gurkan <[email protected]>
+Magnus Bjerke Vik <[email protected]>
+Malay Shah <[email protected]>
+Mara Kim <[email protected]>
+Marek Kotewicz <[email protected]>
+Mark Lakata <[email protected]>
+Mark Zeren <[email protected]>
+Martin Buck <[email protected]>
+Martyn Gigg <[email protected]>
+Mattes D <[email protected]>
+Matthias Loy <[email protected]>
+Merlyn Morgan-Graham <[email protected]>
+Michael Shields <[email protected]>
+Michał Górny <[email protected]>
+Mike Naberezny <[email protected]>
+mloy <[email protected]>
+Motti <[email protected]>
+nnkur <[email protected]>
+Omkar Wagh <[email protected]>
+paulo <[email protected]>
+pavel.pimenov <[email protected]>
+Paweł Bylica <[email protected]>
+Péricles Lopes Machado <[email protected]>
+Peter Spiess-Knafl <[email protected]>
+pffang <[email protected]>
+Rémi Verschelde <[email protected]>
+renu555 <[email protected]>
+Robert Dailey <[email protected]>
+Sam Clegg <[email protected]>
+selaselah <[email protected]>
+Sergiy80 <[email protected]>
+sergzub <[email protected]>
+Stefan Schweter <[email protected]>
+Steffen Kieß <[email protected]>
+Steven Hahn <[email protected]>
+Stuart Eichert <[email protected]>
+SuperManitu <[email protected]>
+Techwolf <[email protected]>
+Tengiz Sharafiev <[email protected]>
+Tomasz Maciejewski <[email protected]>
+Vicente Olivert Riera <[email protected]>
+xiaoyur347 <[email protected]>
+ycqiu <[email protected]>
+yiqiju <[email protected]>
+Yu Xiaolei <[email protected]>
+
+Google Inc.

CMakeLists.txt

@@ -1,6 +1,6 @@
 # vim: et ts=4 sts=4 sw=4 tw=0
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 PROJECT(jsoncpp)
 ENABLE_TESTING()
 
@@ -27,20 +27,10 @@ IF(APPLE)
     SET(CMAKE_MACOSX_RPATH 1)
 ENDIF()
 
+# Adhere to GNU filesystem layout conventions
+INCLUDE(GNUInstallDirs)
+
 SET(DEBUG_LIBNAME_SUFFIX "" CACHE STRING "Optional suffix to append to the library name for a debug build")
-SET(LIB_SUFFIX "" CACHE STRING "Optional arch-dependent suffix for the library installation directory")
-
-SET(RUNTIME_INSTALL_DIR bin
-    CACHE PATH "Install dir for executables and dlls")
-SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX}
-    CACHE PATH "Install dir for static libraries")
-SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX}
-    CACHE PATH "Install dir for shared libraries")
-SET(INCLUDE_INSTALL_DIR include
-    CACHE PATH "Install dir for headers")
-SET(PACKAGE_INSTALL_DIR lib${LIB_SUFFIX}/cmake
-    CACHE PATH "Install dir for cmake package config files")
-MARK_AS_ADVANCED( RUNTIME_INSTALL_DIR ARCHIVE_INSTALL_DIR INCLUDE_INSTALL_DIR PACKAGE_INSTALL_DIR )
 
 # Set variable named ${VAR_NAME} to value ${VALUE}
 FUNCTION(set_using_dynamic_name VAR_NAME VALUE)
@@ -69,12 +59,12 @@ ENDMACRO()
 #SET( JSONCPP_VERSION_MAJOR X )
 #SET( JSONCPP_VERSION_MINOR Y )
 #SET( JSONCPP_VERSION_PATCH Z )
-SET( JSONCPP_VERSION 1.7.7 )
+SET( JSONCPP_VERSION 1.8.3 )
 jsoncpp_parse_version( ${JSONCPP_VERSION} JSONCPP_VERSION )
 #IF(NOT JSONCPP_VERSION_FOUND)
 #    MESSAGE(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z")
 #ENDIF(NOT JSONCPP_VERSION_FOUND)
-SET( JSONCPP_SOVERSION 11 )
+SET( JSONCPP_SOVERSION 19 )
 SET( JSONCPP_USE_SECURE_MEMORY "0" CACHE STRING "-D...=1 to use memory-wiping allocator for STL" )
 
 MESSAGE(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}")
@@ -86,70 +76,79 @@ CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/version.in"
                 "${PROJECT_SOURCE_DIR}/version"
                 NEWLINE_STYLE UNIX )
 
-macro(UseCompilationWarningAsError)
-	if ( MSVC )
+MACRO(UseCompilationWarningAsError)
+    IF(MSVC)
         # Only enabled in debug because some old versions of VS STL generate
         # warnings when compiled in release configuration.
-		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /WX ")
-  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-    if (JSONCPP_WITH_STRICT_ISO)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors")
-    endif ()
-	endif()
-endmacro()
+        SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /WX ")
+    ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+        IF(JSONCPP_WITH_STRICT_ISO)
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors")
+        ENDIF()
+    ENDIF()
+ENDMACRO()
 
 # Include our configuration header
 INCLUDE_DIRECTORIES( ${jsoncpp_SOURCE_DIR}/include )
 
-if ( MSVC )
+IF(MSVC)
     # Only enabled in debug because some old versions of VS STL generate
     # unreachable code warning when compiled in release configuration.
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4 ")
-endif()
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  # using regular Clang or AppleClang
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  # using GCC
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Wextra")
-  # not yet ready for -Wsign-conversion
-
-  if (JSONCPP_WITH_STRICT_ISO AND NOT JSONCPP_WITH_WARNING_AS_ERROR)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=conversion -pedantic")
-  endif ()
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-  # using Intel compiler
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Wextra -Werror=conversion")
-
-  if (JSONCPP_WITH_STRICT_ISO AND NOT JSONCPP_WITH_WARNING_AS_ERROR)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
-  endif ()
-endif()
-
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif(CCACHE_FOUND)
+    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4 ")
+ENDIF()
+
+# Require C++11 support, prefer ISO C++ over GNU variants,
+# as relying solely on ISO C++ is more portable.
+SET(CMAKE_CXX_STANDARD 11)
+SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+SET(CMAKE_CXX_EXTENSIONS OFF)
+
+IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    # using regular Clang or AppleClang
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare")
+ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    # using GCC
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Wextra")
+    # not yet ready for -Wsign-conversion
+
+    IF(JSONCPP_WITH_STRICT_ISO)
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
+    ENDIF()
+    IF(JSONCPP_WITH_WARNING_AS_ERROR)
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=conversion")
+    ENDIF()
+ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    # using Intel compiler
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Wextra -Werror=conversion")
+
+    IF(JSONCPP_WITH_STRICT_ISO AND NOT JSONCPP_WITH_WARNING_AS_ERROR)
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
+    ENDIF()
+ENDIF()
+
+FIND_PROGRAM(CCACHE_FOUND ccache)
+IF(CCACHE_FOUND)
+    SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+    SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+ENDIF(CCACHE_FOUND)
 
 IF(JSONCPP_WITH_WARNING_AS_ERROR)
     UseCompilationWarningAsError()
 ENDIF()
 
 IF(JSONCPP_WITH_PKGCONFIG_SUPPORT)
-	CONFIGURE_FILE(
-		"pkg-config/jsoncpp.pc.in"
-		"pkg-config/jsoncpp.pc"
-		@ONLY)
-	INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/pkg-config/jsoncpp.pc"
-		DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
+    CONFIGURE_FILE(
+        "pkg-config/jsoncpp.pc.in"
+        "pkg-config/jsoncpp.pc"
+        @ONLY)
+    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/pkg-config/jsoncpp.pc"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 ENDIF()
 
 IF(JSONCPP_WITH_CMAKE_PACKAGE)
         INSTALL(EXPORT jsoncpp
-                DESTINATION ${PACKAGE_INSTALL_DIR}/jsoncpp
+                DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/jsoncpp
                 FILE        jsoncppConfig.cmake)
 ENDIF()