You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2012/02/15 22:03:44 UTC
svn commit: r1244723 - in /incubator/mesos/trunk: src/Makefile.am
src/tests/base_zookeeper_test.cpp third_party/Makefile.am
third_party/versions.am third_party/zookeeper-3.3.1.tar.gz
third_party/zookeeper-3.3.4.tar.gz
Author: benh
Date: Wed Feb 15 21:03:43 2012
New Revision: 1244723
URL: http://svn.apache.org/viewvc?rev=1244723&view=rev
Log:
Upgrade zookeeper to 3.3.4; less hardcoded third_party version numbers (contributed by Charles Reiss).
Added:
incubator/mesos/trunk/third_party/versions.am
incubator/mesos/trunk/third_party/zookeeper-3.3.4.tar.gz
Removed:
incubator/mesos/trunk/third_party/zookeeper-3.3.1.tar.gz
Modified:
incubator/mesos/trunk/src/Makefile.am
incubator/mesos/trunk/src/tests/base_zookeeper_test.cpp
incubator/mesos/trunk/third_party/Makefile.am
Modified: incubator/mesos/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.am?rev=1244723&r1=1244722&r2=1244723&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.am (original)
+++ incubator/mesos/trunk/src/Makefile.am Wed Feb 15 21:03:43 2012
@@ -19,15 +19,18 @@
# master/http.cpp and slave/http.cpp.
AUTOMAKE_OPTIONS = subdir-objects
+include ../third_party/versions.am
+
# TODO(charles): Move these into an included automakefile and have
# them include $(top_builddir) as appropriate.
-BOOST = third_party/boost-1.37.0
-PROTOBUF = third_party/protobuf-2.3.0
-GLOG = third_party/glog-0.3.1
-GMOCK = third_party/gmock-1.6.0
+BOOST = third_party/boost-$(BOOST_VERSION)
+DISTRIBUTE = third_party/distribute-$(DISTRIBUTE_VERSION)
+PROTOBUF = third_party/protobuf-$(PROTOBUF_VERSION)
+GLOG = third_party/glog-$(GLOG_VERSION)
+GMOCK = third_party/gmock-$(GMOCK_VERSION)
GTEST = $(GMOCK)/gtest
LEVELDB = third_party/leveldb
-ZOOKEEPER = third_party/zookeeper-3.3.1/src/c
+ZOOKEEPER = third_party/zookeeper-$(ZOOKEEPER_VERSION)/src/c
LIBPROCESS = third_party/libprocess
LIBEV = $(LIBPROCESS)/third_party/libev-3.8
@@ -48,7 +51,7 @@ javalibdir = $(libdir)/java
# Used for building Python eggs.
SETUPTOOLS = \
- $(abs_top_srcdir)/third_party/distribute-0.6.19/distribute-0.6.19-py2.6.egg
+ $(abs_top_srcdir)/$(DISTRIBUTE)/distribute-$(DISTRIBUTE_VERSION)-py2.6.egg
# Protocol buffer compiler.
PROTOC = ../$(PROTOBUF)/src/protoc
@@ -524,9 +527,8 @@ if HAS_PYTHON
# system versions of our dependencies (since we won't be able to
# create a standalone egg anyways).
-# TODO(Charles Reiss): Don't hard code this verison number.
-PROTOBUF_EGG = \
- ../$(PROTOBUF)/python/dist/protobuf-2.3.0$(PYTHON_EGG_PUREPY_POSTFIX).egg
+PROTOBUF_EGG_SUFFIX = $(PROTOBUF_VERSION)$(PYTHON_EGG_PUREPY_POSTFIX).egg
+PROTOBUF_EGG = ../$(PROTOBUF)/python/dist/protobuf-$(PROTOBUF_EGG_SUFFIX)
$(PROTOBUF_EGG):
@echo "Building protobuf Python egg ..."
@@ -639,6 +641,7 @@ if HAS_JAVA
tests/zookeeper_server_tests.cpp \
tests/zookeeper_tests.cpp
mesos_tests_CPPFLAGS += $(JAVA_CPPFLAGS)
+ mesos_tests_CPPFLAGS += -DZOOKEEPER_VERSION=\"$(ZOOKEEPER_VERSION)\"
mesos_tests_LDFLAGS = $(JAVA_LDFLAGS) $(AM_LDFLAGS)
mesos_tests_DEPENDENCIES += $(EXAMPLES_JAR)
Modified: incubator/mesos/trunk/src/tests/base_zookeeper_test.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/base_zookeeper_test.cpp?rev=1244723&r1=1244722&r2=1244723&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/base_zookeeper_test.cpp (original)
+++ incubator/mesos/trunk/src/tests/base_zookeeper_test.cpp Wed Feb 15 21:03:43 2012
@@ -77,10 +77,10 @@ void BaseZooKeeperTest::SetUpTestCase()
if (singleton == NULL) {
std::vector<std::string> opts;
- // TODO(Charles Reiss): ZooKeeper version should not be hardcoded here.
- std::string zkHome = mesosBuildDirectory + "/third_party/zookeeper-3.3.1";
+ std::string zkHome = mesosBuildDirectory +
+ "/third_party/zookeeper-" ZOOKEEPER_VERSION;
std::string classpath = "-Djava.class.path=" +
- zkHome + "/zookeeper-3.3.1.jar:" +
+ zkHome + "/zookeeper-" ZOOKEEPER_VERSION ".jar:" +
zkHome + "/lib/log4j-1.2.15.jar";
LOG(INFO) << "Using classpath setup: " << classpath << std::endl;
opts.push_back(classpath);
Modified: incubator/mesos/trunk/third_party/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/Makefile.am?rev=1244723&r1=1244722&r2=1244723&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/Makefile.am Wed Feb 15 21:03:43 2012
@@ -28,13 +28,7 @@ BUILT_SOURCES =
# '--srcdir=...' when configuring.
CONFIGURE_ARGS = @CONFIGURE_ARGS@ --enable-shared=no --with-pic --srcdir=.
-GLOG_VERSION = 0.3.1
-GMOCK_VERSION = 1.6.0
-ZOOKEEPER_VERSION = 3.3.1
-PROTOBUF_VERSION = 2.3.0
-BOOST_VERSION = 1.37.0
-DISTRIBUTE_VERSION = 0.6.19
-BOTO_VERSION = 2.0b2
+include versions.am
BOOST = boost-$(BOOST_VERSION)
BOTO = boto-$(BOTO_VERSION)
Added: incubator/mesos/trunk/third_party/versions.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/versions.am?rev=1244723&view=auto
==============================================================================
--- incubator/mesos/trunk/third_party/versions.am (added)
+++ incubator/mesos/trunk/third_party/versions.am Wed Feb 15 21:03:43 2012
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
+# This automake utility file is included from third_party/Makefile.am and
+# src/Makefile.am, so we can update the version numbers of third_party packges
+# in exactly one place.
+
+GLOG_VERSION = 0.3.1
+GMOCK_VERSION = 1.6.0
+ZOOKEEPER_VERSION = 3.3.4
+PROTOBUF_VERSION = 2.3.0
+BOOST_VERSION = 1.37.0
+DISTRIBUTE_VERSION = 0.6.19
+BOTO_VERSION = 2.0b2
Added: incubator/mesos/trunk/third_party/zookeeper-3.3.4.tar.gz
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/zookeeper-3.3.4.tar.gz?rev=1244723&view=auto
==============================================================================
Files incubator/mesos/trunk/third_party/zookeeper-3.3.4.tar.gz (added) and incubator/mesos/trunk/third_party/zookeeper-3.3.4.tar.gz Wed Feb 15 21:03:43 2012 differ