Revert "Integer Precision for JSON <-> Protobuf conversions."
This reverts commit 3be13b3c6cb24e09ade07c8f8826b314596172b5. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c68c3bd5 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c68c3bd5 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c68c3bd5 Branch: refs/heads/master Commit: c68c3bd58078b9698327b3c54bbd719b55485a28 Parents: 5de90ef Author: Joris Van Remoortere <[email protected]> Authored: Wed Sep 16 18:43:05 2015 -0400 Committer: Joris Van Remoortere <[email protected]> Committed: Wed Sep 16 18:43:05 2015 -0400 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/CMakeLists.txt | 3 ++- 3rdparty/libprocess/3rdparty/Makefile.am | 3 --- 3rdparty/libprocess/3rdparty/picojson-1.3.0.tar.gz | Bin 14695 -> 0 bytes .../libprocess/3rdparty/picojson-4f93734.tar.gz | Bin 0 -> 11270 bytes 3rdparty/libprocess/3rdparty/versions.am | 2 +- 3rdparty/libprocess/Makefile.am | 1 - 6 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c68c3bd5/3rdparty/libprocess/3rdparty/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/CMakeLists.txt b/3rdparty/libprocess/3rdparty/CMakeLists.txt index c746ba5..d13ba66 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/archive/v1.3.0.tar.gz) + set(PICOJSON_URL https://github.com/kazuho/picojson/tarball/4f93734ade33ea0f5e5b4de35fc6b2c324a8dca6) # 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,6 +153,7 @@ 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/c68c3bd5/3rdparty/libprocess/3rdparty/Makefile.am ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/Makefile.am b/3rdparty/libprocess/3rdparty/Makefile.am index 8e437c7..eb34251 100644 --- a/3rdparty/libprocess/3rdparty/Makefile.am +++ b/3rdparty/libprocess/3rdparty/Makefile.am @@ -214,9 +214,6 @@ endif if WITH_BUNDLED_PICOJSON stout_tests_CPPFLAGS += -I$(PICOJSON) - - # Enable the INT64 support for PicoJSON. - stout_tests_CPPFLAGS += -DPICOJSON_USE_INT64 endif if WITH_BUNDLED_GLOG http://git-wip-us.apache.org/repos/asf/mesos/blob/c68c3bd5/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 deleted file mode 100644 index 0ade1be..0000000 Binary files a/3rdparty/libprocess/3rdparty/picojson-1.3.0.tar.gz and /dev/null differ http://git-wip-us.apache.org/repos/asf/mesos/blob/c68c3bd5/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 new file mode 100644 index 0000000..f52dacd Binary files /dev/null and b/3rdparty/libprocess/3rdparty/picojson-4f93734.tar.gz differ http://git-wip-us.apache.org/repos/asf/mesos/blob/c68c3bd5/3rdparty/libprocess/3rdparty/versions.am ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/versions.am b/3rdparty/libprocess/3rdparty/versions.am index 98195b8..f44c715 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 = 1.3.0 \ No newline at end of file +PICOJSON_VERSION = 4f93734 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mesos/blob/c68c3bd5/3rdparty/libprocess/Makefile.am ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/Makefile.am b/3rdparty/libprocess/Makefile.am index e949bdd..064310c 100644 --- a/3rdparty/libprocess/Makefile.am +++ b/3rdparty/libprocess/Makefile.am @@ -93,7 +93,6 @@ libprocess_la_CPPFLAGS = \ -I$(BOOST) \ -I$(LIBEV) \ -I$(PICOJSON) \ - -DPICOJSON_USE_INT64 \ $(AM_CPPFLAGS) if ENABLE_LIBEVENT
