You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2015/09/19 01:32:05 UTC
mesos git commit: CMake: Fixed MESOS-3395, MESOS-3394,
canonical third-party lib source.
Repository: mesos
Updated Branches:
refs/heads/master 63f1c2ec8 -> 2ac34e2c9
CMake: Fixed MESOS-3395, MESOS-3394, canonical third-party lib source.
In the current CMake build system, if we choose to download the
third-party dependencies (instead of un-tar'ing the rebundled versions
of those dependencies) we will download them from the GitHub Mesos
mirror.
It would be better to have a canonical source of third-party
dependencies, independent of the Mesos changes.
This commit points at a new canonical source of third-party tarballs.
Review: https://reviews.apache.org/r/38456
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2ac34e2c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2ac34e2c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2ac34e2c
Branch: refs/heads/master
Commit: 2ac34e2c92897ba5eee22a2b37d6386ce0e41226
Parents: 63f1c2e
Author: Alex Clemmer <cl...@gmail.com>
Authored: Fri Sep 18 18:58:32 2015 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Fri Sep 18 19:31:37 2015 -0400
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/CMakeLists.txt | 32 +++++++-----------------
1 file changed, 9 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2ac34e2c/3rdparty/libprocess/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/CMakeLists.txt b/3rdparty/libprocess/3rdparty/CMakeLists.txt
index c746ba5..b9c9fae 100644
--- a/3rdparty/libprocess/3rdparty/CMakeLists.txt
+++ b/3rdparty/libprocess/3rdparty/CMakeLists.txt
@@ -21,6 +21,7 @@ include(ExternalProject)
# Define sources of third-party dependencies.
#############################################
+set(UPSTREAM_URL https://github.com/3rdparty/mesos-3rdparty/raw/master)
set(REBUNDLED_DIR ${CMAKE_CURRENT_SOURCE_DIR})
if (REBUNDLED)
set(BOOST_URL ${REBUNDLED_DIR}/boost-${BOOST_VERSION}.tar.gz)
@@ -29,19 +30,11 @@ if (REBUNDLED)
set(HTTP_PARSER_URL ${REBUNDLED_DIR}/ry-http-parser-${HTTP_PARSER_VERSION}.tar.gz)
set(LIBEV_URL ${REBUNDLED_DIR}/libev-${LIBEV_VERSION}.tar.gz)
else (REBUNDLED)
- # TODO(hausdorff): (MESOS-3395) depends on the github mirror, should remove
- # when possible.
- set(BOOST_URL https://github.com/apache/mesos/raw/master/3rdparty/libprocess/3rdparty/boost-${BOOST_VERSION}.tar.gz)
- 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)
- # 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)
- # TODO(hausdorff): (MESOS-3395) depends on the github mirror, should remove
- # when possible.
- set(LIBEV_URL https://github.com/apache/mesos/raw/master/3rdparty/libprocess/3rdparty/libev-${LIBEV_VERSION}.tar.gz)
+ set(BOOST_URL ${UPSTREAM_URL}/boost-${BOOST_VERSION}.tar.gz)
+ set(GLOG_URL ${UPSTREAM_URL}/glog-${GLOG_VERSION}.tar.gz)
+ set(PICOJSON_URL ${UPSTREAM_URL}/picojson-${PICOJSON_VERSION}.tar.gz)
+ set(HTTP_PARSER_URL ${UPSTREAM_URL}/ry-http-parser-${HTTP_PARSER_VERSION}.tar.gz)
+ set(LIBEV_URL ${UPSTREAM_URL}/libev-${LIBEV_VERSION}.tar.gz)
endif (REBUNDLED)
if (WIN32)
@@ -67,10 +60,7 @@ if (WIN32)
# [1] https://github.com/google/glog/pull/43
set(GLOG_URL https://github.com/hausdorff/glog/tarball/glog-${GLOG_VERSION}-msvc1900)
- # TODO(hausdorff): (MESOS-3394) points at a random tarball in my
- # (hausdorff's) repository. We need a more permanent solution for this
- # eventually.
- set(CURL_URL https://github.com/hausdorff/3rdparty/raw/master/curl-static-${CURL_VERSION}.tar.gz)
+ set(CURL_URL ${UPSTREAM_URL}/curl-static-${CURL_VERSION}.tar.gz)
endif (WIN32)
# Define build/patch/configure commands for third-party libs.
@@ -200,12 +190,8 @@ if (REBUNDLED)
set(GMOCK_URL ${REBUNDLED_DIR}/gmock-${GMOCK_VERSION}.tar.gz)
set(PROTOBUF_URL ${REBUNDLED_DIR}/protobuf-${PROTOBUF_VERSION}.tar.gz)
else (REBUNDLED)
- # TODO(hausdorff): (MESOS-3395) depends on the github mirror, should remove
- # when possible.
- set(GMOCK_URL https://github.com/apache/mesos/raw/master/3rdparty/libprocess/3rdparty/gmock-${GMOCK_VERSION}.tar.gz)
- # TODO(hausdorff): (MESOS-3395) depends on the github mirror, should remove
- # when possible.
- set(PROTOBUF_URL https://github.com/hausdorff/mesos/raw/test_cmake/3rdparty/libprocess/3rdparty/protobuf-${PROTOBUF_VERSION}.tar.gz)
+ set(GMOCK_URL ${UPSTREAM_URL}/gmock-${GMOCK_VERSION}.tar.gz)
+ set(PROTOBUF_URL ${UPSTREAM_URL}/protobuf-${PROTOBUF_VERSION}.tar.gz)
endif (REBUNDLED)
if (APPLE)