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 2013/02/28 06:04:28 UTC
svn commit: r1451093 [1/2] - in /incubator/mesos/trunk: ./ src/ src/tests/
third_party/ third_party/libprocess/ third_party/libprocess/include/process/
third_party/libprocess/include/stout/ third_party/libprocess/third_party/
third_party/libprocess/thi...
Author: benh
Date: Thu Feb 28 05:04:27 2013
New Revision: 1451093
URL: http://svn.apache.org/r1451093
Log:
Made stout independent of libprocess and Mesos.
Review: https://reviews.apache.org/r/9631
Added:
incubator/mesos/trunk/third_party/libprocess/include/process/gtest.hpp
- copied, changed from r1451092, incubator/mesos/trunk/src/tests/assert.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/
incubator/mesos/trunk/third_party/libprocess/third_party/stout/LICENSE
incubator/mesos/trunk/third_party/libprocess/third_party/stout/Makefile.am
incubator/mesos/trunk/third_party/libprocess/third_party/stout/README
incubator/mesos/trunk/third_party/libprocess/third_party/stout/bootstrap (with props)
incubator/mesos/trunk/third_party/libprocess/third_party/stout/configure.ac
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/cache.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/cache.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/duration.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/duration.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/error.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/error.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/exit.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/exit.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/fatal.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/fatal.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/foreach.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/foreach.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/format.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/format.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/fs.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/fs.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/gtest.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/gzip.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/gzip.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/hashmap.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/hashmap.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/hashset.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/hashset.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/json.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/json.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/lambda.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/lambda.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/multihashmap.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/multihashmap.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/net.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/net.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/none.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/none.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/nothing.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/nothing.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/numify.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/numify.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/option.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/option.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/os.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/os.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/owned.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/owned.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/path.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/path.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/protobuf.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/protobuf.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/result.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/result.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/stopwatch.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/stopwatch.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/stringify.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/stringify.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/strings.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/strings.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/try.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/try.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/utils.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/utils.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/uuid.hpp
- copied, changed from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/uuid.hpp
incubator/mesos/trunk/third_party/libprocess/third_party/stout/install-sh (with props)
incubator/mesos/trunk/third_party/libprocess/third_party/stout/m4/
incubator/mesos/trunk/third_party/libprocess/third_party/stout/m4/acx_pthread.m4
incubator/mesos/trunk/third_party/libprocess/third_party/stout/tests/
incubator/mesos/trunk/third_party/libprocess/third_party/stout/tests/tests.cpp
- copied, changed from r1451092, incubator/mesos/trunk/src/tests/stout_tests.cpp
Removed:
incubator/mesos/trunk/src/tests/assert.hpp
incubator/mesos/trunk/src/tests/stout_tests.cpp
incubator/mesos/trunk/third_party/libprocess/include/stout/cache.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/duration.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/error.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/exit.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/fatal.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/foreach.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/format.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/fs.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/gzip.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/hashmap.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/hashset.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/json.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/lambda.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/multihashmap.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/net.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/none.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/nothing.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/numify.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/option.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/os.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/owned.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/path.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/protobuf.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/result.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/stopwatch.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/stringify.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/strings.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/try.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/utils.hpp
incubator/mesos/trunk/third_party/libprocess/include/stout/uuid.hpp
Modified:
incubator/mesos/trunk/Makefile.am
incubator/mesos/trunk/src/Makefile.am
incubator/mesos/trunk/src/tests/fs_tests.cpp
incubator/mesos/trunk/src/tests/gc_tests.cpp
incubator/mesos/trunk/src/tests/utils.hpp
incubator/mesos/trunk/third_party/Makefile.am
incubator/mesos/trunk/third_party/libprocess/Makefile.am
incubator/mesos/trunk/third_party/libprocess/configure.ac
incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am
Modified: incubator/mesos/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/Makefile.am?rev=1451093&r1=1451092&r2=1451093&view=diff
==============================================================================
--- incubator/mesos/trunk/Makefile.am (original)
+++ incubator/mesos/trunk/Makefile.am Thu Feb 28 05:04:27 2013
@@ -47,4 +47,12 @@ PHONY_TARGETS += maven-install
endif
+# Using LT_OUTPUT in configure.ac creates config.lt that doesn't get
+# cleaned up by distclean-libtool. See this bug patch (which doesn't
+# appear to be in all versions of libtool.m4):
+# http://lists.gnu.org/archive/html/automake-commit/2008-11/msg00015.html.
+distclean-local:
+ -rm -f config.lt
+
+
.PHONY: $(PHONY_TARGETS)
Modified: incubator/mesos/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.am?rev=1451093&r1=1451092&r2=1451093&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.am (original)
+++ incubator/mesos/trunk/src/Makefile.am Thu Feb 28 05:04:27 2013
@@ -29,6 +29,7 @@ PROTOBUF = third_party/protobuf-$(PROTOB
LEVELDB = third_party/leveldb
ZOOKEEPER = third_party/zookeeper-$(ZOOKEEPER_VERSION)/src/c
LIBPROCESS = third_party/libprocess
+STOUT = $(LIBPROCESS)/third_party/stout
BOOST = $(LIBPROCESS)/third_party/boost-$(BOOST_VERSION)
GLOG = $(LIBPROCESS)/third_party/glog-$(GLOG_VERSION)
GMOCK = $(LIBPROCESS)/third_party/gmock-$(GMOCK_VERSION)
@@ -84,6 +85,7 @@ MESOS_CPPFLAGS += -DMESOS_WEBUI_DIR=\"$(
MESOS_CPPFLAGS += -DMESOS_LIBEXECDIR=\"$(pkglibexecdir)\"
MESOS_CPPFLAGS += -I$(top_srcdir)/include
MESOS_CPPFLAGS += -I$(top_srcdir)/$(LIBPROCESS)/include
+MESOS_CPPFLAGS += -I$(top_srcdir)/$(STOUT)/include
MESOS_CPPFLAGS += -I../include
MESOS_CPPFLAGS += -I../$(BOOST)
MESOS_CPPFLAGS += -I../$(PROTOBUF)/src
@@ -234,7 +236,6 @@ libmesos_no_third_party_la_SOURCES += co
slave/process_based_isolation_module.hpp slave/reaper.hpp \
slave/slave.hpp slave/solaris_project_isolation_module.hpp \
tests/environment.hpp tests/script.hpp \
- tests/assert.hpp \
tests/zookeeper_test.hpp tests/flags.hpp tests/utils.hpp \
tests/filter.hpp \
tests/zookeeper_test_server.hpp zookeeper/authentication.hpp \
@@ -793,7 +794,6 @@ mesos_tests_SOURCES = tests/main.cpp tes
tests/configurator_tests.cpp \
tests/multihashmap_tests.cpp \
tests/protobuf_io_tests.cpp \
- tests/stout_tests.cpp \
tests/zookeeper_url_tests.cpp \
tests/killtree_tests.cpp \
tests/exception_tests.cpp \
Modified: incubator/mesos/trunk/src/tests/fs_tests.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/fs_tests.cpp?rev=1451093&r1=1451092&r2=1451093&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/fs_tests.cpp (original)
+++ incubator/mesos/trunk/src/tests/fs_tests.cpp Thu Feb 28 05:04:27 2013
@@ -21,13 +21,13 @@
#include <gmock/gmock.h>
#include <stout/foreach.hpp>
+#include <stout/gtest.hpp>
#include <stout/none.hpp>
#include <stout/option.hpp>
#include <stout/try.hpp>
#include "linux/fs.hpp"
-#include "tests/assert.hpp"
using namespace mesos;
using namespace mesos::internal;
Modified: incubator/mesos/trunk/src/tests/gc_tests.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/gc_tests.cpp?rev=1451093&r1=1451092&r2=1451093&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/gc_tests.cpp (original)
+++ incubator/mesos/trunk/src/tests/gc_tests.cpp Thu Feb 28 05:04:27 2013
@@ -28,6 +28,7 @@
#include <process/process.hpp>
#include <stout/duration.hpp>
+#include <stout/gtest.hpp>
#include <stout/os.hpp>
#include "common/resources.hpp"
@@ -46,7 +47,6 @@
#include "slave/flags.hpp"
#include "slave/slave.hpp"
-#include "tests/assert.hpp"
#include "tests/filter.hpp"
#include "tests/utils.hpp"
@@ -61,7 +61,6 @@ using mesos::internal::master::Master;
using mesos::internal::slave::Slave;
using process::Clock;
-using process::Future;
using process::PID;
using std::string;
Modified: incubator/mesos/trunk/src/tests/utils.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/utils.hpp?rev=1451093&r1=1451092&r2=1451093&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/utils.hpp (original)
+++ incubator/mesos/trunk/src/tests/utils.hpp Thu Feb 28 05:04:27 2013
@@ -31,10 +31,12 @@
#include <mesos/scheduler.hpp>
#include <process/future.hpp>
+#include <process/gtest.hpp>
#include <process/http.hpp>
#include <process/process.hpp>
#include <stout/duration.hpp>
+#include <stout/gtest.hpp>
#include <stout/option.hpp>
#include <stout/os.hpp>
#include <stout/path.hpp>
@@ -56,7 +58,6 @@
#include "slave/isolation_module.hpp"
#include "slave/slave.hpp"
-#include "tests/assert.hpp"
#include "tests/flags.hpp"
// TODO(benh): Kill these since they pollute everything that includes this file.
Modified: incubator/mesos/trunk/third_party/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/Makefile.am?rev=1451093&r1=1451092&r2=1451093&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/Makefile.am Thu Feb 28 05:04:27 2013
@@ -57,7 +57,7 @@ CLEAN_EXTRACTED = \
# This is where the magic happens: we use stamp files as dependencies
# which cause the packages to get extracted as necessary. We also
# apply any patches as appropriate.
-%-stamp:: %.tar.gz
+%-stamp: %.tar.gz
gzip -d -c $^ | tar xf -
test ! -e $(srcdir)/$*.patch || patch -d $* -p1 <$(srcdir)/$*.patch
touch $@
@@ -89,24 +89,25 @@ $(ZOOKEEPER)/src/c/libzookeeper_mt.la: $
cd $(ZOOKEEPER)/src/c && ./configure $(CONFIGURE_ARGS) && \
$(MAKE) $(AM_MAKEFLAGS)
-THIRD_PARTY_LIBS = \
+# Dependencies for all-local.
+ALL_LOCAL = \
$(LEVELDB)/libleveldb.a \
$(PROTOBUF)/src/libprotobuf.la \
$(PROTOBUF)/src/protoc
if HAS_PYTHON
- THIRD_PARTY_LIBS += $(DISTRIBUTE_EGG)
+ ALL_LOCAL += $(DISTRIBUTE_EGG)
endif
if WITH_INCLUDED_ZOOKEEPER
- THIRD_PARTY_LIBS += $(ZOOKEEPER)/src/c/libzookeeper_mt.la
+ ALL_LOCAL += $(ZOOKEEPER)/src/c/libzookeeper_mt.la
else
# Now matter what we need to extract ZooKeeper so that we can run
# 'make check' (some of our tests need the ZooKeeper JAR).
- THIRD_PARTY_LIBS += $(ZOOKEEPER)-stamp
+ ALL_LOCAL += $(ZOOKEEPER)-stamp
endif
-all-local: $(THIRD_PARTY_LIBS)
+all-local: $(ALL_LOCAL)
clean-local:
rm -r -f $(CLEAN_EXTRACTED)
Modified: incubator/mesos/trunk/third_party/libprocess/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/Makefile.am?rev=1451093&r1=1451092&r2=1451093&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/libprocess/Makefile.am Thu Feb 28 05:04:27 2013
@@ -9,6 +9,7 @@ SUBDIRS = third_party .
include third_party/versions.am
+STOUT = third_party/stout
BOOST = third_party/boost-$(BOOST_VERSION)
GLOG = third_party/glog-$(GLOG_VERSION)
GMOCK = third_party/gmock-$(GMOCK_VERSION)
@@ -25,15 +26,30 @@ LIBEV = third_party/libev-$(LIBEV_VERSIO
# arguments, see configure.ac).
noinst_LTLIBRARIES = libprocess.la
-libprocess_la_SOURCES = src/process.cpp src/pid.cpp src/latch.cpp \
- src/statistics.cpp src/config.hpp src/decoder.hpp \
- src/encoder.hpp src/gate.hpp src/synchronized.hpp
-
-libprocess_la_CPPFLAGS = -I$(srcdir)/include -I$(BOOST) -I$(GLOG)/src \
- -I$(RY_HTTP_PARSER) -I$(LIBEV) $(AM_CPPFLAGS)
-
-libprocess_la_LIBADD = $(GLOG)/libglog.la \
- third_party/libry_http_parser.la $(LIBEV)/libev.la
+libprocess_la_SOURCES = \
+ src/process.cpp \
+ src/pid.cpp \
+ src/latch.cpp \
+ src/statistics.cpp \
+ src/config.hpp \
+ src/decoder.hpp \
+ src/encoder.hpp \
+ src/gate.hpp \
+ src/synchronized.hpp
+
+libprocess_la_CPPFLAGS = \
+ -I$(srcdir)/include \
+ -I$(srcdir)/$(STOUT)/include \
+ -I$(BOOST) \
+ -I$(GLOG)/src \
+ -I$(RY_HTTP_PARSER) \
+ -I$(LIBEV) \
+ $(AM_CPPFLAGS)
+
+libprocess_la_LIBADD = \
+ $(GLOG)/libglog.la \
+ third_party/libry_http_parser.la \
+ $(LIBEV)/libev.la
if HAS_GPERFTOOLS
libprocess_la_CPPFLAGS += -I$(GPERFTOOLS)/src
@@ -41,81 +57,64 @@ libprocess_la_LIBADD += $(GPERFTOOLS)/li
endif
# Headers.
-libprocess_la_SOURCES += $(top_srcdir)/include/process/async.hpp \
- $(top_srcdir)/include/process/clock.hpp \
- $(top_srcdir)/include/process/collect.hpp \
- $(top_srcdir)/include/process/defer.hpp \
- $(top_srcdir)/include/process/deferred.hpp \
- $(top_srcdir)/include/process/delay.hpp \
- $(top_srcdir)/include/process/dispatch.hpp \
- $(top_srcdir)/include/process/event.hpp \
- $(top_srcdir)/include/process/executor.hpp \
- $(top_srcdir)/include/process/filter.hpp \
- $(top_srcdir)/include/process/future.hpp \
- $(top_srcdir)/include/process/gc.hpp \
- $(top_srcdir)/include/process/http.hpp \
- $(top_srcdir)/include/process/id.hpp \
- $(top_srcdir)/include/process/io.hpp \
- $(top_srcdir)/include/process/latch.hpp \
- $(top_srcdir)/include/process/message.hpp \
- $(top_srcdir)/include/process/mime.hpp \
- $(top_srcdir)/include/process/once.hpp \
- $(top_srcdir)/include/process/pid.hpp \
- $(top_srcdir)/include/process/preprocessor.hpp \
- $(top_srcdir)/include/process/process.hpp \
- $(top_srcdir)/include/process/profiler.hpp \
- $(top_srcdir)/include/process/protobuf.hpp \
- $(top_srcdir)/include/process/run.hpp \
- $(top_srcdir)/include/process/socket.hpp \
- $(top_srcdir)/include/process/statistics.hpp \
- $(top_srcdir)/include/process/thread.hpp \
- $(top_srcdir)/include/process/timeout.hpp \
- $(top_srcdir)/include/process/timer.hpp \
- $(top_srcdir)/include/stout/cache.hpp \
- $(top_srcdir)/include/stout/duration.hpp \
- $(top_srcdir)/include/stout/error.hpp \
- $(top_srcdir)/include/stout/exit.hpp \
- $(top_srcdir)/include/stout/fatal.hpp \
- $(top_srcdir)/include/stout/foreach.hpp \
- $(top_srcdir)/include/stout/format.hpp \
- $(top_srcdir)/include/stout/fs.hpp \
- $(top_srcdir)/include/stout/gzip.hpp \
- $(top_srcdir)/include/stout/hashmap.hpp \
- $(top_srcdir)/include/stout/hashset.hpp \
- $(top_srcdir)/include/stout/json.hpp \
- $(top_srcdir)/include/stout/lambda.hpp \
- $(top_srcdir)/include/stout/multihashmap.hpp \
- $(top_srcdir)/include/stout/net.hpp \
- $(top_srcdir)/include/stout/none.hpp \
- $(top_srcdir)/include/stout/nothing.hpp \
- $(top_srcdir)/include/stout/numify.hpp \
- $(top_srcdir)/include/stout/option.hpp \
- $(top_srcdir)/include/stout/os.hpp \
- $(top_srcdir)/include/stout/owned.hpp \
- $(top_srcdir)/include/stout/path.hpp \
- $(top_srcdir)/include/stout/protobuf.hpp \
- $(top_srcdir)/include/stout/result.hpp \
- $(top_srcdir)/include/stout/stopwatch.hpp \
- $(top_srcdir)/include/stout/stringify.hpp \
- $(top_srcdir)/include/stout/strings.hpp \
- $(top_srcdir)/include/stout/try.hpp \
- $(top_srcdir)/include/stout/utils.hpp \
- $(top_srcdir)/include/stout/uuid.hpp
-
+libprocess_la_SOURCES += \
+ $(top_srcdir)/include/process/async.hpp \
+ $(top_srcdir)/include/process/clock.hpp \
+ $(top_srcdir)/include/process/collect.hpp \
+ $(top_srcdir)/include/process/defer.hpp \
+ $(top_srcdir)/include/process/deferred.hpp \
+ $(top_srcdir)/include/process/delay.hpp \
+ $(top_srcdir)/include/process/dispatch.hpp \
+ $(top_srcdir)/include/process/event.hpp \
+ $(top_srcdir)/include/process/executor.hpp \
+ $(top_srcdir)/include/process/filter.hpp \
+ $(top_srcdir)/include/process/future.hpp \
+ $(top_srcdir)/include/process/gc.hpp \
+ $(top_srcdir)/include/process/gtest.hpp \
+ $(top_srcdir)/include/process/http.hpp \
+ $(top_srcdir)/include/process/id.hpp \
+ $(top_srcdir)/include/process/io.hpp \
+ $(top_srcdir)/include/process/latch.hpp \
+ $(top_srcdir)/include/process/message.hpp \
+ $(top_srcdir)/include/process/mime.hpp \
+ $(top_srcdir)/include/process/once.hpp \
+ $(top_srcdir)/include/process/pid.hpp \
+ $(top_srcdir)/include/process/preprocessor.hpp \
+ $(top_srcdir)/include/process/process.hpp \
+ $(top_srcdir)/include/process/profiler.hpp \
+ $(top_srcdir)/include/process/protobuf.hpp \
+ $(top_srcdir)/include/process/run.hpp \
+ $(top_srcdir)/include/process/socket.hpp \
+ $(top_srcdir)/include/process/statistics.hpp \
+ $(top_srcdir)/include/process/thread.hpp \
+ $(top_srcdir)/include/process/timeout.hpp \
+ $(top_srcdir)/include/process/timer.hpp
# Tests.
check_PROGRAMS = tests
-tests_SOURCES = src/tests/http_tests.cpp \
- src/tests/io_tests.cpp \
- src/tests/main.cpp \
- src/tests/process_tests.cpp \
- src/tests/statistics_tests.cpp
+tests_SOURCES = \
+ src/tests/http_tests.cpp \
+ src/tests/io_tests.cpp \
+ src/tests/main.cpp \
+ src/tests/process_tests.cpp \
+ src/tests/statistics_tests.cpp
+
+tests_CPPFLAGS = \
+ -I$(top_srcdir)/src \
+ -I$(GTEST)/include \
+ -I$(GMOCK)/include \
+ $(libprocess_la_CPPFLAGS)
-tests_CPPFLAGS = -I$(top_srcdir)/src -I$(GTEST)/include \
- -I$(GMOCK)/include $(libprocess_la_CPPFLAGS)
tests_LDADD = third_party/libgmock.la libprocess.la
TESTS = tests
# TODO(benh): Fix shared builds (tests need libglog, libev, etc).
+
+# Using LT_OUTPUT in configure.ac creates config.lt that doesn't get
+# cleaned up by distclean-libtool. See this bug patch (which doesn't
+# appear to be in all versions of libtool.m4):
+# http://lists.gnu.org/archive/html/automake-commit/2008-11/msg00015.html.
+distclean-local:
+ -rm -f config.lt
Modified: incubator/mesos/trunk/third_party/libprocess/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/configure.ac?rev=1451093&r1=1451092&r2=1451093&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/configure.ac (original)
+++ incubator/mesos/trunk/third_party/libprocess/configure.ac Thu Feb 28 05:04:27 2013
@@ -43,6 +43,8 @@ AS_IF([test "x${ac_cv_env_CXXFLAGS_set}"
CONFIGURE_ARGS="$ac_configure_args"
AC_SUBST(CONFIGURE_ARGS)
+AC_CONFIG_SUBDIRS([third_party/stout])
+
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([third_party/Makefile])
@@ -74,7 +76,7 @@ if test "x$with_zlib" = "xyes"; then
AC_CHECK_LIB([z], [deflate, gzread, gzwrite, inflate], [],
[AC_MSG_ERROR([cannot find libz
-------------------------------------------------------------------
- This means your webui would run very slowly because we cannot use
+ This means HTTP responses will be slower because we cannot use
compression; you probably want to download and install zlib, but
you can get away without it by doing --without-zlib.
-------------------------------------------------------------------
Copied: incubator/mesos/trunk/third_party/libprocess/include/process/gtest.hpp (from r1451092, incubator/mesos/trunk/src/tests/assert.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/include/process/gtest.hpp?p2=incubator/mesos/trunk/third_party/libprocess/include/process/gtest.hpp&p1=incubator/mesos/trunk/src/tests/assert.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/assert.hpp (original)
+++ incubator/mesos/trunk/third_party/libprocess/include/process/gtest.hpp Thu Feb 28 05:04:27 2013
@@ -1,23 +1,5 @@
-/**
- * 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.
- */
-
-#ifndef __TESTS_ASSERT_HPP__
-#define __TESTS_ASSERT_HPP__
+#ifndef __PROCESS_GTEST_HPP__
+#define __PROCESS_GTEST_HPP__
#include <gtest/gtest.h>
@@ -27,117 +9,6 @@
#include <process/http.hpp>
#include <stout/option.hpp>
-#include <stout/result.hpp>
-#include <stout/try.hpp>
-
-template <typename T>
-::testing::AssertionResult AssertSome(
- const char* expr,
- const Option<T>& actual)
-{
- if (actual.isNone()) {
- return ::testing::AssertionFailure()
- << expr << " is NONE";
- }
-
- return ::testing::AssertionSuccess();
-}
-
-
-template <typename T>
-::testing::AssertionResult AssertSome(
- const char* expr,
- const Try<T>& actual)
-{
- if (actual.isError()) {
- return ::testing::AssertionFailure()
- << expr << ": " << actual.error();
- }
-
- return ::testing::AssertionSuccess();
-}
-
-
-template <typename T>
-::testing::AssertionResult AssertSome(
- const char* expr,
- const Result<T>& actual)
-{
- if (actual.isNone()) {
- return ::testing::AssertionFailure()
- << expr << " is NONE";
- } else if (actual.isError()) {
- return ::testing::AssertionFailure()
- << expr << ": " << actual.error();
- }
-
- return ::testing::AssertionSuccess();
-}
-
-
-template <typename T1, typename T2>
-::testing::AssertionResult AssertSomeEq(
- const char* expectedExpr,
- const char* actualExpr,
- const T1& expected,
- const T2& actual) // Duck typing!
-{
- const ::testing::AssertionResult result = AssertSome(actualExpr, actual);
-
- if (result) {
- if (expected == actual.get()) {
- return ::testing::AssertionSuccess();
- } else {
- return ::testing::AssertionFailure()
- << "Value of: (" << actualExpr << ").get()\n"
- << " Actual: " << ::testing::PrintToString(actual.get()) << "\n"
- << "Expected: " << expectedExpr << "\n"
- << "Which is: " << ::testing::PrintToString(expected);
- }
- }
-
- return result;
-}
-
-
-#define ASSERT_SOME(actual) \
- ASSERT_PRED_FORMAT1(AssertSome, actual)
-
-
-#define EXPECT_SOME(actual) \
- EXPECT_PRED_FORMAT1(AssertSome, actual)
-
-
-#define ASSERT_SOME_EQ(expected, actual) \
- ASSERT_PRED_FORMAT2(AssertSomeEq, expected, actual)
-
-
-#define EXPECT_SOME_EQ(expected, actual) \
- EXPECT_PRED_FORMAT2(AssertSomeEq, expected, actual)
-
-
-#define ASSERT_SOME_TRUE(actual) \
- ASSERT_PRED_FORMAT2(AssertSomeEq, true, actual)
-
-
-#define EXPECT_SOME_TRUE(actual) \
- EXPECT_PRED_FORMAT2(AssertSomeEq, true, actual)
-
-
-#define ASSERT_SOME_FALSE(actual) \
- ASSERT_PRED_FORMAT2(AssertSomeEq, false, actual)
-
-
-#define EXPECT_SOME_FALSE(actual) \
- EXPECT_PRED_FORMAT2(AssertSomeEq, false, actual)
-
-
-#define ASSERT_ERROR(actual) \
- ASSERT_TRUE(actual.isError())
-
-
-#define EXPECT_ERROR(actual) \
- EXPECT_TRUE(actual.isError())
template <typename T>
@@ -322,4 +193,4 @@ inline ::testing::AssertionResult Assert
#define EXPECT_RESPONSE_HEADER_WILL_EQ(expected, key, actual) \
EXPECT_PRED_FORMAT3(AssertResponseHeaderWillEq, expected, key, actual)
-#endif // __TESTS_ASSERT_HPP__
+#endif // __PROCESS_GTEST_HPP__
Modified: incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am?rev=1451093&r1=1451092&r2=1451093&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am (original)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/Makefile.am Thu Feb 28 05:04:27 2013
@@ -6,6 +6,8 @@
# packages may be special cases; this Makefile is responsible for
# passing any special make or configure flags that might be required.
+SUBDIRS = stout
+
BUILT_SOURCES = # Initialized to enable using +=.
# We need to add '--srcdir=.' needed because 'make distcheck' adds
@@ -14,6 +16,7 @@ CONFIGURE_ARGS = @CONFIGURE_ARGS@ --enab
include versions.am
+STOUT = stout
BOOST = boost-$(BOOST_VERSION)
GLOG = glog-$(GLOG_VERSION)
GMOCK = gmock-$(GMOCK_VERSION)
@@ -22,6 +25,7 @@ GTEST = $(GMOCK)/gtest
RY_HTTP_PARSER = ry-http-parser-$(RY_HTTP_PARSER_VERSION)
LIBEV = libev-$(LIBEV_VERSION)
+
EXTRA_DIST = \
$(BOOST).tar.gz \
$(GLOG).tar.gz \
@@ -43,7 +47,7 @@ CLEAN_EXTRACTED = \
# This is where the magic happens: we use stamp files as dependencies
# which cause the packages to get extracted as necessary. We also
# apply any patches as appropriate.
-%-stamp:: %.tar.gz
+%-stamp: %.tar.gz
gzip -d -c $^ | tar xf -
test ! -e $(srcdir)/$*.patch || patch -d $* -p1 <$(srcdir)/$*.patch
touch $@
@@ -97,16 +101,33 @@ $(LIBEV)/libev.la: $(LIBEV)-stamp
cd $(LIBEV) && ./configure $(CONFIGURE_ARGS) && \
$(MAKE) $(AM_MAKEFLAGS)
-THIRD_PARTY_LIBS = \
+
+# Tests for stout.
+check_PROGRAMS = stout-tests
+stout_tests_SOURCES = $(STOUT)/tests/tests.cpp
+stout_tests_CPPFLAGS = \
+ -I$(srcdir)/$(STOUT)/include \
+ -I$(BOOST) \
+ -I$(GLOG)/src \
+ -I$(GTEST)/include \
+ -I$(GMOCK)/include \
+ $(AM_CPPFLAGS)
+stout_tests_LDADD = libgmock.la $(GLOG)/libglog.la
+
+TESTS = stout-tests
+
+# Dependencies for all-local.
+ALL_LOCAL = \
+ $(STOUT)/Makefile \
$(BOOST)-stamp \
$(GLOG)/libglog.la \
$(LIBEV)/libev.la
if HAS_GPERFTOOLS
-THIRD_PARTY_LIBS += $(GPERFTOOLS)/libprofiler.la
+ ALL_LOCAL += $(GPERFTOOLS)/libprofiler.la
endif
-all-local: $(THIRD_PARTY_LIBS)
+all-local: $(ALL_LOCAL)
clean-local:
rm -r -f $(CLEAN_EXTRACTED)
Added: incubator/mesos/trunk/third_party/libprocess/third_party/stout/LICENSE
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/LICENSE?rev=1451093&view=auto
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/third_party/stout/LICENSE (added)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/stout/LICENSE Thu Feb 28 05:04:27 2013
@@ -0,0 +1,177 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
Added: incubator/mesos/trunk/third_party/libprocess/third_party/stout/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/Makefile.am?rev=1451093&view=auto
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/third_party/stout/Makefile.am (added)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/stout/Makefile.am Thu Feb 28 05:04:27 2013
@@ -0,0 +1,39 @@
+# Makefile for stout.
+
+ACLOCAL_AMFLAGS = -I m4
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = \
+ include/stout/cache.hpp \
+ include/stout/duration.hpp \
+ include/stout/error.hpp \
+ include/stout/exit.hpp \
+ include/stout/fatal.hpp \
+ include/stout/foreach.hpp \
+ include/stout/format.hpp \
+ include/stout/fs.hpp \
+ include/stout/gtest.hpp \
+ include/stout/gzip.hpp \
+ include/stout/hashmap.hpp \
+ include/stout/hashset.hpp \
+ include/stout/json.hpp \
+ include/stout/lambda.hpp \
+ include/stout/multihashmap.hpp \
+ include/stout/net.hpp \
+ include/stout/none.hpp \
+ include/stout/nothing.hpp \
+ include/stout/numify.hpp \
+ include/stout/option.hpp \
+ include/stout/os.hpp \
+ include/stout/owned.hpp \
+ include/stout/path.hpp \
+ include/stout/protobuf.hpp \
+ include/stout/result.hpp \
+ include/stout/stopwatch.hpp \
+ include/stout/stringify.hpp \
+ include/stout/strings.hpp \
+ include/stout/try.hpp \
+ include/stout/utils.hpp \
+ include/stout/uuid.hpp \
+ tests/tests.cpp
Added: incubator/mesos/trunk/third_party/libprocess/third_party/stout/README
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/README?rev=1451093&view=auto
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/third_party/stout/README (added)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/stout/README Thu Feb 28 05:04:27 2013
@@ -0,0 +1,31 @@
+Stout is a header-only C++ library.
+
+No action is needed if you would like to use this library in your
+project. Simply add the include folder to your include path during
+compilation.
+
+Depending on which headers you'd like to use, you may require the
+following third party libraries:
+
+ - Boost
+ - Google's glog (this dependency will be removed in the future).
+ - Google's gmock/gtest.
+
+
+Building Tests
+==============
+
+We'll assume you've got a distribution of gmock and have already built
+a static archive called libgmock.a (see gmock's README to learn
+how). We'll also assume the Boost and glog headers can be found via
+the include paths and libglog.* can be found via the library search
+paths. You can then build the tests via:
+
+$ g++ -I${STOUT}/include -I$(GMOCK)/gtest/include -I$(GMOCK)/include \
+ ${STOUT}/tests/tests.cpp libgmock.a -lglog -o tests
+
+Note that if you want to test the gzip headers you'll need to define
+HAVE_LIBZ and link against libz:
+
+$ g++ -I${STOUT}/include -I$(GMOCK)/gtest/include -I$(GMOCK)/include \
+ -DHAVE_LIBZ ${STOUT}/tests/tests.cpp libgmock.a -lglog -lz -o tests
Added: incubator/mesos/trunk/third_party/libprocess/third_party/stout/bootstrap
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/bootstrap?rev=1451093&view=auto
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/third_party/stout/bootstrap (added)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/stout/bootstrap Thu Feb 28 05:04:27 2013
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Make sure that we are in the right directory.
+if test ! -f configure.ac; then
+ cat >&2 <<__EOF__
+You must run bootstrap from the root of the distribution.
+__EOF__
+ exit 1
+fi
+
+autoreconf --install -Wall --verbose "${@}"
\ No newline at end of file
Propchange: incubator/mesos/trunk/third_party/libprocess/third_party/stout/bootstrap
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/mesos/trunk/third_party/libprocess/third_party/stout/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/configure.ac?rev=1451093&view=auto
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/third_party/stout/configure.ac (added)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/stout/configure.ac Thu Feb 28 05:04:27 2013
@@ -0,0 +1,14 @@
+# Generated with autoscan, then modified appropriately.
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.61])
+AC_INIT([stout], [0.1.0])
+
+AC_LANG([C++])
+
+# Initialize automake.
+AM_INIT_AUTOMAKE([1.10])
+
+AC_CONFIG_FILES([Makefile])
+
+AC_OUTPUT
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/cache.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/cache.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/cache.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/cache.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/cache.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/duration.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/duration.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/duration.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/duration.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/duration.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/error.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/error.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/error.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/error.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/error.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/exit.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/exit.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/exit.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/exit.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/exit.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/include/stout/exit.hpp (original)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/exit.hpp Thu Feb 28 05:04:27 2013
@@ -7,9 +7,10 @@
#include <sstream>
#include <string>
-// Exit takes an exit code and provides a stream for output prior to exiting.
-// This is like LOG(FATAL) or CHECK, except that it does _not_ print a stack
-// trace because we don't want to freak out the user.
+// Exit takes an exit code and provides a stream for output prior to
+// exiting. This is like glog's LOG(FATAL) or CHECK, except that it
+// does _not_ print a stack trace because we don't want to freak out
+// the user.
//
// Ex: EXIT(1) << "Cgroups are not present in this system.";
#define EXIT __Exit().stream
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/fatal.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/fatal.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/fatal.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/fatal.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/fatal.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/foreach.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/foreach.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/foreach.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/foreach.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/foreach.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/format.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/format.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/format.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/format.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/format.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/fs.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/fs.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/fs.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/fs.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/fs.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Added: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/gtest.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/gtest.hpp?rev=1451093&view=auto
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/gtest.hpp (added)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/gtest.hpp Thu Feb 28 05:04:27 2013
@@ -0,0 +1,122 @@
+#ifndef __STOUT_GTEST_HPP__
+#define __STOUT_GTEST_HPP__
+
+#include <gtest/gtest.h>
+
+#include <string>
+
+#include <stout/option.hpp>
+#include <stout/result.hpp>
+#include <stout/try.hpp>
+
+
+template <typename T>
+::testing::AssertionResult AssertSome(
+ const char* expr,
+ const Option<T>& actual)
+{
+ if (actual.isNone()) {
+ return ::testing::AssertionFailure()
+ << expr << " is NONE";
+ }
+
+ return ::testing::AssertionSuccess();
+}
+
+
+template <typename T>
+::testing::AssertionResult AssertSome(
+ const char* expr,
+ const Try<T>& actual)
+{
+ if (actual.isError()) {
+ return ::testing::AssertionFailure()
+ << expr << ": " << actual.error();
+ }
+
+ return ::testing::AssertionSuccess();
+}
+
+
+template <typename T>
+::testing::AssertionResult AssertSome(
+ const char* expr,
+ const Result<T>& actual)
+{
+ if (actual.isNone()) {
+ return ::testing::AssertionFailure()
+ << expr << " is NONE";
+ } else if (actual.isError()) {
+ return ::testing::AssertionFailure()
+ << expr << ": " << actual.error();
+ }
+
+ return ::testing::AssertionSuccess();
+}
+
+
+template <typename T1, typename T2>
+::testing::AssertionResult AssertSomeEq(
+ const char* expectedExpr,
+ const char* actualExpr,
+ const T1& expected,
+ const T2& actual) // Duck typing!
+{
+ const ::testing::AssertionResult result = AssertSome(actualExpr, actual);
+
+ if (result) {
+ if (expected == actual.get()) {
+ return ::testing::AssertionSuccess();
+ } else {
+ return ::testing::AssertionFailure()
+ << "Value of: (" << actualExpr << ").get()\n"
+ << " Actual: " << ::testing::PrintToString(actual.get()) << "\n"
+ << "Expected: " << expectedExpr << "\n"
+ << "Which is: " << ::testing::PrintToString(expected);
+ }
+ }
+
+ return result;
+}
+
+
+#define ASSERT_SOME(actual) \
+ ASSERT_PRED_FORMAT1(AssertSome, actual)
+
+
+#define EXPECT_SOME(actual) \
+ EXPECT_PRED_FORMAT1(AssertSome, actual)
+
+
+#define ASSERT_SOME_EQ(expected, actual) \
+ ASSERT_PRED_FORMAT2(AssertSomeEq, expected, actual)
+
+
+#define EXPECT_SOME_EQ(expected, actual) \
+ EXPECT_PRED_FORMAT2(AssertSomeEq, expected, actual)
+
+
+#define ASSERT_SOME_TRUE(actual) \
+ ASSERT_PRED_FORMAT2(AssertSomeEq, true, actual)
+
+
+#define EXPECT_SOME_TRUE(actual) \
+ EXPECT_PRED_FORMAT2(AssertSomeEq, true, actual)
+
+
+#define ASSERT_SOME_FALSE(actual) \
+ ASSERT_PRED_FORMAT2(AssertSomeEq, false, actual)
+
+
+#define EXPECT_SOME_FALSE(actual) \
+ EXPECT_PRED_FORMAT2(AssertSomeEq, false, actual)
+
+
+#define ASSERT_ERROR(actual) \
+ ASSERT_TRUE(actual.isError())
+
+
+#define EXPECT_ERROR(actual) \
+ EXPECT_TRUE(actual.isError())
+
+#endif // __STOUT_GTEST_HPP__
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/gzip.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/gzip.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/gzip.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/gzip.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/gzip.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/hashmap.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/hashmap.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/hashmap.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/hashmap.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/hashmap.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/hashset.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/hashset.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/hashset.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/hashset.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/hashset.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/json.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/json.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/json.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/json.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/json.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/lambda.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/lambda.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/lambda.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/lambda.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/lambda.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/multihashmap.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/multihashmap.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/multihashmap.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/multihashmap.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/multihashmap.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/net.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/net.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/net.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/net.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/net.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/none.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/none.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/none.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/none.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/none.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/nothing.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/nothing.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/nothing.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/nothing.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/nothing.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/numify.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/numify.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/numify.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/numify.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/numify.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/option.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/option.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/option.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/option.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/option.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/os.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/os.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/os.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/os.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/os.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/owned.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/owned.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/owned.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/owned.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/owned.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/path.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/path.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/path.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/path.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/path.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/protobuf.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/protobuf.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/protobuf.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/protobuf.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/protobuf.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/result.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/result.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/result.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/result.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/result.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/stopwatch.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/stopwatch.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/stopwatch.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/stopwatch.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/stopwatch.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/stringify.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/stringify.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/stringify.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/stringify.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/stringify.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/strings.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/strings.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/strings.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/strings.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/strings.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/try.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/try.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/try.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/try.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/try.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/utils.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/utils.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/utils.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/utils.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/utils.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Copied: incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/uuid.hpp (from r1451092, incubator/mesos/trunk/third_party/libprocess/include/stout/uuid.hpp)
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/uuid.hpp?p2=incubator/mesos/trunk/third_party/libprocess/third_party/stout/include/stout/uuid.hpp&p1=incubator/mesos/trunk/third_party/libprocess/include/stout/uuid.hpp&r1=1451092&r2=1451093&rev=1451093&view=diff
==============================================================================
(empty)
Added: incubator/mesos/trunk/third_party/libprocess/third_party/stout/install-sh
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/third_party/stout/install-sh?rev=1451093&view=auto
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/third_party/stout/install-sh (added)
+++ incubator/mesos/trunk/third_party/libprocess/third_party/stout/install-sh Thu Feb 28 05:04:27 2013
@@ -0,0 +1,520 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2009-04-28.21; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" "" $nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+ --help display this help and exit.
+ --version display version info and exit.
+
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+ case $1 in
+ -c) ;;
+
+ -C) copy_on_change=true;;
+
+ -d) dir_arg=true;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+ shift;;
+
+ --help) echo "$usage"; exit $?;;
+
+ -m) mode=$2
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
+
+ -o) chowncmd="$chownprog $2"
+ shift;;
+
+ -s) stripcmd=$stripprog;;
+
+ -t) dst_arg=$2
+ shift;;
+
+ -T) no_target_directory=true;;
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+ --) shift
+ break;;
+
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
+
+ *) break;;
+ esac
+ shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dst_arg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dst_arg"
+ shift # fnord
+ fi
+ shift # arg
+ dst_arg=$arg
+ done
+fi
+
+if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+ fi
+ # It's OK to call `install-sh -d' without argument.
+ # This can happen when creating conditional directories.
+ exit 0
+fi
+
+if test -z "$dir_arg"; then
+ trap '(exit $?); exit' 1 2 13 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
+
+for src
+do
+ # Protect names starting with `-'.
+ case $src in
+ -*) src=./$src;;
+ esac
+
+ if test -n "$dir_arg"; then
+ dst=$src
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
+ else
+
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+ if test ! -f "$src" && test ! -d "$src"; then
+ echo "$0: $src does not exist." >&2
+ exit 1
+ fi
+
+ if test -z "$dst_arg"; then
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+
+ dst=$dst_arg
+ # Protect names starting with `-'.
+ case $dst in
+ -*) dst=./$dst;;
+ esac
+
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+ if test -d "$dst"; then
+ if test -n "$no_target_directory"; then
+ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
+ fi
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+ dstdir_status=$?
+ fi
+ fi
+
+ obsolete_mkdir_used=false
+
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
+
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
+
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
+
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
+ esac
+
+ eval "$initialize_posix_glob"
+
+ oIFS=$IFS
+ IFS=/
+ $posix_glob set -f
+ set fnord $dstdir
+ shift
+ $posix_glob set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
+ fi
+ fi
+ fi
+
+ if test -n "$dir_arg"; then
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ else
+
+ # Make a couple of temp file names in the proper directory.
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
+
+ # Trap to clean up those temp files at exit.
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+ # Copy the file name to the temp name.
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+ # If any of these fail, we abort the whole thing. If we want to
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
+ #
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
+
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
+
+ trap '' 0
+ fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
Propchange: incubator/mesos/trunk/third_party/libprocess/third_party/stout/install-sh
------------------------------------------------------------------------------
svn:executable = *