You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2017/05/30 23:38:14 UTC
mesos git commit: Windows: Updated Protobuf to 3.3.0.
Repository: mesos
Updated Branches:
refs/heads/master c61e592d7 -> 5e86f8f4d
Windows: Updated Protobuf to 3.3.0.
This reconciles the Linux and Windows builds to use the same version of
Protobuf. Previously, Windows was using a 3.0.0-beta-2 while Linux was
stuck on 2.6.1. Now they both use 3.3.0.
Review: https://reviews.apache.org/r/59658/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5e86f8f4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5e86f8f4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5e86f8f4
Branch: refs/heads/master
Commit: 5e86f8f4d8b15de1e409bbe17b0c71ee7ed62035
Parents: c61e592
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Tue May 30 16:37:53 2017 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Tue May 30 16:37:53 2017 -0700
----------------------------------------------------------------------
3rdparty/CMakeLists.txt | 8 +-------
3rdparty/cmake/Versions.cmake | 10 ++--------
2 files changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5e86f8f4/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 815bea3..96022ff 100755
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -293,13 +293,7 @@ include(StoutConfigure)
include(StoutTestsConfigure)
set(GOOGLETEST_URL ${FETCH_URL}/googletest-release-${GOOGLETEST_VERSION}.tar.gz)
-# NOTE: The Windows version of protobuf is patched and only available in the
-# 3rdparty repo, not the local repo.
-if (NOT WIN32)
- set(PROTOBUF_URL ${FETCH_URL}/protobuf-${PROTOBUF_VERSION}.tar.gz)
-elseif (WIN32)
- set(PROTOBUF_URL ${3RDPARTY_DEPENDENCIES}/protobuf-${PROTOBUF_VERSION}.tar.gz)
-endif (NOT WIN32)
+set(PROTOBUF_URL ${FETCH_URL}/protobuf-${PROTOBUF_VERSION}.tar.gz)
# NOTE: `googletest` is "installed" into a lib directory, see "NOTE: (fix for
# MESOS-3250)" comment above for explanation.
http://git-wip-us.apache.org/repos/asf/mesos/blob/5e86f8f4/3rdparty/cmake/Versions.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/cmake/Versions.cmake b/3rdparty/cmake/Versions.cmake
index 8a0537b..75c555b 100644
--- a/3rdparty/cmake/Versions.cmake
+++ b/3rdparty/cmake/Versions.cmake
@@ -21,6 +21,8 @@ set(NVML_VERSION "352.79")
set(NVML_HASH "SHA256=D0B2CC1742CBD7CC73DA13BFA6BF2DA3D92B545E8388E642D41977F4EAD8D3D0")
set(PICOJSON_VERSION "1.3.0")
set(PICOJSON_HASH "SHA256=056805CA2691798F5545935A14BB477F2E1D827C9FB862E6E449DBEA22801C7D")
+set(PROTOBUF_VERSION "3.3.0")
+set(PROTOBUF_HASH "SHA256=E43F47C51C4A838F737EE2DA2F183F129EE388272622C403179D5AD28C555F39")
set(ZLIB_VERSION "1.2.8")
set(ZLIB_HASH "SHA256=36658CB768A54C1D4DEC43C3116C27ED893E88B02ECFCB44F2166F9C0B7F2A0D")
@@ -28,8 +30,6 @@ set(ZLIB_HASH "SHA256=36658CB768A54C1D4DEC43C3116C27ED893E88B02ECFCB44
if (NOT WIN32)
set(GLOG_VERSION "0.3.3")
set(GLOG_HASH "SHA256=FBF90C2285BA0561DB7A40F8A4EEFB9AA963E7D399BD450363E959929FE849D0")
- set(PROTOBUF_VERSION "3.3.0")
- set(PROTOBUF_HASH "SHA256=E43F47C51C4A838F737EE2DA2F183F129EE388272622C403179D5AD28C555F39")
set(ZOOKEEPER_VERSION "3.4.8")
set(ZOOKEEPER_HASH "SHA256=F10A0B51F45C4F64C1FE69EF713ABF9EB9571BC7385A82DA892E83BB6C965E90")
else (NOT WIN32)
@@ -41,12 +41,6 @@ else (NOT WIN32)
set(GLOG_VERSION "da816ea70")
set(GLOG_HASH "SHA256=15338EDBE643F3F9A769FBCA34C3AFDF48D8779D800E7F0878A9649A53339F96")
- # TODO(hausdorff): (MESOS-3453) this is a patched version of the protobuf
- # library that compiles on Windows. We need to send this as a PR back to the
- # protobuf project.
- set(PROTOBUF_VERSION "3.0.0-beta-2")
- set(PROTOBUF_HASH "SHA256=BE224D07CE87F12E362CFF3DF02851107BF92A4E4604349B1D7A4B1F0C3BFD86")
-
# The latest release of ZK, 3.4.7, does not compile on Windows. Therefore, we
# pick a recent commit that does until the next release stabilizes.
set(ZOOKEEPER_VERSION "3.5.2-alpha")