mirror of https://gitee.com/bigwinds/arangodb
removed ZeroMQ / ProtoBuf coupling
This commit is contained in:
Frank Celler
parent
edf5bf5dd0
commit
5b07a9dea6
|
|
@ -155,3 +155,5 @@ VC++
|
|||
3rdParty/czmq-1.1.0/src/czmq_selftest
|
||||
3rdParty/czmq-1.1.0/src/libczmq.pc
|
||||
3rdParty/czmq-1.1.0/src/platform.h
|
||||
.protobuf-build-64
|
||||
3rdParty/protobuf-2.4.1/BUILD/
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ AM_CPPFLAGS = \
|
|||
@NCURSES_CPPFLAGS@ \
|
||||
@OPENSSL_CPPFLAGS@ \
|
||||
@READLINE_CPPFLAGS@ \
|
||||
@PROTOBUF_CPPFLAGS@ \
|
||||
@V8_CPPFLAGS@
|
||||
|
||||
if ENABLE_ZEROMQ
|
||||
|
|
@ -85,6 +86,7 @@ AM_LDFLAGS = \
|
|||
@NCURSES_LDFLAGS@ \
|
||||
@OPENSSL_LDFLAGS@ \
|
||||
@READLINE_LDFLAGS@ \
|
||||
@PROTOBUF_LDFLAGS@ \
|
||||
@V8_LDFLAGS@
|
||||
|
||||
if ENABLE_ZEROMQ
|
||||
|
|
@ -102,6 +104,7 @@ LIBS = \
|
|||
@MATH_LIBS@ \
|
||||
@NCURSES_LIBS@ \
|
||||
@OPENSSL_LIBS@ \
|
||||
@PROTOBUF_LIBS@ \
|
||||
@READLINE_LIBS@
|
||||
|
||||
################################################################################
|
||||
|
|
@ -299,9 +302,8 @@ endif
|
|||
### @brief protocol buffers
|
||||
################################################################################
|
||||
|
||||
if ENABLE_PROTOBUF_DEPENDENCY
|
||||
include m4/Makefile.protobuf
|
||||
endif
|
||||
include m4/Makefile.all-in-one-protobuf
|
||||
|
||||
################################################################################
|
||||
## --SECTION-- EXTERNAL LIBRARIES
|
||||
|
|
|
|||
129
Makefile.in
129
Makefile.in
|
|
@ -139,6 +139,15 @@
|
|||
################################################################################
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
### @brief Protobuf
|
||||
################################################################################
|
||||
|
||||
# -*- mode: Makefile; -*-
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
### @brief libev
|
||||
################################################################################
|
||||
|
|
@ -227,6 +236,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
|
|||
$(srcdir)/arangosh/Makefile.files $(srcdir)/lib/Makefile.files \
|
||||
$(srcdir)/m4/Makefile.all-in-one-libev \
|
||||
$(srcdir)/m4/Makefile.all-in-one-mruby \
|
||||
$(srcdir)/m4/Makefile.all-in-one-protobuf \
|
||||
$(srcdir)/m4/Makefile.all-in-one-v8 \
|
||||
$(srcdir)/m4/Makefile.all-in-one-zeromq \
|
||||
$(srcdir)/m4/Makefile.bison $(srcdir)/m4/Makefile.doxygen \
|
||||
|
|
@ -238,8 +248,6 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
|
|||
config/compile config/config.guess config/config.sub \
|
||||
config/depcomp config/install-sh config/missing
|
||||
@ENABLE_ZEROMQ_TRUE@am__append_8 = \
|
||||
@ENABLE_ZEROMQ_TRUE@ lib/ProtocolBuffers/HttpRequestProtobuf.cpp \
|
||||
@ENABLE_ZEROMQ_TRUE@ lib/ProtocolBuffers/arangodb.pb.cpp \
|
||||
@ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ApplicationZeroMQ.cpp \
|
||||
@ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ZeroMQBatchJob.cpp \
|
||||
@ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ZeroMQThread.cpp \
|
||||
|
|
@ -281,15 +289,9 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
|
|||
### @brief CLEANUP
|
||||
################################################################################
|
||||
@ENABLE_BISON_TRUE@am__append_19 = $(BISON_FILES) $(BISONXX_FILES)
|
||||
@ENABLE_PROTOBUF_DEPENDENCY_TRUE@am__append_20 = $(PROTOBUF_FILES)
|
||||
|
||||
################################################################################
|
||||
### @brief cleanup
|
||||
################################################################################
|
||||
@ENABLE_PROTOBUF_DEPENDENCY_TRUE@am__append_21 = $(FLEX_FILES) $(FLEXXX_FILES)
|
||||
@ENABLE_ALL_IN_ONE_TRUE@am__append_22 = @LIBEV_LIBS@ @V8_LIBS@
|
||||
@ENABLE_MRUBY_TRUE@am__append_23 = @MRUBY_LIBS@
|
||||
@ENABLE_ZEROMQ_TRUE@am__append_24 = @ZEROMQ_LIBS@
|
||||
@ENABLE_ALL_IN_ONE_TRUE@am__append_20 = @LIBEV_LIBS@ @V8_LIBS@
|
||||
@ENABLE_MRUBY_TRUE@am__append_21 = @MRUBY_LIBS@
|
||||
@ENABLE_ZEROMQ_TRUE@am__append_22 = @ZEROMQ_LIBS@
|
||||
subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
|
||||
|
|
@ -313,6 +315,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
|
|||
$(top_srcdir)/m4/all-in-one.libev \
|
||||
$(top_srcdir)/m4/external.libev $(top_srcdir)/m4/all-in-one.v8 \
|
||||
$(top_srcdir)/m4/external.v8 $(top_srcdir)/m4/all-in-one.mruby \
|
||||
$(top_srcdir)/m4/all-in-one.protobuf \
|
||||
$(top_srcdir)/m4/all-in-one.zeromq \
|
||||
$(top_srcdir)/m4/all-in-one.boost \
|
||||
$(top_srcdir)/m4/external.boost \
|
||||
|
|
@ -368,7 +371,9 @@ am__lib_libarango_a_SOURCES_DIST = lib/Basics/ConditionLocker.cpp \
|
|||
lib/JsonParserX/JsonScannerX.cpp lib/Logger/Logger.cpp \
|
||||
lib/Logger/LoggerData.cpp lib/Logger/LoggerInfo.cpp \
|
||||
lib/Logger/LoggerStream.cpp lib/Logger/LoggerTiming.cpp \
|
||||
lib/ProgramOptions/program-options.c lib/Rest/AddressPort.cpp \
|
||||
lib/ProgramOptions/program-options.c \
|
||||
lib/ProtocolBuffers/HttpRequestProtobuf.cpp \
|
||||
lib/ProtocolBuffers/arangodb.pb.cpp lib/Rest/AddressPort.cpp \
|
||||
lib/Rest/AnyServer.cpp lib/Rest/HttpRequest.cpp \
|
||||
lib/Rest/HttpRequestPlain.cpp lib/Rest/HttpResponse.cpp \
|
||||
lib/Rest/Initialise.cpp lib/Rest/JsonContainer.cpp \
|
||||
|
|
@ -385,15 +390,12 @@ am__lib_libarango_a_SOURCES_DIST = lib/Basics/ConditionLocker.cpp \
|
|||
lib/Variant/VariantObject.cpp lib/Variant/VariantString.cpp \
|
||||
lib/Variant/VariantUInt16.cpp lib/Variant/VariantUInt32.cpp \
|
||||
lib/Variant/VariantUInt64.cpp lib/Variant/VariantUInt8.cpp \
|
||||
lib/Variant/VariantVector.cpp \
|
||||
lib/ProtocolBuffers/HttpRequestProtobuf.cpp \
|
||||
lib/ProtocolBuffers/arangodb.pb.cpp \
|
||||
lib/ZeroMQ/ApplicationZeroMQ.cpp lib/ZeroMQ/ZeroMQBatchJob.cpp \
|
||||
lib/ZeroMQ/ZeroMQThread.cpp lib/ZeroMQ/ZeroMQQueueThread.cpp \
|
||||
lib/Variant/VariantVector.cpp lib/ZeroMQ/ApplicationZeroMQ.cpp \
|
||||
lib/ZeroMQ/ZeroMQBatchJob.cpp lib/ZeroMQ/ZeroMQThread.cpp \
|
||||
lib/ZeroMQ/ZeroMQQueueThread.cpp \
|
||||
lib/ZeroMQ/ZeroMQWorkerThread.cpp
|
||||
am__dirstamp = $(am__leading_dot)dirstamp
|
||||
@ENABLE_ZEROMQ_TRUE@am__objects_1 = lib/ProtocolBuffers/HttpRequestProtobuf.$(OBJEXT) \
|
||||
@ENABLE_ZEROMQ_TRUE@ lib/ProtocolBuffers/arangodb.pb.$(OBJEXT) \
|
||||
@ENABLE_ZEROMQ_TRUE@am__objects_1 = \
|
||||
@ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ApplicationZeroMQ.$(OBJEXT) \
|
||||
@ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ZeroMQBatchJob.$(OBJEXT) \
|
||||
@ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ZeroMQThread.$(OBJEXT) \
|
||||
|
|
@ -443,6 +445,8 @@ am_lib_libarango_a_OBJECTS = lib/Basics/ConditionLocker.$(OBJEXT) \
|
|||
lib/Logger/LoggerStream.$(OBJEXT) \
|
||||
lib/Logger/LoggerTiming.$(OBJEXT) \
|
||||
lib/ProgramOptions/program-options.$(OBJEXT) \
|
||||
lib/ProtocolBuffers/HttpRequestProtobuf.$(OBJEXT) \
|
||||
lib/ProtocolBuffers/arangodb.pb.$(OBJEXT) \
|
||||
lib/Rest/AddressPort.$(OBJEXT) lib/Rest/AnyServer.$(OBJEXT) \
|
||||
lib/Rest/HttpRequest.$(OBJEXT) \
|
||||
lib/Rest/HttpRequestPlain.$(OBJEXT) \
|
||||
|
|
@ -893,7 +897,7 @@ LIBOBJS = @LIBOBJS@
|
|||
### @brief libraries
|
||||
################################################################################
|
||||
LIBS = @BOOST_LIBS@ @LIBEV_LIBS@ @MATH_LIBS@ @NCURSES_LIBS@ \
|
||||
@OPENSSL_LIBS@ @READLINE_LIBS@ $(am__append_4)
|
||||
@OPENSSL_LIBS@ @PROTOBUF_LIBS@ @READLINE_LIBS@ $(am__append_4)
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
|
|
@ -920,6 +924,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|||
PACKAGE_URL = @PACKAGE_URL@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PROTOBUF_CPPFLAGS = @PROTOBUF_CPPFLAGS@
|
||||
PROTOBUF_LDFLAGS = @PROTOBUF_LDFLAGS@
|
||||
PROTOBUF_LIBS = @PROTOBUF_LIBS@
|
||||
PTHREAD_CC = @PTHREAD_CC@
|
||||
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
||||
PTHREAD_LIBS = @PTHREAD_LIBS@
|
||||
|
|
@ -1003,8 +1010,9 @@ ACLOCAL_AMFLAGS = -I m4
|
|||
BUILT_SOURCES = build.h $(JAVASCRIPT_HEADER) $(JAVASCRIPT_BROWSER) \
|
||||
$(MRUBY_HEADER) $(am__append_13) $(am__append_14) \
|
||||
Doxygen/.setup-directories .setup-js-directories \
|
||||
$(am__append_16) $(am__append_18) $(am__append_20) \
|
||||
$(am__append_22) $(am__append_23) $(am__append_24)
|
||||
$(am__append_16) $(am__append_18) $(PROTOBUF_FILES) \
|
||||
@PROTOBUF_LIBS@ $(am__append_20) $(am__append_21) \
|
||||
$(am__append_22)
|
||||
|
||||
################################################################################
|
||||
### @brief files to cleanup
|
||||
|
|
@ -1014,6 +1022,10 @@ BUILT_SOURCES = build.h $(JAVASCRIPT_HEADER) $(JAVASCRIPT_BROWSER) \
|
|||
### @brief cleanup
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
### @brief cleanup
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
### @brief cleanup
|
||||
################################################################################
|
||||
|
|
@ -1021,7 +1033,7 @@ CLEANUP = $(am__append_15) $(DOXYGEN) $(addsuffix .md,$(addprefix \
|
|||
Doxygen/xml/,$(WIKI))) $(addsuffix .md,$(addprefix \
|
||||
Doxygen/wiki/,$(WIKI))) $(JAVASCRIPT_HEADER) \
|
||||
.setup-js-directories $(am__append_17) $(am__append_19) \
|
||||
$(am__append_21)
|
||||
$(PROTOBUF_FILES)
|
||||
|
||||
################################################################################
|
||||
### @brief flex files
|
||||
|
|
@ -1087,15 +1099,15 @@ AM_CPPFLAGS = -D_SYSCONFDIR_='"${sysconfdir}"' \
|
|||
-D_DATABASEDIR_='"${localstatedir}/${PACKAGE_TARNAME}"' \
|
||||
-I@top_srcdir@/lib @BOOST_CPPFLAGS@ @LIBEV_CPPFLAGS@ \
|
||||
@MATH_CPPFLAGS@ @NCURSES_CPPFLAGS@ @OPENSSL_CPPFLAGS@ \
|
||||
@READLINE_CPPFLAGS@ @V8_CPPFLAGS@ $(am__append_1) \
|
||||
$(am__append_3)
|
||||
@READLINE_CPPFLAGS@ @PROTOBUF_CPPFLAGS@ @V8_CPPFLAGS@ \
|
||||
$(am__append_1) $(am__append_3)
|
||||
|
||||
################################################################################
|
||||
### @brief linker flags
|
||||
################################################################################
|
||||
AM_LDFLAGS = @BOOST_LDFLAGS@ @LIBEV_LDFLAGS@ @MATH_LDFLAGS@ \
|
||||
@NCURSES_LDFLAGS@ @OPENSSL_LDFLAGS@ @READLINE_LDFLAGS@ \
|
||||
@V8_LDFLAGS@ $(am__append_2)
|
||||
@PROTOBUF_LDFLAGS@ @V8_LDFLAGS@ $(am__append_2)
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
|
@ -1264,7 +1276,9 @@ lib_libarango_a_SOURCES = lib/Basics/ConditionLocker.cpp \
|
|||
lib/JsonParserX/JsonScannerX.cpp lib/Logger/Logger.cpp \
|
||||
lib/Logger/LoggerData.cpp lib/Logger/LoggerInfo.cpp \
|
||||
lib/Logger/LoggerStream.cpp lib/Logger/LoggerTiming.cpp \
|
||||
lib/ProgramOptions/program-options.c lib/Rest/AddressPort.cpp \
|
||||
lib/ProgramOptions/program-options.c \
|
||||
lib/ProtocolBuffers/HttpRequestProtobuf.cpp \
|
||||
lib/ProtocolBuffers/arangodb.pb.cpp lib/Rest/AddressPort.cpp \
|
||||
lib/Rest/AnyServer.cpp lib/Rest/HttpRequest.cpp \
|
||||
lib/Rest/HttpRequestPlain.cpp lib/Rest/HttpResponse.cpp \
|
||||
lib/Rest/Initialise.cpp lib/Rest/JsonContainer.cpp \
|
||||
|
|
@ -1589,6 +1603,7 @@ UNITTESTS_SERVER_AHUACATL = $(addprefix --unit-tests ,$(SHELL_SERVER_AHUACATL))
|
|||
################################################################################
|
||||
SHELL_CLIENT = $(SHELL_COMMON) js/client/tests/client.js
|
||||
UNITTESTS_CLIENT = $(addprefix --unit-tests ,$(SHELL_CLIENT))
|
||||
PROTOBUFDIR = @abs_top_srcdir@/3rdParty/protobuf-2.4.1/BUILD
|
||||
@ENABLE_32BIT_TRUE@@ENABLE_ALL_IN_ONE_TRUE@LIBEV_BUILD_VERSION = ARCH.ia32
|
||||
@ENABLE_64BIT_TRUE@@ENABLE_ALL_IN_ONE_TRUE@LIBEV_BUILD_VERSION = ARCH.x64
|
||||
@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_FORCE_32BIT_FALSE@LIBEV_BUILD_CFLAGS_X = -O2 -g
|
||||
|
|
@ -1603,7 +1618,7 @@ all: $(BUILT_SOURCES)
|
|||
.SUFFIXES: .c .cpp .o .obj
|
||||
am--refresh:
|
||||
@:
|
||||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makefile.files $(srcdir)/lib/Makefile.files $(srcdir)/arangod/Makefile.files $(srcdir)/arangosh/Makefile.files $(srcdir)/arangoirb/Makefile.files $(srcdir)/PerfTests/Makefile.files $(srcdir)/Makefile.unittests $(srcdir)/m4/Makefile.mruby $(srcdir)/m4/Makefile.doxygen $(srcdir)/m4/Makefile.javascript $(srcdir)/m4/Makefile.flex $(srcdir)/m4/Makefile.bison $(srcdir)/m4/Makefile.protobuf $(srcdir)/m4/Makefile.all-in-one-libev $(srcdir)/m4/Makefile.all-in-one-v8 $(srcdir)/m4/Makefile.all-in-one-mruby $(srcdir)/m4/Makefile.all-in-one-zeromq $(am__configure_deps)
|
||||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makefile.files $(srcdir)/lib/Makefile.files $(srcdir)/arangod/Makefile.files $(srcdir)/arangosh/Makefile.files $(srcdir)/arangoirb/Makefile.files $(srcdir)/PerfTests/Makefile.files $(srcdir)/Makefile.unittests $(srcdir)/m4/Makefile.mruby $(srcdir)/m4/Makefile.doxygen $(srcdir)/m4/Makefile.javascript $(srcdir)/m4/Makefile.flex $(srcdir)/m4/Makefile.bison $(srcdir)/m4/Makefile.protobuf $(srcdir)/m4/Makefile.all-in-one-protobuf $(srcdir)/m4/Makefile.all-in-one-libev $(srcdir)/m4/Makefile.all-in-one-v8 $(srcdir)/m4/Makefile.all-in-one-mruby $(srcdir)/m4/Makefile.all-in-one-zeromq $(am__configure_deps)
|
||||
@for dep in $?; do \
|
||||
case '$(am__configure_deps)' in \
|
||||
*$$dep*) \
|
||||
|
|
@ -1822,6 +1837,18 @@ lib/ProgramOptions/$(DEPDIR)/$(am__dirstamp):
|
|||
lib/ProgramOptions/program-options.$(OBJEXT): \
|
||||
lib/ProgramOptions/$(am__dirstamp) \
|
||||
lib/ProgramOptions/$(DEPDIR)/$(am__dirstamp)
|
||||
lib/ProtocolBuffers/$(am__dirstamp):
|
||||
@$(MKDIR_P) lib/ProtocolBuffers
|
||||
@: > lib/ProtocolBuffers/$(am__dirstamp)
|
||||
lib/ProtocolBuffers/$(DEPDIR)/$(am__dirstamp):
|
||||
@$(MKDIR_P) lib/ProtocolBuffers/$(DEPDIR)
|
||||
@: > lib/ProtocolBuffers/$(DEPDIR)/$(am__dirstamp)
|
||||
lib/ProtocolBuffers/HttpRequestProtobuf.$(OBJEXT): \
|
||||
lib/ProtocolBuffers/$(am__dirstamp) \
|
||||
lib/ProtocolBuffers/$(DEPDIR)/$(am__dirstamp)
|
||||
lib/ProtocolBuffers/arangodb.pb.$(OBJEXT): \
|
||||
lib/ProtocolBuffers/$(am__dirstamp) \
|
||||
lib/ProtocolBuffers/$(DEPDIR)/$(am__dirstamp)
|
||||
lib/Rest/$(am__dirstamp):
|
||||
@$(MKDIR_P) lib/Rest
|
||||
@: > lib/Rest/$(am__dirstamp)
|
||||
|
|
@ -1915,18 +1942,6 @@ lib/Variant/VariantUInt8.$(OBJEXT): lib/Variant/$(am__dirstamp) \
|
|||
lib/Variant/$(DEPDIR)/$(am__dirstamp)
|
||||
lib/Variant/VariantVector.$(OBJEXT): lib/Variant/$(am__dirstamp) \
|
||||
lib/Variant/$(DEPDIR)/$(am__dirstamp)
|
||||
lib/ProtocolBuffers/$(am__dirstamp):
|
||||
@$(MKDIR_P) lib/ProtocolBuffers
|
||||
@: > lib/ProtocolBuffers/$(am__dirstamp)
|
||||
lib/ProtocolBuffers/$(DEPDIR)/$(am__dirstamp):
|
||||
@$(MKDIR_P) lib/ProtocolBuffers/$(DEPDIR)
|
||||
@: > lib/ProtocolBuffers/$(DEPDIR)/$(am__dirstamp)
|
||||
lib/ProtocolBuffers/HttpRequestProtobuf.$(OBJEXT): \
|
||||
lib/ProtocolBuffers/$(am__dirstamp) \
|
||||
lib/ProtocolBuffers/$(DEPDIR)/$(am__dirstamp)
|
||||
lib/ProtocolBuffers/arangodb.pb.$(OBJEXT): \
|
||||
lib/ProtocolBuffers/$(am__dirstamp) \
|
||||
lib/ProtocolBuffers/$(DEPDIR)/$(am__dirstamp)
|
||||
lib/ZeroMQ/$(am__dirstamp):
|
||||
@$(MKDIR_P) lib/ZeroMQ
|
||||
@: > lib/ZeroMQ/$(am__dirstamp)
|
||||
|
|
@ -5391,9 +5406,37 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
### @brief protocol buffers
|
||||
################################################################################
|
||||
|
||||
@ENABLE_PROTOBUF_DEPENDENCY_TRUE@%.pb.cpp: %.proto
|
||||
@ENABLE_PROTOBUF_DEPENDENCY_TRUE@ @top_srcdir@/3rdParty/protobuf-2.4.1/src/protoc --cpp_out . $<
|
||||
@ENABLE_PROTOBUF_DEPENDENCY_TRUE@ mv $(addsuffix .cc,$(basename $@)) $@
|
||||
%.pb.cpp: %.proto
|
||||
@top_srcdir@/3rdParty/protobuf-2.4.1/src/protoc --cpp_out . $<
|
||||
mv $(addsuffix .cc,$(basename $@)) $@
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
@PROTOBUF_LIBS@: .protobuf-build-@TRI_BITS@
|
||||
|
||||
.protobuf-build-@TRI_BITS@:
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILDING Protocol Buffers"
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo
|
||||
|
||||
cd @top_srcdir@/3rdParty/protobuf-2.4.1 \
|
||||
&& ./configure \
|
||||
--disable-dependency-tracking \
|
||||
--disable-shared \
|
||||
--prefix=$(PROTOBUFDIR) \
|
||||
--libdir=$(PROTOBUFDIR)/lib@TRI_BITS@
|
||||
cd @top_srcdir@/3rdParty/protobuf-2.4.1 && $(MAKE) install
|
||||
|
||||
touch .protobuf-build-@TRI_BITS@
|
||||
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILD Protocol Buffers FINISHED"
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
|
|
|||
|
|
@ -614,6 +614,9 @@ ZEROMQ_LDFLAGS
|
|||
ZEROMQ_CPPFLAGS
|
||||
ENABLE_ZEROMQ_FALSE
|
||||
ENABLE_ZEROMQ_TRUE
|
||||
PROTOBUF_LIBS
|
||||
PROTOBUF_LDFLAGS
|
||||
PROTOBUF_CPPFLAGS
|
||||
MRUBY_LIBS
|
||||
MRUBY_LDFLAGS
|
||||
MRUBY_CPPFLAGS
|
||||
|
|
@ -757,8 +760,6 @@ ENABLE_3RD_PARTY_BOOST_FALSE
|
|||
ENABLE_3RD_PARTY_BOOST_TRUE
|
||||
ENABLE_ALL_IN_ONE_FALSE
|
||||
ENABLE_ALL_IN_ONE_TRUE
|
||||
ENABLE_PROTOBUF_DEPENDENCY_FALSE
|
||||
ENABLE_PROTOBUF_DEPENDENCY_TRUE
|
||||
ENABLE_ERRORS_DEPENDENCY_FALSE
|
||||
ENABLE_ERRORS_DEPENDENCY_TRUE
|
||||
ENABLE_FLEX_FALSE
|
||||
|
|
@ -809,7 +810,6 @@ enable_option_checking
|
|||
enable_bison
|
||||
enable_flex
|
||||
enable_errors_dependency
|
||||
enable_protobuf_dependency
|
||||
enable_all_in_one
|
||||
enable_3rd_party_boost
|
||||
with_boost_test
|
||||
|
|
@ -1490,8 +1490,6 @@ Optional Features:
|
|||
--enable-flex enable FLEX
|
||||
--enable-errors-dependency
|
||||
generate dependencies for error files
|
||||
--enable-protobuf-dependency
|
||||
generate dependencies for protocol buffers
|
||||
--enable-all-in-one use supplied V8 and LIBEV from 3rdParty directory
|
||||
--enable-3rd-party-boost
|
||||
use supplied BOOST from 3rdParty directory
|
||||
|
|
@ -2539,25 +2537,6 @@ fi
|
|||
|
||||
|
||||
|
||||
# Check whether --enable-protobuf-dependency was given.
|
||||
if test "${enable_protobuf_dependency+set}" = set; then :
|
||||
enableval=$enable_protobuf_dependency; tr_PROTOBUF_DEPENDENCY="${enableval:-yes}"
|
||||
else
|
||||
tr_PROTOBUF_DEPENDENCY=no
|
||||
|
||||
fi
|
||||
|
||||
|
||||
if test "x$tr_PROTOBUF_DEPENDENCY" = xyes; then
|
||||
ENABLE_PROTOBUF_DEPENDENCY_TRUE=
|
||||
ENABLE_PROTOBUF_DEPENDENCY_FALSE='#'
|
||||
else
|
||||
ENABLE_PROTOBUF_DEPENDENCY_TRUE='#'
|
||||
ENABLE_PROTOBUF_DEPENDENCY_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-all-in-one was given.
|
||||
if test "${enable_all_in_one+set}" = set; then :
|
||||
|
|
@ -9135,6 +9114,34 @@ fi
|
|||
|
||||
|
||||
|
||||
PROTOBUF_CPPFLAGS="-I${srcdir}/3rdParty/protobuf-2.4.1/src"
|
||||
PROTOBUF_LDFLAGS=""
|
||||
PROTOBUF_LIBS="${srcdir}/3rdParty/protobuf-2.4.1/src/.libs/libprotobuf.a"
|
||||
|
||||
TRI_PROTOBUF_VERSION="2.4.1"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
PROTOBUF_CPPFLAGS="${PROTOBUF_CPPFLAGS} -DTRI_PROTOBUF_VERSION='\"${TRI_PROTOBUF_VERSION}\"'"
|
||||
|
||||
|
||||
BASIC_INFO="$BASIC_INFO|PROTOBUF: enabled"
|
||||
|
||||
LIB_INFO="$LIB_INFO|PROTOBUF VERSION: ${TRI_PROTOBUF_VERSION}"
|
||||
|
||||
FLAG_INFO="$FLAG_INFO|PROTOBUF_CPPFLAGS: ${PROTOBUF_CPPFLAGS}"
|
||||
FLAG_INFO="$FLAG_INFO|PROTOBUF_LDFLAGS: ${PROTOBUF_LDFLAGS}"
|
||||
FLAG_INFO="$FLAG_INFO|PROTOBUF_LIBS: ${PROTOBUF_LIBS}"
|
||||
FLAG_INFO="$FLAG_INFO|."
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-zeromq was given.
|
||||
if test "${enable_zeromq+set}" = set; then :
|
||||
enableval=$enable_zeromq; tr_ZEROMQ="${enableval:-yes}"
|
||||
|
|
@ -9690,10 +9697,6 @@ if test -z "${ENABLE_ERRORS_DEPENDENCY_TRUE}" && test -z "${ENABLE_ERRORS_DEPEND
|
|||
as_fn_error $? "conditional \"ENABLE_ERRORS_DEPENDENCY\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${ENABLE_PROTOBUF_DEPENDENCY_TRUE}" && test -z "${ENABLE_PROTOBUF_DEPENDENCY_FALSE}"; then
|
||||
as_fn_error $? "conditional \"ENABLE_PROTOBUF_DEPENDENCY\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${ENABLE_ALL_IN_ONE_TRUE}" && test -z "${ENABLE_ALL_IN_ONE_FALSE}"; then
|
||||
as_fn_error $? "conditional \"ENABLE_ALL_IN_ONE\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
|
|
|
|||
18
configure.ac
18
configure.ac
|
|
@ -55,18 +55,6 @@ AC_ARG_ENABLE(errors-dependency,
|
|||
|
||||
AM_CONDITIONAL(ENABLE_ERRORS_DEPENDENCY, test "x$tr_ERRORS_DEPENDENCY" = xyes)
|
||||
|
||||
dnl ----------------------------------------------------------------------------
|
||||
dnl PROTCOL BUFFERS
|
||||
dnl ----------------------------------------------------------------------------
|
||||
|
||||
AC_ARG_ENABLE(protobuf-dependency,
|
||||
AS_HELP_STRING([--enable-protobuf-dependency], [generate dependencies for protocol buffers]),
|
||||
[tr_PROTOBUF_DEPENDENCY="${enableval:-yes}"],
|
||||
[tr_PROTOBUF_DEPENDENCY=no]
|
||||
)
|
||||
|
||||
AM_CONDITIONAL(ENABLE_PROTOBUF_DEPENDENCY, test "x$tr_PROTOBUF_DEPENDENCY" = xyes)
|
||||
|
||||
dnl ============================================================================
|
||||
dnl --SECTION-- LIBRARIES
|
||||
dnl ============================================================================
|
||||
|
|
@ -238,6 +226,12 @@ dnl ----------------------------------------------------------------------------
|
|||
|
||||
m4_include([m4/all-in-one.mruby])
|
||||
|
||||
dnl ----------------------------------------------------------------------------
|
||||
dnl PROTOBUF
|
||||
dnl ----------------------------------------------------------------------------
|
||||
|
||||
m4_include([m4/all-in-one.protobuf])
|
||||
|
||||
dnl ----------------------------------------------------------------------------
|
||||
dnl ZEROMQ
|
||||
dnl ----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -287,9 +287,6 @@ namespace triagens {
|
|||
#ifdef TRI_ENABLE_ZEROMQ
|
||||
void* _zeroMQContext;
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,6 +65,8 @@ lib_libarango_a_SOURCES = \
|
|||
lib/Logger/LoggerStream.cpp \
|
||||
lib/Logger/LoggerTiming.cpp \
|
||||
lib/ProgramOptions/program-options.c \
|
||||
lib/ProtocolBuffers/HttpRequestProtobuf.cpp \
|
||||
lib/ProtocolBuffers/arangodb.pb.cpp \
|
||||
lib/Rest/AddressPort.cpp \
|
||||
lib/Rest/AnyServer.cpp \
|
||||
lib/Rest/HttpRequest.cpp \
|
||||
|
|
@ -103,8 +105,6 @@ lib_libarango_a_SOURCES = \
|
|||
if ENABLE_ZEROMQ
|
||||
|
||||
lib_libarango_a_SOURCES += \
|
||||
lib/ProtocolBuffers/HttpRequestProtobuf.cpp \
|
||||
lib/ProtocolBuffers/arangodb.pb.cpp \
|
||||
lib/ZeroMQ/ApplicationZeroMQ.cpp \
|
||||
lib/ZeroMQ/ZeroMQBatchJob.cpp \
|
||||
lib/ZeroMQ/ZeroMQThread.cpp \
|
||||
|
|
|
|||
|
|
@ -29,10 +29,7 @@
|
|||
#include "HttpResponse.h"
|
||||
|
||||
#include "Basics/StringUtils.h"
|
||||
|
||||
#ifdef TRI_ENABLE_ZEROMQ
|
||||
#include "ProtocolBuffers/arangodb.pb.h"
|
||||
#endif
|
||||
|
||||
using namespace triagens::basics;
|
||||
using namespace triagens::rest;
|
||||
|
|
@ -540,8 +537,6 @@ void HttpResponse::writeHeader (StringBuffer* output) {
|
|||
/// @brief writes the message to a protocol buffer
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef TRI_ENABLE_ZEROMQ
|
||||
|
||||
void HttpResponse::write (PB_ArangoBatchMessage* message) {
|
||||
message->set_type(PB_BLOB_RESPONSE);
|
||||
PB_ArangoBlobResponse* blob = message->mutable_blobresponse();
|
||||
|
|
@ -611,8 +606,6 @@ void HttpResponse::write (PB_ArangoBatchMessage* message) {
|
|||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @brief returns the size of the body
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -287,9 +287,7 @@ namespace triagens {
|
|||
/// You should call write only after the body has been created.
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef TRI_ENABLE_ZEROMQ
|
||||
void write (PB_ArangoBatchMessage*);
|
||||
#endif
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @brief returns the size of the body
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
# -*- mode: Makefile; -*-
|
||||
|
||||
################################################################################
|
||||
## --SECTION-- LIBRARY
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
### @brief Protobuf
|
||||
################################################################################
|
||||
|
||||
BUILT_SOURCES += @PROTOBUF_LIBS@
|
||||
PROTOBUFDIR = @abs_top_srcdir@/3rdParty/protobuf-2.4.1/BUILD
|
||||
|
||||
@PROTOBUF_LIBS@: .protobuf-build-@TRI_BITS@
|
||||
|
||||
.protobuf-build-@TRI_BITS@:
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILDING Protocol Buffers"
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo
|
||||
|
||||
cd @top_srcdir@/3rdParty/protobuf-2.4.1 \
|
||||
&& ./configure \
|
||||
--disable-dependency-tracking \
|
||||
--disable-shared \
|
||||
--prefix=$(PROTOBUFDIR) \
|
||||
--libdir=$(PROTOBUFDIR)/lib@TRI_BITS@
|
||||
cd @top_srcdir@/3rdParty/protobuf-2.4.1 && $(MAKE) install
|
||||
|
||||
touch .protobuf-build-@TRI_BITS@
|
||||
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILD Protocol Buffers FINISHED"
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo
|
||||
|
||||
################################################################################
|
||||
## --SECTION-- END-OF-FILE
|
||||
################################################################################
|
||||
|
||||
## Local Variables:
|
||||
## mode: outline-minor
|
||||
## outline-regexp: "^\\(### @brief\\|## --SECTION--\\|# -\\*- \\)"
|
||||
## End:
|
||||
|
|
@ -22,7 +22,7 @@ BUILT_SOURCES += $(PROTOBUF_FILES)
|
|||
### @brief cleanup
|
||||
################################################################################
|
||||
|
||||
CLEANUP += $(FLEX_FILES) $(FLEXXX_FILES)
|
||||
CLEANUP += $(PROTOBUF_FILES)
|
||||
|
||||
################################################################################
|
||||
## --SECTION-- END-OF-FILE
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
dnl -*- mode: Autoconf; -*-
|
||||
|
||||
dnl -----------------------------------------------------------------------------------------
|
||||
dnl option for PROTOBUF support
|
||||
dnl -----------------------------------------------------------------------------------------
|
||||
|
||||
PROTOBUF_CPPFLAGS="-I${srcdir}/3rdParty/protobuf-2.4.1/src"
|
||||
PROTOBUF_LDFLAGS=""
|
||||
PROTOBUF_LIBS="${srcdir}/3rdParty/protobuf-2.4.1/src/.libs/libprotobuf.a"
|
||||
|
||||
TRI_PROTOBUF_VERSION="2.4.1"
|
||||
|
||||
dnl -----------------------------------------------------------------------------------------
|
||||
dnl add substitutions
|
||||
dnl -----------------------------------------------------------------------------------------
|
||||
|
||||
AC_SUBST(PROTOBUF_CPPFLAGS)
|
||||
AC_SUBST(PROTOBUF_LDFLAGS)
|
||||
AC_SUBST(PROTOBUF_LIBS)
|
||||
|
||||
PROTOBUF_CPPFLAGS="${PROTOBUF_CPPFLAGS} -DTRI_PROTOBUF_VERSION='\"${TRI_PROTOBUF_VERSION}\"'"
|
||||
|
||||
dnl -----------------------------------------------------------------------------------------
|
||||
dnl informational output
|
||||
dnl -----------------------------------------------------------------------------------------
|
||||
|
||||
BASIC_INFO="$BASIC_INFO|PROTOBUF: enabled"
|
||||
|
||||
LIB_INFO="$LIB_INFO|PROTOBUF VERSION: ${TRI_PROTOBUF_VERSION}"
|
||||
|
||||
FLAG_INFO="$FLAG_INFO|PROTOBUF_CPPFLAGS: ${PROTOBUF_CPPFLAGS}"
|
||||
FLAG_INFO="$FLAG_INFO|PROTOBUF_LDFLAGS: ${PROTOBUF_LDFLAGS}"
|
||||
FLAG_INFO="$FLAG_INFO|PROTOBUF_LIBS: ${PROTOBUF_LIBS}"
|
||||
FLAG_INFO="$FLAG_INFO|."
|
||||
|
||||
dnl Local Variables:
|
||||
dnl mode: outline-minor
|
||||
dnl outline-regexp: "^\\(dnl --SECTION--\\)"
|
||||
dnl End:
|
||||
Loading…
Reference in New Issue