mirror of https://gitee.com/bigwinds/arangodb
cleanup directory structure and init file handling
moved common functions to ArangoClient
This commit is contained in:
Frank Celler
parent
4cf0323e6e
commit
39f4a8f833
|
|
@ -3,7 +3,7 @@
|
||||||
3rdParty/czmq-1.1.0/src/czmq_selftest
|
3rdParty/czmq-1.1.0/src/czmq_selftest
|
||||||
3rdParty/czmq-1.1.0/src/libczmq.pc
|
3rdParty/czmq-1.1.0/src/libczmq.pc
|
||||||
3rdParty/czmq-1.1.0/src/platform.h
|
3rdParty/czmq-1.1.0/src/platform.h
|
||||||
3rdParty/libev/ARCH.x64
|
3rdParty/libev/BUILD
|
||||||
3rdParty/libev/libtool
|
3rdParty/libev/libtool
|
||||||
3rdParty/mruby/bin/mrbc
|
3rdParty/mruby/bin/mrbc
|
||||||
3rdParty/mruby/bin/mruby
|
3rdParty/mruby/bin/mruby
|
||||||
|
|
@ -88,18 +88,19 @@ config.status
|
||||||
configure
|
configure
|
||||||
config/version.sh
|
config/version.sh
|
||||||
COVERAGE
|
COVERAGE
|
||||||
.czmq-build-64
|
.czmq-build-*
|
||||||
.deps
|
.deps
|
||||||
.dirstamp
|
.dirstamp
|
||||||
Doxygen/arango.doxy
|
Documentation/arango.template
|
||||||
Doxygen/html/
|
Documentation/arango.doxy
|
||||||
Doxygen/js
|
Documentation/html/
|
||||||
Doxygen/latex/
|
Documentation/js
|
||||||
Doxygen/manuals
|
Documentation/latex/
|
||||||
Doxygen/.setup-directories
|
Documentation/manuals
|
||||||
Doxygen/web/*.html
|
Documentation/.setup-directories
|
||||||
Doxygen/wiki/
|
Documentation/web/*.html
|
||||||
Doxygen/xml/
|
Documentation/wiki/
|
||||||
|
Documentation/xml/
|
||||||
.DS_Store
|
.DS_Store
|
||||||
*.gcda
|
*.gcda
|
||||||
*.gcno
|
*.gcno
|
||||||
|
|
@ -140,7 +141,7 @@ Makefile.local
|
||||||
*.old
|
*.old
|
||||||
out
|
out
|
||||||
*.Po
|
*.Po
|
||||||
.protobuf-build-64
|
.protobuf-build-*
|
||||||
*.pyc
|
*.pyc
|
||||||
.setup-js-directories
|
.setup-js-directories
|
||||||
.setup-mr-directories
|
.setup-mr-directories
|
||||||
|
|
@ -162,4 +163,4 @@ UnitTests/Philadelphia/Makefile.py
|
||||||
UnitTests/Philadelphia/Runner.cpp
|
UnitTests/Philadelphia/Runner.cpp
|
||||||
.v8-build-*
|
.v8-build-*
|
||||||
VC++
|
VC++
|
||||||
.zeromq-build-64
|
.zeromq-build-*
|
||||||
|
|
|
||||||
|
|
@ -1,29 +1,13 @@
|
||||||
# -*- mode: Makefile; -*-
|
# -*- mode: Makefile; -*-
|
||||||
|
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
## --SECTION-- LIBRARY
|
## --SECTION-- LIBRARY
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
### @brief libev
|
### @brief libev
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
if ENABLE_64BIT
|
|
||||||
LIBEV_BUILD_VERSION=ARCH.x64
|
|
||||||
endif
|
|
||||||
|
|
||||||
if ENABLE_32BIT
|
|
||||||
LIBEV_BUILD_VERSION=ARCH.ia32
|
|
||||||
endif
|
|
||||||
|
|
||||||
if ENABLE_FORCE_32BIT
|
|
||||||
LIBEV_BUILD_CFLAGS_X=-m32 -O2 -g
|
|
||||||
LIBEV_BUILD_LDFLAGS_X=-m32
|
|
||||||
else
|
|
||||||
LIBEV_BUILD_CFLAGS_X=-O2 -g
|
|
||||||
LIBEV_BUILD_LDFLAGS_X=
|
|
||||||
endif
|
|
||||||
|
|
||||||
BUILT_SOURCES += @LIBEV_LIBS@
|
BUILT_SOURCES += @LIBEV_LIBS@
|
||||||
|
|
||||||
@LIBEV_LIBS@: .libev-build-@TRI_BITS@
|
@LIBEV_LIBS@: .libev-build-@TRI_BITS@
|
||||||
|
|
@ -35,9 +19,9 @@ BUILT_SOURCES += @LIBEV_LIBS@
|
||||||
@echo "--------------------------------------------------------------------------------"
|
@echo "--------------------------------------------------------------------------------"
|
||||||
@echo
|
@echo
|
||||||
|
|
||||||
mkdir @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) || true
|
mkdir @top_srcdir@/3rdParty/libev/BUILD || true
|
||||||
cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && CFLAGS="$(LIBEV_BUILD_CFLAGS_X)" orig_CFLAGS="$(LIBEV_BUILD_CFLAGS_X)" LDFLAGS="$(LIBEV_BUILD_LDFLAGS_X)" ../configure --disable-shared
|
cd @top_srcdir@/3rdParty/libev/BUILD && ../configure --disable-shared
|
||||||
cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && $(MAKE)
|
cd @top_srcdir@/3rdParty/libev/BUILD && $(MAKE)
|
||||||
|
|
||||||
touch .libev-build-@TRI_BITS@
|
touch .libev-build-@TRI_BITS@
|
||||||
|
|
||||||
|
|
@ -47,9 +31,9 @@ BUILT_SOURCES += @LIBEV_LIBS@
|
||||||
@echo "--------------------------------------------------------------------------------"
|
@echo "--------------------------------------------------------------------------------"
|
||||||
@echo
|
@echo
|
||||||
|
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
## --SECTION-- END-OF-FILE
|
## --SECTION-- END-OF-FILE
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
|
|
||||||
## Local Variables:
|
## Local Variables:
|
||||||
## mode: outline-minor
|
## mode: outline-minor
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# -*- mode: Makefile; -*-
|
# -*- mode: Makefile; -*-
|
||||||
|
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
## --SECTION-- LIBRARY
|
## --SECTION-- LIBRARY
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
### @brief mruby
|
### @brief mruby
|
||||||
|
|
@ -29,9 +29,9 @@ BUILT_SOURCES += @MRUBY_LIBS@
|
||||||
@echo "--------------------------------------------------------------------------------"
|
@echo "--------------------------------------------------------------------------------"
|
||||||
@echo
|
@echo
|
||||||
|
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
## --SECTION-- END-OF-FILE
|
## --SECTION-- END-OF-FILE
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
|
|
||||||
## Local Variables:
|
## Local Variables:
|
||||||
## mode: outline-minor
|
## mode: outline-minor
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# -*- mode: Makefile; -*-
|
# -*- mode: Makefile; -*-
|
||||||
|
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
## --SECTION-- LIBRARY
|
## --SECTION-- LIBRARY
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
### @brief Protobuf
|
### @brief Protobuf
|
||||||
|
|
@ -36,9 +36,9 @@ PROTOBUFDIR = @abs_top_srcdir@/3rdParty/protobuf-2.4.1/BUILD
|
||||||
@echo "--------------------------------------------------------------------------------"
|
@echo "--------------------------------------------------------------------------------"
|
||||||
@echo
|
@echo
|
||||||
|
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
## --SECTION-- END-OF-FILE
|
## --SECTION-- END-OF-FILE
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
|
|
||||||
## Local Variables:
|
## Local Variables:
|
||||||
## mode: outline-minor
|
## mode: outline-minor
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# -*- mode: Makefile; -*-
|
# -*- mode: Makefile; -*-
|
||||||
|
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
## --SECTION-- LIBRARY
|
## --SECTION-- LIBRARY
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
### @brief V8
|
### @brief V8
|
||||||
|
|
@ -29,9 +29,9 @@ BUILT_SOURCES += @V8_LIBS@
|
||||||
@echo "--------------------------------------------------------------------------------"
|
@echo "--------------------------------------------------------------------------------"
|
||||||
@echo
|
@echo
|
||||||
|
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
## --SECTION-- END-OF-FILE
|
## --SECTION-- END-OF-FILE
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
|
|
||||||
## Local Variables:
|
## Local Variables:
|
||||||
## mode: outline-minor
|
## mode: outline-minor
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# -*- mode: Makefile; -*-
|
# -*- mode: Makefile; -*-
|
||||||
|
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
## --SECTION-- LIBRARY
|
## --SECTION-- LIBRARY
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
### @brief ZeroMQ
|
### @brief ZeroMQ
|
||||||
|
|
@ -62,9 +62,9 @@ ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
|
||||||
@echo "--------------------------------------------------------------------------------"
|
@echo "--------------------------------------------------------------------------------"
|
||||||
@echo
|
@echo
|
||||||
|
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
## --SECTION-- END-OF-FILE
|
## --SECTION-- END-OF-FILE
|
||||||
################################################################################
|
## -----------------------------------------------------------------------------
|
||||||
|
|
||||||
## Local Variables:
|
## Local Variables:
|
||||||
## mode: outline-minor
|
## mode: outline-minor
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue