Integer Precision for JSON <-> Protobuf conversions. Updates PicoJson to version 1.3.0 and adds `PICOJSON_USE_INT64` and `__STDC_FORMAT_MACROS` flags to the compilation flags.
Review: https://reviews.apache.org/r/38028 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1c56438b Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1c56438b Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1c56438b Branch: refs/heads/master Commit: 1c56438bdd29df0c4612f5e431ea86a90aa344a1 Parents: 42971bd Author: Joseph Wu <[email protected]> Authored: Fri Sep 18 12:11:01 2015 -0400 Committer: Joris Van Remoortere <[email protected]> Committed: Fri Sep 18 12:37:18 2015 -0400 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/CMakeLists.txt | 3 +-- 3rdparty/libprocess/3rdparty/Makefile.am | 4 ++++ 3rdparty/libprocess/3rdparty/picojson-1.3.0.tar.gz | Bin 0 -> 14695 bytes .../libprocess/3rdparty/picojson-4f93734.tar.gz | Bin 11270 -> 0 bytes 3rdparty/libprocess/3rdparty/versions.am | 2 +- 3rdparty/libprocess/Makefile.am | 2 ++ 6 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/1c56438b/3rdparty/libprocess/3rdparty/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/CMakeLists.txt b/3rdparty/libprocess/3rdparty/CMakeLists.txt index d13ba66..c746ba5 100644 --- a/3rdparty/libprocess/3rdparty/CMakeLists.txt +++ b/3rdparty/libprocess/3rdparty/CMakeLists.txt @@ -35,7 +35,7 @@ else (REBUNDLED) set(GLOG_URL https://google-glog.googlecode.com/files/glog-${GLOG_VERSION}.tar.gz) # NOTE: This url can't be versioned like the others, because it depends on # specific commit, and isn't in our upstream. - set(PICOJSON_URL https://github.com/kazuho/picojson/tarball/4f93734ade33ea0f5e5b4de35fc6b2c324a8dca6) + set(PICOJSON_URL https://github.com/kazuho/picojson/archive/v1.3.0.tar.gz) # TODO(hausdorff): (MESOS-3395) depends on the github mirror, should remove # when possible. set(HTTP_PARSER_URL https://github.com/apache/mesos/raw/master/3rdparty/libprocess/3rdparty/ry-http-parser-${HTTP_PARSER_VERSION}.tar.gz) @@ -153,7 +153,6 @@ ExternalProject_Add( ExternalProject_Add( ${PICOJSON_TARGET} PREFIX ${PICOJSON_CMAKE_ROOT} - DOWNLOAD_NAME ${PICOJSON_TARGET}.tar.gz CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" http://git-wip-us.apache.org/repos/asf/mesos/blob/1c56438b/3rdparty/libprocess/3rdparty/Makefile.am ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/Makefile.am b/3rdparty/libprocess/3rdparty/Makefile.am index eb34251..e64e3d9 100644 --- a/3rdparty/libprocess/3rdparty/Makefile.am +++ b/3rdparty/libprocess/3rdparty/Makefile.am @@ -214,6 +214,10 @@ endif if WITH_BUNDLED_PICOJSON stout_tests_CPPFLAGS += -I$(PICOJSON) + + # Enable the INT64 support for PicoJSON. + stout_tests_CPPFLAGS += -DPICOJSON_USE_INT64 + stout_tests_CPPFLAGS += -D__STDC_FORMAT_MACROS endif if WITH_BUNDLED_GLOG http://git-wip-us.apache.org/repos/asf/mesos/blob/1c56438b/3rdparty/libprocess/3rdparty/picojson-1.3.0.tar.gz ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/picojson-1.3.0.tar.gz b/3rdparty/libprocess/3rdparty/picojson-1.3.0.tar.gz new file mode 100644 index 0000000..0ade1be Binary files /dev/null and b/3rdparty/libprocess/3rdparty/picojson-1.3.0.tar.gz differ http://git-wip-us.apache.org/repos/asf/mesos/blob/1c56438b/3rdparty/libprocess/3rdparty/picojson-4f93734.tar.gz ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/picojson-4f93734.tar.gz b/3rdparty/libprocess/3rdparty/picojson-4f93734.tar.gz deleted file mode 100644 index f52dacd..0000000 Binary files a/3rdparty/libprocess/3rdparty/picojson-4f93734.tar.gz and /dev/null differ http://git-wip-us.apache.org/repos/asf/mesos/blob/1c56438b/3rdparty/libprocess/3rdparty/versions.am ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/versions.am b/3rdparty/libprocess/3rdparty/versions.am index f44c715..98195b8 100644 --- a/3rdparty/libprocess/3rdparty/versions.am +++ b/3rdparty/libprocess/3rdparty/versions.am @@ -9,4 +9,4 @@ GPERFTOOLS_VERSION = 2.0 LIBEV_VERSION = 4.15 PROTOBUF_VERSION = 2.5.0 RY_HTTP_PARSER_VERSION = 1c3624a -PICOJSON_VERSION = 4f93734 \ No newline at end of file +PICOJSON_VERSION = 1.3.0 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mesos/blob/1c56438b/3rdparty/libprocess/Makefile.am ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/Makefile.am b/3rdparty/libprocess/Makefile.am index 064310c..c764717 100644 --- a/3rdparty/libprocess/Makefile.am +++ b/3rdparty/libprocess/Makefile.am @@ -93,6 +93,8 @@ libprocess_la_CPPFLAGS = \ -I$(BOOST) \ -I$(LIBEV) \ -I$(PICOJSON) \ + -DPICOJSON_USE_INT64 \ + -D__STDC_FORMAT_MACROS \ $(AM_CPPFLAGS) if ENABLE_LIBEVENT
