mirror of https://gitee.com/bigwinds/arangodb
changes to allow SUBDIR build
This commit is contained in:
Frank Celler
parent
39f4a8f833
commit
2ab77278d9
|
|
@ -10,9 +10,9 @@
|
|||
|
||||
BUILT_SOURCES += @LIBEV_LIBS@
|
||||
|
||||
@LIBEV_LIBS@: .libev-build-@TRI_BITS@
|
||||
@LIBEV_LIBS@: @srcdir@/.libev-build-@TRI_BITS@
|
||||
|
||||
.libev-build-@TRI_BITS@:
|
||||
@srcdir@/.libev-build-@TRI_BITS@:
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILDING LIBEV"
|
||||
|
|
@ -23,7 +23,7 @@ BUILT_SOURCES += @LIBEV_LIBS@
|
|||
cd @top_srcdir@/3rdParty/libev/BUILD && ../configure --disable-shared
|
||||
cd @top_srcdir@/3rdParty/libev/BUILD && $(MAKE)
|
||||
|
||||
touch .libev-build-@TRI_BITS@
|
||||
touch @srcdir@/.libev-build-@TRI_BITS@
|
||||
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
|
||||
BUILT_SOURCES += @MRUBY_LIBS@
|
||||
|
||||
@MRUBY_LIBS@: .mruby-build-@TRI_BITS@
|
||||
@MRUBY_LIBS@: @srcdir@/.mruby-build-@TRI_BITS@
|
||||
|
||||
.mruby-build-@TRI_BITS@:
|
||||
@srcdir@/.mruby-build-@TRI_BITS@:
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILDING LIBEV"
|
||||
|
|
@ -21,7 +21,7 @@ BUILT_SOURCES += @MRUBY_LIBS@
|
|||
|
||||
cd @top_srcdir@/3rdParty/mruby && $(MAKE) -j1
|
||||
|
||||
touch .mruby-build-@TRI_BITS@
|
||||
touch @srcdir@/.mruby-build-@TRI_BITS@
|
||||
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
BUILT_SOURCES += @PROTOBUF_LIBS@
|
||||
PROTOBUFDIR = @abs_top_srcdir@/3rdParty/protobuf-2.4.1/BUILD
|
||||
|
||||
@PROTOBUF_LIBS@: .protobuf-build-@TRI_BITS@
|
||||
@PROTOBUF_LIBS@: @srcdir@/.protobuf-build-@TRI_BITS@
|
||||
|
||||
.protobuf-build-@TRI_BITS@:
|
||||
@srcdir@/.protobuf-build-@TRI_BITS@:
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILDING Protocol Buffers"
|
||||
|
|
@ -28,7 +28,7 @@ PROTOBUFDIR = @abs_top_srcdir@/3rdParty/protobuf-2.4.1/BUILD
|
|||
--libdir=$(PROTOBUFDIR)/lib@TRI_BITS@
|
||||
cd @top_srcdir@/3rdParty/protobuf-2.4.1 && $(MAKE) install
|
||||
|
||||
touch .protobuf-build-@TRI_BITS@
|
||||
touch @srcdir@/.protobuf-build-@TRI_BITS@
|
||||
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
|
||||
BUILT_SOURCES += @V8_LIBS@
|
||||
|
||||
@V8_LIBS@: .v8-build-@TRI_BITS@
|
||||
@V8_LIBS@: @srcdir@/.v8-build-@TRI_BITS@
|
||||
|
||||
.v8-build-@TRI_BITS@:
|
||||
@srcdir@/.v8-build-@TRI_BITS@:
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILDING V8"
|
||||
|
|
@ -21,7 +21,7 @@ BUILT_SOURCES += @V8_LIBS@
|
|||
|
||||
cd @top_srcdir@/3rdParty/V8 && $(MAKE) library=static snapshot=off @V8_TARGET@
|
||||
|
||||
touch .v8-build-@TRI_BITS@
|
||||
touch @srcdir@/.v8-build-@TRI_BITS@
|
||||
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
BUILT_SOURCES += @ZEROMQ_LIBS@
|
||||
ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
|
||||
|
||||
@ZEROMQ_LIBS@: .zeromq-build-@TRI_BITS@ .czmq-build-@TRI_BITS@
|
||||
@ZEROMQ_LIBS@: @srcdir@/.zeromq-build-@TRI_BITS@ @srcdir@/.czmq-build-@TRI_BITS@
|
||||
|
||||
.zeromq-build-@TRI_BITS@:
|
||||
@srcdir@/.zeromq-build-@TRI_BITS@:
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILDING ZEROMQ"
|
||||
|
|
@ -28,7 +28,7 @@ ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
|
|||
--libdir=$(ZMQDIR)/lib@TRI_BITS@
|
||||
cd @top_srcdir@/3rdParty/zeromq-2.2.0 && $(MAKE) install
|
||||
|
||||
touch .zeromq-build-@TRI_BITS@
|
||||
touch @srcdir@/.zeromq-build-@TRI_BITS@
|
||||
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
|
|
@ -36,7 +36,7 @@ ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
|
|||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo
|
||||
|
||||
.czmq-build-@TRI_BITS@: .zeromq-build-@TRI_BITS@
|
||||
@srcdir@/.czmq-build-@TRI_BITS@: .zeromq-build-@TRI_BITS@
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILDING CZMQ"
|
||||
|
|
@ -54,7 +54,7 @@ ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
|
|||
LIBS="-luuid -lrt -lstdc++"
|
||||
cd @top_srcdir@/3rdParty/czmq-1.1.0 && $(MAKE) install
|
||||
|
||||
touch .czmq-build-@TRI_BITS@
|
||||
touch @srcdir@/.czmq-build-@TRI_BITS@
|
||||
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
|
|
|
|||
100
Makefile.am
100
Makefile.am
|
|
@ -46,6 +46,26 @@ BISONXX_FILES =
|
|||
|
||||
PROTOBUF_FILES =
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- PATHS
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
if ENABLE_RELATIVE
|
||||
|
||||
TRI_DATABASEDIR =
|
||||
TRI_LOGDIR = /tmp
|
||||
TRI_PKGDATADIR = .
|
||||
TRI_SBINDIR = ${abs_builddir}/bin
|
||||
|
||||
else
|
||||
|
||||
TRI_DATABASEDIR = ${localstatedir}/${PACKAGE_TARNAME}
|
||||
TRI_LOGDIR = ${localstatedir}/log/${PACKAGE_TARNAME}
|
||||
TRI_PKGDATADIR = ${pkgdatadir}
|
||||
TRI_SBINDIR = ${sbindir}
|
||||
|
||||
endif
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- FLAGS
|
||||
## -----------------------------------------------------------------------------
|
||||
|
|
@ -159,10 +179,7 @@ noinst_LIBRARIES = \
|
|||
################################################################################
|
||||
|
||||
sbin_PROGRAMS = \
|
||||
bin/arangod \
|
||||
bin/arango-password \
|
||||
bin/arango-upgrade \
|
||||
bin/arango-dfdb
|
||||
bin/arangod
|
||||
|
||||
################################################################################
|
||||
### @brief /bin programs
|
||||
|
|
@ -202,17 +219,8 @@ endif
|
|||
################################################################################
|
||||
|
||||
arangosysconfdir=$(sysconfdir)/$(PACKAGE_TARNAME)
|
||||
arangosysconf_DATA = Installation/arangod.conf
|
||||
|
||||
BUILT_SOURCES += Installation/arangod.conf
|
||||
|
||||
Installation/arangod.conf: Installation/arangod.conf.in Makefile
|
||||
@test -d Installation || mkdir Installation
|
||||
sed \
|
||||
-e 's%@LOGDIR@%${TRI_LOG_DIR}%g' \
|
||||
-e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \
|
||||
-e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \
|
||||
$< > $@
|
||||
arangosysconf_DATA = $(shell find @builddir@/etc/arangodb -name "*.conf" -print)
|
||||
|
||||
################################################################################
|
||||
### @brief /share data
|
||||
|
|
@ -244,7 +252,7 @@ endif
|
|||
if ENABLE_INSTALL_DBDIR
|
||||
|
||||
install-data-local:
|
||||
test -d $(DESTDIR)$(TRI_DATABASE_DIR) || mkdir -p $(DESTDIR)$(TRI_DATABASE_DIR)
|
||||
test -d $(DESTDIR)$(TRI_DATABASEDIR) || mkdir -p $(DESTDIR)$(TRI_DATABASEDIR)
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -273,6 +281,8 @@ include Makefile.files
|
|||
include lib/Makefile.files
|
||||
include arangod/Makefile.files
|
||||
include arangosh/Makefile.files
|
||||
include etc/Makefile.files
|
||||
include utils/Makefile.files
|
||||
|
||||
if ENABLE_MRUBY
|
||||
include arangoirb/Makefile.files
|
||||
|
|
@ -318,66 +328,6 @@ clean-local:
|
|||
|
||||
built-sources: build.h errorfiles $(JAVASCRIPT_HEADER)
|
||||
|
||||
################################################################################
|
||||
### @brief arango password
|
||||
################################################################################
|
||||
|
||||
# exclude arango skripts from sources list
|
||||
bin_arango_password_SOURCES =
|
||||
|
||||
bin/arango-password: utils/arango-password.in
|
||||
sed \
|
||||
-e 's%@SBINDIR@%${TRI_SBIN_DIR}%g' \
|
||||
-e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \
|
||||
-e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \
|
||||
$< > $@
|
||||
chmod 755 $@
|
||||
|
||||
CLEANUP += bin/arango-password
|
||||
|
||||
################################################################################
|
||||
### @brief arango upgrade
|
||||
################################################################################
|
||||
|
||||
# exclude arango skripts from sources list
|
||||
bin_arango_upgrade_SOURCES =
|
||||
|
||||
bin/arango-upgrade: bin/arango-upgrade.in
|
||||
if ENABLE_RELATIVE_DEVEL
|
||||
sed \
|
||||
-e 's%@SBINDIR@%bin%g' \
|
||||
-e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \
|
||||
-e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \
|
||||
$< > $@
|
||||
chmod 755 $@
|
||||
else
|
||||
sed \
|
||||
-e 's%@SBINDIR@%${TRI_SBIN_DIR}%g' \
|
||||
-e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \
|
||||
-e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \
|
||||
$< > $@
|
||||
chmod 755 $@
|
||||
endif
|
||||
|
||||
CLEANUP += bin/arango-upgrade
|
||||
|
||||
################################################################################
|
||||
### @brief arango datafile debugger
|
||||
################################################################################
|
||||
|
||||
# exclude arango skrips from sources list
|
||||
bin_arango_dfdb_SOURCES =
|
||||
|
||||
bin/arango-dfdb: utils/arango-dfdb.in
|
||||
sed \
|
||||
-e 's%@SBINDIR@%${TRI_SBIN_DIR}%g' \
|
||||
-e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \
|
||||
-e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \
|
||||
$< > $@
|
||||
chmod 755 $@
|
||||
|
||||
CLEANUP += bin/arango-dfdb
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- DEPENDENCIES
|
||||
## -----------------------------------------------------------------------------
|
||||
|
|
|
|||
286
Makefile.in
286
Makefile.in
|
|
@ -32,9 +32,6 @@
|
|||
|
||||
# -*- mode: Makefile; -*-
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
### @brief library "libarango.a"
|
||||
################################################################################
|
||||
|
|
@ -59,6 +56,14 @@
|
|||
|
||||
# -*- mode: Makefile; -*-
|
||||
|
||||
# -*- mode: Makefile; -*-
|
||||
|
||||
################################################################################
|
||||
### @brief /sbin programs
|
||||
################################################################################
|
||||
|
||||
# -*- mode: Makefile; -*-
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
|
|
@ -88,18 +93,12 @@
|
|||
|
||||
# -*- mode: Makefile; -*-
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
### @brief sets up the directories
|
||||
################################################################################
|
||||
|
||||
# -*- mode: Makefile; -*-
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
### @brief sets up the directories
|
||||
################################################################################
|
||||
|
|
@ -193,7 +192,7 @@ target_triplet = @target@
|
|||
@ENABLE_MRUBY_TRUE@am__append_5 = @MRUBY_CPPFLAGS@ @MRUBY_LDFLAGS@
|
||||
@ENABLE_MRUBY_TRUE@am__append_6 = @MRUBY_LIBS@
|
||||
sbin_PROGRAMS = bin/arangod$(EXEEXT) bin/arango-password$(EXEEXT) \
|
||||
bin/arango-upgrade$(EXEEXT) bin/arango-dfdb$(EXEEXT)
|
||||
bin/arango-dfdb$(EXEEXT)
|
||||
bin_PROGRAMS = bin/arangosh$(EXEEXT) bin/arangoimp$(EXEEXT) \
|
||||
$(am__EXEEXT_1)
|
||||
noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
|
||||
|
|
@ -222,16 +221,12 @@ DIST_COMMON = $(am__configure_deps) \
|
|||
$(srcdir)/UnitTests/Makefile.files \
|
||||
$(srcdir)/arangod/Makefile.files \
|
||||
$(srcdir)/arangoirb/Makefile.files \
|
||||
$(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.flex \
|
||||
$(srcdir)/m4/Makefile.javascript $(srcdir)/m4/Makefile.mruby \
|
||||
$(srcdir)/m4/Makefile.protobuf \
|
||||
$(top_srcdir)/Doxygen/arango.template.in \
|
||||
$(srcdir)/arangosh/Makefile.files $(srcdir)/etc/Makefile.files \
|
||||
$(srcdir)/js/Makefile.javascript $(srcdir)/lib/Makefile.bison \
|
||||
$(srcdir)/lib/Makefile.files $(srcdir)/lib/Makefile.flex \
|
||||
$(srcdir)/lib/Makefile.protobuf $(srcdir)/mr/Makefile.mruby \
|
||||
$(srcdir)/utils/Makefile.files \
|
||||
$(top_srcdir)/Documentation/arango.template.in \
|
||||
$(top_srcdir)/config/config.h.in $(top_srcdir)/configure \
|
||||
$(top_srcdir)/lib/BasicsC/local-configuration.h.in \
|
||||
config/compile config/config.guess config/config.sub \
|
||||
|
|
@ -260,7 +255,7 @@ DIST_COMMON = $(am__configure_deps) \
|
|||
@ENABLE_ERRORS_DEPENDENCY_TRUE@am__append_16 = \
|
||||
@ENABLE_ERRORS_DEPENDENCY_TRUE@ errorfiles
|
||||
|
||||
@ENABLE_MRUBY_TRUE@am__append_17 = .setup-mr-directories
|
||||
@ENABLE_MRUBY_TRUE@am__append_17 = @builddir@/.setup-mr-directories
|
||||
|
||||
################################################################################
|
||||
### @brief cleanup
|
||||
|
|
@ -599,9 +594,6 @@ bin_arango_dfdb_LDADD = $(LDADD)
|
|||
am_bin_arango_password_OBJECTS =
|
||||
bin_arango_password_OBJECTS = $(am_bin_arango_password_OBJECTS)
|
||||
bin_arango_password_LDADD = $(LDADD)
|
||||
am_bin_arango_upgrade_OBJECTS =
|
||||
bin_arango_upgrade_OBJECTS = $(am_bin_arango_upgrade_OBJECTS)
|
||||
bin_arango_upgrade_LDADD = $(LDADD)
|
||||
am__bin_arangod_SOURCES_DIST = arangod/Actions/actions.cpp \
|
||||
arangod/Actions/ActionDispatcherThread.cpp \
|
||||
arangod/Actions/RestActionHandler.cpp \
|
||||
|
|
@ -806,10 +798,10 @@ SOURCES = $(lib_libarango_a_SOURCES) $(lib_libarango_client_a_SOURCES) \
|
|||
$(lib_libarango_v8_a_SOURCES) \
|
||||
$(UnitTests_basics_suite_SOURCES) \
|
||||
$(UnitTests_geo_suite_SOURCES) $(bin_arango_dfdb_SOURCES) \
|
||||
$(bin_arango_password_SOURCES) $(bin_arango_upgrade_SOURCES) \
|
||||
$(bin_arangod_SOURCES) $(bin_arangoimp_SOURCES) \
|
||||
$(bin_arangoirb_SOURCES) $(bin_arangosh_SOURCES) \
|
||||
$(bin_zclient_SOURCES) $(bin_zserver_SOURCES)
|
||||
$(bin_arango_password_SOURCES) $(bin_arangod_SOURCES) \
|
||||
$(bin_arangoimp_SOURCES) $(bin_arangoirb_SOURCES) \
|
||||
$(bin_arangosh_SOURCES) $(bin_zclient_SOURCES) \
|
||||
$(bin_zserver_SOURCES)
|
||||
DIST_SOURCES = $(am__lib_libarango_a_SOURCES_DIST) \
|
||||
$(lib_libarango_client_a_SOURCES) \
|
||||
$(lib_libarango_fe_a_SOURCES) \
|
||||
|
|
@ -818,10 +810,9 @@ DIST_SOURCES = $(am__lib_libarango_a_SOURCES_DIST) \
|
|||
$(am__UnitTests_basics_suite_SOURCES_DIST) \
|
||||
$(am__UnitTests_geo_suite_SOURCES_DIST) \
|
||||
$(bin_arango_dfdb_SOURCES) $(bin_arango_password_SOURCES) \
|
||||
$(bin_arango_upgrade_SOURCES) $(am__bin_arangod_SOURCES_DIST) \
|
||||
$(bin_arangoimp_SOURCES) $(am__bin_arangoirb_SOURCES_DIST) \
|
||||
$(bin_arangosh_SOURCES) $(bin_zclient_SOURCES) \
|
||||
$(bin_zserver_SOURCES)
|
||||
$(am__bin_arangod_SOURCES_DIST) $(bin_arangoimp_SOURCES) \
|
||||
$(am__bin_arangoirb_SOURCES_DIST) $(bin_arangosh_SOURCES) \
|
||||
$(bin_zclient_SOURCES) $(bin_zserver_SOURCES)
|
||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||
am__vpath_adj = case $$p in \
|
||||
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
|
|
@ -1017,12 +1008,14 @@ target_vendor = @target_vendor@
|
|||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
BUILT_SOURCES = build.h Installation/arangod.conf $(JAVASCRIPT_HEADER) \
|
||||
$(JAVASCRIPT_BROWSER) $(MRUBY_HEADER) $(am__append_16) \
|
||||
Documentation/.setup-directories .setup-js-directories \
|
||||
$(am__append_17) $(am__append_19) $(am__append_21) \
|
||||
$(PROTOBUF_FILES) $(am__append_23) $(am__append_24) \
|
||||
$(am__append_25) $(am__append_26) $(am__append_27)
|
||||
BUILT_SOURCES = build.h $(JAVASCRIPT_HEADER) $(JAVASCRIPT_BROWSER) \
|
||||
$(MRUBY_HEADER) etc/arangodb/arangod.conf \
|
||||
etc/arangodb/arangosh.conf $(am__append_16) \
|
||||
Documentation/.setup-directories \
|
||||
@builddir@/.setup-js-directories $(am__append_17) \
|
||||
$(am__append_19) $(am__append_21) $(PROTOBUF_FILES) \
|
||||
$(am__append_23) $(am__append_24) $(am__append_25) \
|
||||
$(am__append_26) $(am__append_27)
|
||||
|
||||
################################################################################
|
||||
### @brief files to cleanup
|
||||
|
|
@ -1040,11 +1033,11 @@ BUILT_SOURCES = build.h Installation/arangod.conf $(JAVASCRIPT_HEADER) \
|
|||
### @brief cleanup
|
||||
################################################################################
|
||||
CLEANUP = bin/arango-password bin/arango-upgrade bin/arango-dfdb \
|
||||
$(am__append_18) $(DOXYGEN) $(addsuffix .md,$(addprefix \
|
||||
Doxygen/xml/,$(WIKI))) $(addsuffix .md,$(addprefix \
|
||||
Doxygen/wiki/,$(WIKI))) $(JAVASCRIPT_HEADER) \
|
||||
.setup-js-directories $(am__append_20) $(am__append_22) \
|
||||
$(PROTOBUF_FILES)
|
||||
$(DOXYGEN) $(addsuffix .md,$(addprefix \
|
||||
Documentation/xml/,$(WIKI))) $(addsuffix .md,$(addprefix \
|
||||
Documentation/wiki/,$(WIKI))) $(JAVASCRIPT_HEADER) \
|
||||
.setup-js-directories $(am__append_18) $(am__append_20) \
|
||||
$(am__append_22) $(PROTOBUF_FILES)
|
||||
|
||||
################################################################################
|
||||
### @brief flex files
|
||||
|
|
@ -1101,6 +1094,14 @@ BISONXX_FILES = lib/JsonParserX/JsonParserX.cpp
|
|||
### @brief protocol buffers
|
||||
################################################################################
|
||||
PROTOBUF_FILES = lib/ProtocolBuffers/arangodb.pb.cpp
|
||||
@ENABLE_RELATIVE_FALSE@TRI_DATABASEDIR = ${localstatedir}/${PACKAGE_TARNAME}
|
||||
@ENABLE_RELATIVE_TRUE@TRI_DATABASEDIR =
|
||||
@ENABLE_RELATIVE_FALSE@TRI_LOGDIR = ${localstatedir}/log/${PACKAGE_TARNAME}
|
||||
@ENABLE_RELATIVE_TRUE@TRI_LOGDIR = /tmp
|
||||
@ENABLE_RELATIVE_FALSE@TRI_PKGDATADIR = ${pkgdatadir}
|
||||
@ENABLE_RELATIVE_TRUE@TRI_PKGDATADIR = .
|
||||
@ENABLE_RELATIVE_FALSE@TRI_SBINDIR = ${sbindir}
|
||||
@ENABLE_RELATIVE_TRUE@TRI_SBINDIR = ${abs_builddir}/bin
|
||||
|
||||
################################################################################
|
||||
### @brief m4 directory
|
||||
|
|
@ -1133,7 +1134,7 @@ noinst_LIBRARIES = lib/libarango.a lib/libarango_v8.a \
|
|||
### @brief /etc data
|
||||
################################################################################
|
||||
arangosysconfdir = $(sysconfdir)/$(PACKAGE_TARNAME)
|
||||
arangosysconf_DATA = Installation/arangod.conf
|
||||
arangosysconf_DATA = $(shell find @builddir@/etc/arangodb -name "*.conf" -print)
|
||||
|
||||
################################################################################
|
||||
### @brief /share data
|
||||
|
|
@ -1501,6 +1502,29 @@ bin_arangoimp_SOURCES = \
|
|||
arangosh/V8Client/V8ClientConnection.cpp \
|
||||
arangosh/V8Client/arangoimp.cpp
|
||||
|
||||
|
||||
# bin/arango-upgrade
|
||||
|
||||
################################################################################
|
||||
### @brief arango password
|
||||
################################################################################
|
||||
|
||||
# exclude arango skripts from sources list
|
||||
bin_arango_password_SOURCES =
|
||||
|
||||
################################################################################
|
||||
### @brief arango upgrade
|
||||
################################################################################
|
||||
|
||||
# exclude arango skripts from sources list
|
||||
bin_arango_upgrade_SOURCES =
|
||||
|
||||
################################################################################
|
||||
### @brief arango datafile debugger
|
||||
################################################################################
|
||||
|
||||
# exclude arango skrips from sources list
|
||||
bin_arango_dfdb_SOURCES =
|
||||
@ENABLE_MRUBY_TRUE@bin_arangoirb_CPPFLAGS = \
|
||||
@ENABLE_MRUBY_TRUE@ -I@top_srcdir@/arangoirb \
|
||||
@ENABLE_MRUBY_TRUE@ $(AM_CPPFLAGS)
|
||||
|
|
@ -1600,7 +1624,7 @@ CLIENT_OPT := \
|
|||
@ENABLE_BOOST_TEST_TRUE@ UnitTests/Jutland/StringBufferTest.cpp \
|
||||
@ENABLE_BOOST_TEST_TRUE@ UnitTests/Jutland/StringUtilsTest.cpp
|
||||
|
||||
@ENABLE_BOOST_TEST_TRUE@UnitTests_geo_suite_CPPFLAGS = -I@top_builddir@/arangod -I@top_builddir@/lib
|
||||
@ENABLE_BOOST_TEST_TRUE@UnitTests_geo_suite_CPPFLAGS = -I@top_srcdir@/arangod -I@top_builddir@/lib -I@top_srcdir@/lib
|
||||
@ENABLE_BOOST_TEST_TRUE@UnitTests_geo_suite_LDADD = -L@top_builddir@/lib -larango -lboost_unit_test_framework
|
||||
@ENABLE_BOOST_TEST_TRUE@UnitTests_geo_suite_DEPENDENCIES = @top_builddir@/lib/libarango.a
|
||||
@ENABLE_BOOST_TEST_TRUE@UnitTests_geo_suite_SOURCES = \
|
||||
|
|
@ -1681,27 +1705,6 @@ UNITTESTS_CLIENT = $(addprefix --javascript.unit-tests ,$(SHELL_CLIENT))
|
|||
################################################################################
|
||||
BITARRAY_COMMON = @top_srcdir@/js/common/tests/shell-bitarray-index.js
|
||||
UNITTESTS_SERVER_BITARRAY = $(addprefix --javascript.unit-tests ,$(BITARRAY_COMMON))
|
||||
|
||||
################################################################################
|
||||
### @brief arango password
|
||||
################################################################################
|
||||
|
||||
# exclude arango skripts from sources list
|
||||
bin_arango_password_SOURCES =
|
||||
|
||||
################################################################################
|
||||
### @brief arango upgrade
|
||||
################################################################################
|
||||
|
||||
# exclude arango skripts from sources list
|
||||
bin_arango_upgrade_SOURCES =
|
||||
|
||||
################################################################################
|
||||
### @brief arango datafile debugger
|
||||
################################################################################
|
||||
|
||||
# exclude arango skrips from sources list
|
||||
bin_arango_dfdb_SOURCES =
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@PROTOBUFDIR = @abs_top_srcdir@/3rdParty/protobuf-2.4.1/BUILD
|
||||
@ENABLE_ZEROMQ_TRUE@ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
|
||||
all: $(BUILT_SOURCES)
|
||||
|
|
@ -1711,7 +1714,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)/UnitTests/Makefile.files $(srcdir)/Documentation/Makefile.doxygen $(srcdir)/js/Makefile.javascript $(srcdir)/mr/Makefile.mruby $(srcdir)/lib/Makefile.flex $(srcdir)/lib/Makefile.bison $(srcdir)/lib/Makefile.protobuf $(srcdir)/3rdParty/Makefile.all-in-one-libev $(srcdir)/3rdParty/Makefile.all-in-one-protobuf $(srcdir)/3rdParty/Makefile.all-in-one-v8 $(srcdir)/3rdParty/Makefile.all-in-one-mruby $(srcdir)/3rdParty/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)/etc/Makefile.files $(srcdir)/utils/Makefile.files $(srcdir)/arangoirb/Makefile.files $(srcdir)/PerfTests/Makefile.files $(srcdir)/UnitTests/Makefile.files $(srcdir)/Documentation/Makefile.doxygen $(srcdir)/js/Makefile.javascript $(srcdir)/mr/Makefile.mruby $(srcdir)/lib/Makefile.flex $(srcdir)/lib/Makefile.bison $(srcdir)/lib/Makefile.protobuf $(srcdir)/3rdParty/Makefile.all-in-one-libev $(srcdir)/3rdParty/Makefile.all-in-one-protobuf $(srcdir)/3rdParty/Makefile.all-in-one-v8 $(srcdir)/3rdParty/Makefile.all-in-one-mruby $(srcdir)/3rdParty/Makefile.all-in-one-zeromq $(am__configure_deps)
|
||||
@for dep in $?; do \
|
||||
case '$(am__configure_deps)' in \
|
||||
*$$dep*) \
|
||||
|
|
@ -4540,6 +4543,25 @@ arangod/MRServer/bin_arangod-mr-actions.obj: arangod/MRServer/mr-actions.cpp
|
|||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='arangod/MRServer/mr-actions.cpp' object='arangod/MRServer/bin_arangod-mr-actions.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangod_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o arangod/MRServer/bin_arangod-mr-actions.obj `if test -f 'arangod/MRServer/mr-actions.cpp'; then $(CYGPATH_W) 'arangod/MRServer/mr-actions.cpp'; else $(CYGPATH_W) '$(srcdir)/arangod/MRServer/mr-actions.cpp'; fi`
|
||||
|
||||
arangosh/ArangoShell/bin_arangoimp-ArangoClient.o: arangosh/ArangoShell/ArangoClient.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangoimp_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT arangosh/ArangoShell/bin_arangoimp-ArangoClient.o -MD -MP -MF arangosh/ArangoShell/$(DEPDIR)/bin_arangoimp-ArangoClient.Tpo -c -o arangosh/ArangoShell/bin_arangoimp-ArangoClient.o `test -f 'arangosh/ArangoShell/ArangoClient.cpp' || echo '$(srcdir)/'`arangosh/ArangoShell/ArangoClient.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) arangosh/ArangoShell/$(DEPDIR)/bin_arangoimp-ArangoClient.Tpo arangosh/ArangoShell/$(DEPDIR)/bin_arangoimp-ArangoClient.Po
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='arangosh/ArangoShell/ArangoClient.cpp' object='arangosh/ArangoShell/bin_arangoimp-ArangoClient.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangoimp_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o arangosh/ArangoShell/bin_arangoimp-ArangoClient.o `test -f 'arangosh/ArangoShell/ArangoClient.cpp' || echo '$(srcdir)/'`arangosh/ArangoShell/ArangoClient.cpp
|
||||
|
||||
arangosh/ArangoShell/bin_arangoimp-ArangoClient.obj: arangosh/ArangoShell/ArangoClient.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangoimp_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT arangosh/ArangoShell/bin_arangoimp-ArangoClient.obj -MD -MP -MF arangosh/ArangoShell/$(DEPDIR)/bin_arangoimp-ArangoClient.Tpo -c -o arangosh/ArangoShell/bin_arangoimp-ArangoClient.obj `if test -f 'arangosh/ArangoShell/ArangoClient.cpp'; then $(CYGPATH_W) 'arangosh/ArangoShell/ArangoClient.cpp'; else $(CYGPATH_W) '$(srcdir)/arangosh/ArangoShell/ArangoClient.cpp'; fi`
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) arangosh/ArangoShell/$(DEPDIR)/bin_arangoimp-ArangoClient.Tpo arangosh/ArangoShell/$(DEPDIR)/bin_arangoimp-ArangoClient.Po
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='arangosh/ArangoShell/ArangoClient.cpp' object='arangosh/ArangoShell/bin_arangoimp-ArangoClient.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangoimp_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o arangosh/ArangoShell/bin_arangoimp-ArangoClient.obj `if test -f 'arangosh/ArangoShell/ArangoClient.cpp'; then $(CYGPATH_W) 'arangosh/ArangoShell/ArangoClient.cpp'; else $(CYGPATH_W) '$(srcdir)/arangosh/ArangoShell/ArangoClient.cpp'; fi`
|
||||
|
||||
arangosh/V8Client/bin_arangoimp-ImportHelper.o: arangosh/V8Client/ImportHelper.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangoimp_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT arangosh/V8Client/bin_arangoimp-ImportHelper.o -MD -MP -MF arangosh/V8Client/$(DEPDIR)/bin_arangoimp-ImportHelper.Tpo -c -o arangosh/V8Client/bin_arangoimp-ImportHelper.o `test -f 'arangosh/V8Client/ImportHelper.cpp' || echo '$(srcdir)/'`arangosh/V8Client/ImportHelper.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) arangosh/V8Client/$(DEPDIR)/bin_arangoimp-ImportHelper.Tpo arangosh/V8Client/$(DEPDIR)/bin_arangoimp-ImportHelper.Po
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='arangosh/V8Client/ImportHelper.cpp' object='arangosh/V8Client/bin_arangoimp-ImportHelper.o' libtool=no @AMDEPBACKSLASH@
|
||||
|
|
@ -4615,6 +4637,24 @@ arangoirb/MRClient/bin_arangoirb-arangoirb.obj: arangoirb/MRClient/arangoirb.cpp
|
|||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) arangoirb/MRClient/$(DEPDIR)/bin_arangoirb-arangoirb.Tpo arangoirb/MRClient/$(DEPDIR)/bin_arangoirb-arangoirb.Po
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='arangoirb/MRClient/arangoirb.cpp' object='arangoirb/MRClient/bin_arangoirb-arangoirb.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangoirb_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o arangoirb/MRClient/bin_arangoirb-arangoirb.obj `if test -f 'arangoirb/MRClient/arangoirb.cpp'; then $(CYGPATH_W) 'arangoirb/MRClient/arangoirb.cpp'; else $(CYGPATH_W) '$(srcdir)/arangoirb/MRClient/arangoirb.cpp'; fi`
|
||||
|
||||
arangosh/ArangoShell/bin_arangosh-ArangoClient.o: arangosh/ArangoShell/ArangoClient.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangosh_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT arangosh/ArangoShell/bin_arangosh-ArangoClient.o -MD -MP -MF arangosh/ArangoShell/$(DEPDIR)/bin_arangosh-ArangoClient.Tpo -c -o arangosh/ArangoShell/bin_arangosh-ArangoClient.o `test -f 'arangosh/ArangoShell/ArangoClient.cpp' || echo '$(srcdir)/'`arangosh/ArangoShell/ArangoClient.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) arangosh/ArangoShell/$(DEPDIR)/bin_arangosh-ArangoClient.Tpo arangosh/ArangoShell/$(DEPDIR)/bin_arangosh-ArangoClient.Po
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='arangosh/ArangoShell/ArangoClient.cpp' object='arangosh/ArangoShell/bin_arangosh-ArangoClient.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangosh_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o arangosh/ArangoShell/bin_arangosh-ArangoClient.o `test -f 'arangosh/ArangoShell/ArangoClient.cpp' || echo '$(srcdir)/'`arangosh/ArangoShell/ArangoClient.cpp
|
||||
|
||||
arangosh/ArangoShell/bin_arangosh-ArangoClient.obj: arangosh/ArangoShell/ArangoClient.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangosh_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT arangosh/ArangoShell/bin_arangosh-ArangoClient.obj -MD -MP -MF arangosh/ArangoShell/$(DEPDIR)/bin_arangosh-ArangoClient.Tpo -c -o arangosh/ArangoShell/bin_arangosh-ArangoClient.obj `if test -f 'arangosh/ArangoShell/ArangoClient.cpp'; then $(CYGPATH_W) 'arangosh/ArangoShell/ArangoClient.cpp'; else $(CYGPATH_W) '$(srcdir)/arangosh/ArangoShell/ArangoClient.cpp'; fi`
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) arangosh/ArangoShell/$(DEPDIR)/bin_arangosh-ArangoClient.Tpo arangosh/ArangoShell/$(DEPDIR)/bin_arangosh-ArangoClient.Po
|
||||
@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='arangosh/ArangoShell/ArangoClient.cpp' object='arangosh/ArangoShell/bin_arangosh-ArangoClient.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangosh_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o arangosh/ArangoShell/bin_arangosh-ArangoClient.obj `if test -f 'arangosh/ArangoShell/ArangoClient.cpp'; then $(CYGPATH_W) 'arangosh/ArangoShell/ArangoClient.cpp'; else $(CYGPATH_W) '$(srcdir)/arangosh/ArangoShell/ArangoClient.cpp'; fi`
|
||||
|
||||
arangosh/V8Client/bin_arangosh-ImportHelper.o: arangosh/V8Client/ImportHelper.cpp
|
||||
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangosh_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT arangosh/V8Client/bin_arangosh-ImportHelper.o -MD -MP -MF arangosh/V8Client/$(DEPDIR)/bin_arangosh-ImportHelper.Tpo -c -o arangosh/V8Client/bin_arangosh-ImportHelper.o `test -f 'arangosh/V8Client/ImportHelper.cpp' || echo '$(srcdir)/'`arangosh/V8Client/ImportHelper.cpp
|
||||
|
|
@ -5181,20 +5221,12 @@ uninstall-am: uninstall-arangosysconfDATA uninstall-binPROGRAMS \
|
|||
uninstall-nobase_pkgdataDATA uninstall-sbinPROGRAMS
|
||||
|
||||
|
||||
Installation/arangod.conf: Installation/arangod.conf.in Makefile
|
||||
@test -d Installation || mkdir Installation
|
||||
sed \
|
||||
-e 's%@LOGDIR@%${TRI_LOG_DIR}%g' \
|
||||
-e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \
|
||||
-e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \
|
||||
$< > $@
|
||||
|
||||
################################################################################
|
||||
### @brief /var data
|
||||
################################################################################
|
||||
|
||||
@ENABLE_INSTALL_DBDIR_TRUE@install-data-local:
|
||||
@ENABLE_INSTALL_DBDIR_TRUE@ test -d $(DESTDIR)$(TRI_DATABASE_DIR) || mkdir -p $(DESTDIR)$(TRI_DATABASE_DIR)
|
||||
@ENABLE_INSTALL_DBDIR_TRUE@ test -d $(DESTDIR)$(TRI_DATABASEDIR) || mkdir -p $(DESTDIR)$(TRI_DATABASEDIR)
|
||||
|
||||
################################################################################
|
||||
### @brief version number
|
||||
|
|
@ -5219,8 +5251,53 @@ build.h: configure.ac
|
|||
################################################################################
|
||||
|
||||
################################################################################
|
||||
### @brief server config
|
||||
################################################################################
|
||||
|
||||
etc/arangodb/arangod.conf: etc/arangodb/arangod.conf.in Makefile
|
||||
@test -d etc/arangodb || mkdir -p etc/arangodb
|
||||
sed \
|
||||
-e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \
|
||||
-e 's%@LOGDIR@%${TRI_LOGDIR}%g' \
|
||||
-e 's%@PKGDATADIR@%${TRI_PKGDATADIR}%g' \
|
||||
$< > $@
|
||||
|
||||
################################################################################
|
||||
### @brief client config
|
||||
################################################################################
|
||||
|
||||
etc/arangodb/arangosh.conf: etc/arangodb/arangosh.conf.in Makefile
|
||||
@test -d etc/arangodb || mkdir -p etc/arangodb
|
||||
sed \
|
||||
-e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \
|
||||
-e 's%@LOGDIR@%${TRI_LOGDIR}%g' \
|
||||
-e 's%@PKGDATADIR@%${TRI_PKGDATADIR}%g' \
|
||||
$< > $@
|
||||
|
||||
bin/arango-password: utils/arango-password.in
|
||||
sed \
|
||||
-e 's%@SBINDIR@%${TRI_SBINDIR}%g' \
|
||||
-e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \
|
||||
-e 's%@PKGDATADIR@%${TRI_PKGDATADIR}%g' \
|
||||
$< > $@
|
||||
chmod 755 $@
|
||||
|
||||
bin/arango-upgrade: bin/arango-upgrade.in
|
||||
sed \
|
||||
-e 's%@SBINDIR@%${TRI_SBINDIR}%g' \
|
||||
-e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \
|
||||
-e 's%@PKGDATADIR@%${TRI_PKGDATADIR}%g' \
|
||||
$< > $@
|
||||
chmod 755 $@
|
||||
|
||||
bin/arango-dfdb: utils/arango-dfdb.in
|
||||
sed \
|
||||
-e 's%@SBINDIR@%${TRI_SBINDIR}%g' \
|
||||
-e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \
|
||||
-e 's%@PKGDATADIR@%${TRI_PKGDATADIR}%g' \
|
||||
$< > $@
|
||||
chmod 755 $@
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
|
|
@ -5580,12 +5657,11 @@ latex: Documentation/arango-latex.doxy $(DOXYGEN)
|
|||
################################################################################
|
||||
################################################################################
|
||||
|
||||
.setup-js-directories:
|
||||
@test -d html/admin/js/modules || mkdir html/admin/js/modules
|
||||
@test -d js || mkdir js
|
||||
@test -d js/client || mkdir js/client
|
||||
@test -d js/common/bootstrap || mkdir js/common/bootstrap
|
||||
@test -d js/server || mkdir js/server
|
||||
@builddir@/.setup-js-directories:
|
||||
@test -d html/admin/js/modules || mkdir -p html/admin/js/modules
|
||||
@test -d js/common/bootstrap || mkdir -p js/common/bootstrap
|
||||
@test -d js/client || mkdir -p js/client
|
||||
@test -d js/server || mkdir -p js/server
|
||||
@touch $@
|
||||
|
||||
################################################################################
|
||||
|
|
@ -5610,12 +5686,9 @@ js/common/bootstrap/js-%.h: @srcdir@/js/common/bootstrap/%.js .setup-js-director
|
|||
js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
||||
@top_srcdir@/config/js2c.sh $< > $@
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
@ENABLE_MRUBY_TRUE@.setup-mr-directories:
|
||||
@ENABLE_MRUBY_TRUE@ @test -d mr || mkdir mr
|
||||
@ENABLE_MRUBY_TRUE@ @test -d mr/common/bootstrap || mkdir mr/common/bootstrap
|
||||
@ENABLE_MRUBY_TRUE@@builddir@/.setup-mr-directories:
|
||||
@ENABLE_MRUBY_TRUE@ @test -d mr/common/bootstrap || mkdir -p mr/common/bootstrap
|
||||
@ENABLE_MRUBY_TRUE@ @test -d mr/server || mkdir -p mr/server
|
||||
@ENABLE_MRUBY_TRUE@ @touch $@
|
||||
|
||||
@ENABLE_MRUBY_TRUE@mr/common/bootstrap/mr-%.h: @srcdir@/mr/common/bootstrap/%.rb .setup-mr-directories
|
||||
|
|
@ -5624,9 +5697,6 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@ENABLE_MRUBY_TRUE@mr/server/mr-%.h: @srcdir@/mr/server/%.rb .setup-mr-directories
|
||||
@ENABLE_MRUBY_TRUE@ @top_srcdir@/config/mr2c.sh $< > $@
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
### @brief flex
|
||||
################################################################################
|
||||
|
|
@ -5663,9 +5733,9 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@PROTOBUF_PROTOC@ --cpp_out . $<
|
||||
mv $(addsuffix .cc,$(basename $@)) $@
|
||||
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@@LIBEV_LIBS@: .libev-build-@TRI_BITS@
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@@LIBEV_LIBS@: @srcdir@/.libev-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@.libev-build-@TRI_BITS@:
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@@srcdir@/.libev-build-@TRI_BITS@:
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo "BUILDING LIBEV"
|
||||
|
|
@ -5676,7 +5746,7 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ cd @top_srcdir@/3rdParty/libev/BUILD && ../configure --disable-shared
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ cd @top_srcdir@/3rdParty/libev/BUILD && $(MAKE)
|
||||
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ touch .libev-build-@TRI_BITS@
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ touch @srcdir@/.libev-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
|
|
@ -5684,9 +5754,9 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo
|
||||
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@@PROTOBUF_LIBS@: .protobuf-build-@TRI_BITS@
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@@PROTOBUF_LIBS@: @srcdir@/.protobuf-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@.protobuf-build-@TRI_BITS@:
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@@srcdir@/.protobuf-build-@TRI_BITS@:
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo "BUILDING Protocol Buffers"
|
||||
|
|
@ -5701,7 +5771,7 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ --libdir=$(PROTOBUFDIR)/lib@TRI_BITS@
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ cd @top_srcdir@/3rdParty/protobuf-2.4.1 && $(MAKE) install
|
||||
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ touch .protobuf-build-@TRI_BITS@
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ touch @srcdir@/.protobuf-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
|
|
@ -5709,9 +5779,9 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo
|
||||
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@@V8_LIBS@: .v8-build-@TRI_BITS@
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@@V8_LIBS@: @srcdir@/.v8-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@.v8-build-@TRI_BITS@:
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@@srcdir@/.v8-build-@TRI_BITS@:
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo "BUILDING V8"
|
||||
|
|
@ -5720,7 +5790,7 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ cd @top_srcdir@/3rdParty/V8 && $(MAKE) library=static snapshot=off @V8_TARGET@
|
||||
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ touch .v8-build-@TRI_BITS@
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ touch @srcdir@/.v8-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
|
|
@ -5728,9 +5798,9 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo
|
||||
|
||||
@ENABLE_MRUBY_TRUE@@MRUBY_LIBS@: .mruby-build-@TRI_BITS@
|
||||
@ENABLE_MRUBY_TRUE@@MRUBY_LIBS@: @srcdir@/.mruby-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_MRUBY_TRUE@.mruby-build-@TRI_BITS@:
|
||||
@ENABLE_MRUBY_TRUE@@srcdir@/.mruby-build-@TRI_BITS@:
|
||||
@ENABLE_MRUBY_TRUE@ @echo
|
||||
@ENABLE_MRUBY_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_MRUBY_TRUE@ @echo "BUILDING LIBEV"
|
||||
|
|
@ -5739,7 +5809,7 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
|
||||
@ENABLE_MRUBY_TRUE@ cd @top_srcdir@/3rdParty/mruby && $(MAKE) -j1
|
||||
|
||||
@ENABLE_MRUBY_TRUE@ touch .mruby-build-@TRI_BITS@
|
||||
@ENABLE_MRUBY_TRUE@ touch @srcdir@/.mruby-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_MRUBY_TRUE@ @echo
|
||||
@ENABLE_MRUBY_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
|
|
@ -5747,9 +5817,9 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@ENABLE_MRUBY_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_MRUBY_TRUE@ @echo
|
||||
|
||||
@ENABLE_ZEROMQ_TRUE@@ZEROMQ_LIBS@: .zeromq-build-@TRI_BITS@ .czmq-build-@TRI_BITS@
|
||||
@ENABLE_ZEROMQ_TRUE@@ZEROMQ_LIBS@: @srcdir@/.zeromq-build-@TRI_BITS@ @srcdir@/.czmq-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_ZEROMQ_TRUE@.zeromq-build-@TRI_BITS@:
|
||||
@ENABLE_ZEROMQ_TRUE@@srcdir@/.zeromq-build-@TRI_BITS@:
|
||||
@ENABLE_ZEROMQ_TRUE@ @echo
|
||||
@ENABLE_ZEROMQ_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_ZEROMQ_TRUE@ @echo "BUILDING ZEROMQ"
|
||||
|
|
@ -5764,7 +5834,7 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@ENABLE_ZEROMQ_TRUE@ --libdir=$(ZMQDIR)/lib@TRI_BITS@
|
||||
@ENABLE_ZEROMQ_TRUE@ cd @top_srcdir@/3rdParty/zeromq-2.2.0 && $(MAKE) install
|
||||
|
||||
@ENABLE_ZEROMQ_TRUE@ touch .zeromq-build-@TRI_BITS@
|
||||
@ENABLE_ZEROMQ_TRUE@ touch @srcdir@/.zeromq-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_ZEROMQ_TRUE@ @echo
|
||||
@ENABLE_ZEROMQ_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
|
|
@ -5772,7 +5842,7 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@ENABLE_ZEROMQ_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_ZEROMQ_TRUE@ @echo
|
||||
|
||||
@ENABLE_ZEROMQ_TRUE@.czmq-build-@TRI_BITS@: .zeromq-build-@TRI_BITS@
|
||||
@ENABLE_ZEROMQ_TRUE@@srcdir@/.czmq-build-@TRI_BITS@: .zeromq-build-@TRI_BITS@
|
||||
@ENABLE_ZEROMQ_TRUE@ @echo
|
||||
@ENABLE_ZEROMQ_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
@ENABLE_ZEROMQ_TRUE@ @echo "BUILDING CZMQ"
|
||||
|
|
@ -5790,7 +5860,7 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
@ENABLE_ZEROMQ_TRUE@ LIBS="-luuid -lrt -lstdc++"
|
||||
@ENABLE_ZEROMQ_TRUE@ cd @top_srcdir@/3rdParty/czmq-1.1.0 && $(MAKE) install
|
||||
|
||||
@ENABLE_ZEROMQ_TRUE@ touch .czmq-build-@TRI_BITS@
|
||||
@ENABLE_ZEROMQ_TRUE@ touch @srcdir@/.czmq-build-@TRI_BITS@
|
||||
|
||||
@ENABLE_ZEROMQ_TRUE@ @echo
|
||||
@ENABLE_ZEROMQ_TRUE@ @echo "--------------------------------------------------------------------------------"
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ UnitTests_basics_suite_SOURCES = \
|
|||
UnitTests/Jutland/StringBufferTest.cpp \
|
||||
UnitTests/Jutland/StringUtilsTest.cpp
|
||||
|
||||
UnitTests_geo_suite_CPPFLAGS = -I@top_builddir@/arangod -I@top_builddir@/lib
|
||||
UnitTests_geo_suite_CPPFLAGS = -I@top_srcdir@/arangod -I@top_builddir@/lib -I@top_srcdir@/lib
|
||||
UnitTests_geo_suite_LDADD = -L@top_builddir@/lib -larango -lboost_unit_test_framework
|
||||
UnitTests_geo_suite_DEPENDENCIES = @top_builddir@/lib/libarango.a
|
||||
|
||||
|
|
|
|||
|
|
@ -41,14 +41,13 @@
|
|||
#include <sstream>
|
||||
|
||||
#include "Basics/StringUtils.h"
|
||||
#include "BasicsC/json.h"
|
||||
#include "SimpleHttpClient/GeneralClientConnection.h"
|
||||
#include "SimpleHttpClient/SimpleHttpClient.h"
|
||||
#include "SimpleHttpClient/SimpleHttpResult.h"
|
||||
#include "Variant/VariantArray.h"
|
||||
#include "Variant/VariantString.h"
|
||||
|
||||
#include "json.h"
|
||||
|
||||
extern "C" {
|
||||
#include "mruby/array.h"
|
||||
#include "mruby/hash.h"
|
||||
|
|
|
|||
|
|
@ -522,7 +522,7 @@ void ArangoClient::printWelcomeInfo () {
|
|||
|
||||
void ArangoClient::printByeBye () {
|
||||
if (! _quiet) {
|
||||
cout << endl << "Bye Bye! Auf Wiedersehen! さようなら" << endl;
|
||||
cout << endl << "Bye Bye! Auf Wiedersehen! До свидания! さようなら" << endl;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
# -*- mode: Makefile; -*-
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- CONFIGURATION FILES
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
BUILT_SOURCES += \
|
||||
etc/arangodb/arangod.conf \
|
||||
etc/arangodb/arangosh.conf
|
||||
|
||||
################################################################################
|
||||
### @brief server config
|
||||
################################################################################
|
||||
|
||||
etc/arangodb/arangod.conf: etc/arangodb/arangod.conf.in Makefile
|
||||
@test -d etc/arangodb || mkdir -p etc/arangodb
|
||||
sed \
|
||||
-e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \
|
||||
-e 's%@LOGDIR@%${TRI_LOGDIR}%g' \
|
||||
-e 's%@PKGDATADIR@%${TRI_PKGDATADIR}%g' \
|
||||
$< > $@
|
||||
|
||||
################################################################################
|
||||
### @brief client config
|
||||
################################################################################
|
||||
|
||||
etc/arangodb/arangosh.conf: etc/arangodb/arangosh.conf.in Makefile
|
||||
@test -d etc/arangodb || mkdir -p etc/arangodb
|
||||
sed \
|
||||
-e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \
|
||||
-e 's%@LOGDIR@%${TRI_LOGDIR}%g' \
|
||||
-e 's%@PKGDATADIR@%${TRI_PKGDATADIR}%g' \
|
||||
$< > $@
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- END-OF-FILE
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
## Local Variables:
|
||||
## mode: outline-minor
|
||||
## outline-regexp: "^\\(### @brief\\|## --SECTION--\\|# -\\*- \\)"
|
||||
## End:
|
||||
|
|
@ -1,20 +1,20 @@
|
|||
[database]
|
||||
directory= @DATABASE@
|
||||
directory= @DATABASEDIR@
|
||||
# maximal-journal-size=33554432
|
||||
# remove-on-drop=true
|
||||
|
||||
[server]
|
||||
endpoint = tcp://localhost:8529
|
||||
disable-admin-interface = no
|
||||
admin-directory= @STATICFILES@/html/admin
|
||||
admin-directory= @PKGDATADIR@/html/admin
|
||||
threads = 5
|
||||
|
||||
[scheduler]
|
||||
threads = 3
|
||||
|
||||
[javascript]
|
||||
action-directory= @STATICFILES@/js/actions/system
|
||||
modules-path = @STATICFILES@/js/server/modules;@STATICFILES@/js/common/modules
|
||||
action-directory= @PKGDATADIR@/js/actions/system
|
||||
modules-path = @PKGDATADIR@/js/server/modules;@PKGDATADIR@/js/common/modules
|
||||
|
||||
[log]
|
||||
level = info
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
[server]
|
||||
endpoint = tcp://localhost:8529
|
||||
|
||||
[javascript]
|
||||
modules-path = @PKGDATADIR@/js/client/modules;@PKGDATADIR@/js/common/modules
|
||||
|
|
@ -1,21 +1,20 @@
|
|||
# -*- mode: Makefile; -*-
|
||||
|
||||
################################################################################
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- JAVASCRIPT
|
||||
################################################################################
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
################################################################################
|
||||
### @brief sets up the directories
|
||||
################################################################################
|
||||
|
||||
BUILT_SOURCES += .setup-js-directories
|
||||
BUILT_SOURCES += @builddir@/.setup-js-directories
|
||||
|
||||
.setup-js-directories:
|
||||
@test -d html/admin/js/modules || mkdir html/admin/js/modules
|
||||
@test -d js || mkdir js
|
||||
@test -d js/client || mkdir js/client
|
||||
@test -d js/common/bootstrap || mkdir js/common/bootstrap
|
||||
@test -d js/server || mkdir js/server
|
||||
@builddir@/.setup-js-directories:
|
||||
@test -d html/admin/js/modules || mkdir -p html/admin/js/modules
|
||||
@test -d js/common/bootstrap || mkdir -p js/common/bootstrap
|
||||
@test -d js/client || mkdir -p js/client
|
||||
@test -d js/server || mkdir -p js/server
|
||||
@touch $@
|
||||
|
||||
################################################################################
|
||||
|
|
@ -46,9 +45,9 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
|
|||
|
||||
CLEANUP += $(JAVASCRIPT_HEADER) .setup-js-directories
|
||||
|
||||
################################################################################
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- END-OF-FILE
|
||||
################################################################################
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
## Local Variables:
|
||||
## mode: outline-minor
|
||||
|
|
|
|||
|
|
@ -76,6 +76,11 @@ function main (argv) {
|
|||
|
||||
var hash = internal.sha256(password);
|
||||
|
||||
if (username == "" ) {
|
||||
internal.output("username must not be empty\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
var user = users.firstExample({ user: username });
|
||||
|
||||
if (user == null) {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# -*- mode: Makefile; -*-
|
||||
|
||||
################################################################################
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- LIBRARY
|
||||
################################################################################
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
################################################################################
|
||||
### @brief library "libarango.a"
|
||||
|
|
@ -239,9 +239,9 @@ BISONXX_FILES += \
|
|||
PROTOBUF_FILES += \
|
||||
lib/ProtocolBuffers/arangodb.pb.cpp
|
||||
|
||||
################################################################################
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- END-OF-FILE
|
||||
################################################################################
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
## Local Variables:
|
||||
## mode: outline-minor
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
# -*- mode: Makefile; -*-
|
||||
|
||||
################################################################################
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- MRUBY
|
||||
################################################################################
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
################################################################################
|
||||
### @brief sets up the directories
|
||||
################################################################################
|
||||
|
||||
BUILT_SOURCES += .setup-mr-directories
|
||||
BUILT_SOURCES += @builddir@/.setup-mr-directories
|
||||
|
||||
.setup-mr-directories:
|
||||
@test -d mr || mkdir mr
|
||||
@test -d mr/common/bootstrap || mkdir mr/common/bootstrap
|
||||
@builddir@/.setup-mr-directories:
|
||||
@test -d mr/common/bootstrap || mkdir -p mr/common/bootstrap
|
||||
@test -d mr/server || mkdir -p mr/server
|
||||
@touch $@
|
||||
|
||||
mr/common/bootstrap/mr-%.h: @srcdir@/mr/common/bootstrap/%.rb .setup-mr-directories
|
||||
|
|
@ -27,9 +27,9 @@ mr/server/mr-%.h: @srcdir@/mr/server/%.rb .setup-mr-directories
|
|||
|
||||
CLEANUP += $(MRUBY_HEADER) .setup-mr-directories
|
||||
|
||||
################################################################################
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- END-OF-FILE
|
||||
################################################################################
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
## Local Variables:
|
||||
## mode: outline-minor
|
||||
|
|
|
|||
|
|
@ -0,0 +1,75 @@
|
|||
# -*- mode: Makefile; -*-
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- UTIL SCRIPTS
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
################################################################################
|
||||
### @brief /sbin programs
|
||||
################################################################################
|
||||
|
||||
sbin_PROGRAMS += \
|
||||
bin/arango-password \
|
||||
bin/arango-dfdb
|
||||
|
||||
# bin/arango-upgrade
|
||||
|
||||
################################################################################
|
||||
### @brief arango password
|
||||
################################################################################
|
||||
|
||||
# exclude arango skripts from sources list
|
||||
bin_arango_password_SOURCES =
|
||||
|
||||
bin/arango-password: utils/arango-password.in
|
||||
sed \
|
||||
-e 's%@SBINDIR@%${TRI_SBINDIR}%g' \
|
||||
-e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \
|
||||
-e 's%@PKGDATADIR@%${TRI_PKGDATADIR}%g' \
|
||||
$< > $@
|
||||
chmod 755 $@
|
||||
|
||||
CLEANUP += bin/arango-password
|
||||
|
||||
################################################################################
|
||||
### @brief arango upgrade
|
||||
################################################################################
|
||||
|
||||
# exclude arango skripts from sources list
|
||||
bin_arango_upgrade_SOURCES =
|
||||
|
||||
bin/arango-upgrade: bin/arango-upgrade.in
|
||||
sed \
|
||||
-e 's%@SBINDIR@%${TRI_SBINDIR}%g' \
|
||||
-e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \
|
||||
-e 's%@PKGDATADIR@%${TRI_PKGDATADIR}%g' \
|
||||
$< > $@
|
||||
chmod 755 $@
|
||||
|
||||
CLEANUP += bin/arango-upgrade
|
||||
|
||||
################################################################################
|
||||
### @brief arango datafile debugger
|
||||
################################################################################
|
||||
|
||||
# exclude arango skrips from sources list
|
||||
bin_arango_dfdb_SOURCES =
|
||||
|
||||
bin/arango-dfdb: utils/arango-dfdb.in
|
||||
sed \
|
||||
-e 's%@SBINDIR@%${TRI_SBINDIR}%g' \
|
||||
-e 's%@DATABASEDIR@%${TRI_DATABASEDIR}%g' \
|
||||
-e 's%@PKGDATADIR@%${TRI_PKGDATADIR}%g' \
|
||||
$< > $@
|
||||
chmod 755 $@
|
||||
|
||||
CLEANUP += bin/arango-dfdb
|
||||
|
||||
## -----------------------------------------------------------------------------
|
||||
## --SECTION-- END-OF-FILE
|
||||
## -----------------------------------------------------------------------------
|
||||
|
||||
## Local Variables:
|
||||
## mode: outline-minor
|
||||
## outline-regexp: "^\\(### @brief\\|## --SECTION--\\|# -\\*- \\)"
|
||||
## End:
|
||||
|
|
@ -3,8 +3,9 @@
|
|||
# Placeholders starting with @ will be replaced by make
|
||||
|
||||
ARANGOD="@SBINDIR@/arangod"
|
||||
DATABASE="@DATABASE@"
|
||||
SCRIPT="@STATICFILES@/js/server/arango-dfdb.js"
|
||||
DATABASE="@DATABASEDIR@"
|
||||
MODULESPATH="@PKGDATADIR@/js/server/modules;@PKGDATADIR@/js/common/modules"
|
||||
SCRIPT="@PKGDATADIR@/js/server/arango-dfdb.js"
|
||||
|
||||
if [ "$1" == "--database" ] || [ "$1" == "--database.directory" ] ; then
|
||||
shift
|
||||
|
|
@ -12,9 +13,18 @@ if [ "$1" == "--database" ] || [ "$1" == "--database.directory" ] ; then
|
|||
shift
|
||||
fi
|
||||
|
||||
if test -z "$DATABASE"; then
|
||||
echo "$0: please specify a database directory using '--database'"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test ! -d "$DATABASE"; then
|
||||
echo "$0: database directory '$DATABASE' does not exist"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
$ARANGOD -c none --database.directory "$DATABASE" --javascript.script "$SCRIPT"
|
||||
$ARANGOD \
|
||||
-c none \
|
||||
--database.directory "$DATABASE" \
|
||||
--javascript.modules-path "$MODULESPATH" \
|
||||
--javascript.script "$SCRIPT"
|
||||
|
|
|
|||
|
|
@ -3,8 +3,9 @@
|
|||
# Placeholders starting with @ will be replaced by make
|
||||
|
||||
ARANGOD="@SBINDIR@/arangod"
|
||||
DATABASE="@DATABASE@"
|
||||
SCRIPT="@STATICFILES@/js/server/arango-password.js"
|
||||
DATABASE="@DATABASEDIR@"
|
||||
MODULESPATH="@PKGDATADIR@/js/server/modules;@PKGDATADIR@/js/common/modules"
|
||||
SCRIPT="@PKGDATADIR@/js/server/arango-password.js"
|
||||
|
||||
if [ "$#" -lt 1 ]; then
|
||||
echo "usage: $0 [--database <path>] <username> [<password>]"
|
||||
|
|
@ -22,6 +23,11 @@ if [ "$1" == "--database" ] || [ "$1" == "--database.directory" ] ; then
|
|||
shift
|
||||
fi
|
||||
|
||||
if test -z "$DATABASE"; then
|
||||
echo "$0: please specify a database directory using '--database'"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test ! -d "$DATABASE"; then
|
||||
echo "$0: database directory '$DATABASE' does not exist"
|
||||
exit 1
|
||||
|
|
@ -35,7 +41,18 @@ if echo "$USER" | grep -q "[^a-zA-Z0-0_-]"; then
|
|||
fi
|
||||
|
||||
if [ "$#" -lt 2 ]; then
|
||||
$ARANGOD -c none --database.directory "$DATABASE" --javascript.script "$SCRIPT" --javascript.script-parameter "$USER"
|
||||
$ARANGOD \
|
||||
-c none \
|
||||
--database.directory "$DATABASE" \
|
||||
--javascript.modules-path "$MODULESPATH" \
|
||||
--javascript.script "$SCRIPT" \
|
||||
--javascript.script-parameter "$USER"
|
||||
else
|
||||
$ARANGOD -c none --database.directory "$DATABASE" --javascript.script "$SCRIPT" --javascript.script-parameter "$USER" --javascript.script-parameter "$2"
|
||||
$ARANGOD \
|
||||
-c none \
|
||||
--database.directory "$DATABASE" \
|
||||
--javascript.modules-path "$MODULESPATH" \
|
||||
--javascript.script "$SCRIPT" \
|
||||
--javascript.script-parameter "$USER" \
|
||||
--javascript.script-parameter "$2"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue