Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed relative paths

This commit is contained in:
Frank Celler 2012-07-16 13:45:13 +02:00
parent 9d9136595e
commit 16407018d7
7 changed files with 173 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installation/arangod.conf.in
View File

@ -5,6 +5,8 @@ directory= @DATABASE@
[server] [server]
http-port = localhost:8529 http-port = localhost:8529
http-auth = no
disable-admin-interface = no
admin-port = localhost:8530 admin-port = localhost:8530
admin-directory= @STATICFILES@/html/admin admin-directory= @STATICFILES@/html/admin
threads = 5 threads = 5

56
Makefile.am
View File

@ -56,14 +56,7 @@ PROTOBUF_FILES =
### @brief preprocessor flags ### @brief preprocessor flags
################################################################################ ################################################################################
arangosysconfdir=$(sysconfdir)/$(PACKAGE_TARNAME)
databasedir=$(localstatedir)/$(PACKAGE_TARNAME)
logdir=$(localstatedir)/log/$(PACKAGE_TARNAME)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-D_SYSCONFDIR_='"${arangosysconfdir}"' \
-D_PKGDATADIR_='"${pkgdatadir}"' \
-D_DATABASEDIR_='"${databasedir}"' \
-I@top_srcdir@/lib \ -I@top_srcdir@/lib \
@BOOST_CPPFLAGS@ \ @BOOST_CPPFLAGS@ \
@LIBEV_CPPFLAGS@ \ @LIBEV_CPPFLAGS@ \
@ -81,6 +74,42 @@ AM_CPPFLAGS += \
endif endif
if ENABLE_RELATIVE_SYSTEM
TRI_LOG_DIR=$(prefix)/var/log/$(PACKAGE_TARNAME)
TRI_PKGDATA_DIR=$(prefix)/share/$(PACKAGE_TARNAME)
TRI_SBIN_DIR=${prefix}/sbin
TRI_SYSCONF_DIR=${prefix}/etc/$(PACKAGE_TARNAME)
else
if ENABLE_RELATIVE_DEVEL
TRI_DATABASE_DIR=$(localstatedir)/$(PACKAGE_TARNAME)
TRI_LOG_DIR=/tmp
TRI_PKGDATA_DIR=.
TRI_SBIN_DIR=bin
AM_CPPFLAGS += \
-D_DATABASEDIR_='"${TRI_DATABASE_DIR}"'
else
TRI_DATABASE_DIR=$(localstatedir)/$(PACKAGE_TARNAME)
TRI_LOG_DIR=$(localstatedir)/log/$(PACKAGE_TARNAME)
TRI_PKGDATA_DIR=${pkgdatadir}
TRI_SBIN_DIR=${sbindir}
TRI_SYSCONF_DIR=$(sysconfdir)/$(PACKAGE_TARNAME)
AM_CPPFLAGS += \
-D_DATABASEDIR_='"${TRI_DATABASE_DIR}"' \
-D_PKGDATADIR_='"${TRI_PKGDATA_DIR}"' \
-D_SYSCONFDIR_='"${TRI_SYSCONF_DIR}"'
endif
endif
################################################################################ ################################################################################
### @brief linker flags ### @brief linker flags
################################################################################ ################################################################################
@ -186,15 +215,16 @@ endif
### @brief /etc data ### @brief /etc data
################################################################################ ################################################################################
arangosysconfdir=$(sysconfdir)/$(PACKAGE_TARNAME)
arangosysconf_DATA = Installation/arangod.conf arangosysconf_DATA = Installation/arangod.conf
BUILT_SOURCES += Installation/arangod.conf BUILT_SOURCES += Installation/arangod.conf
Installation/arangod.conf: Installation/arangod.conf.in Makefile Installation/arangod.conf: Installation/arangod.conf.in Makefile
sed \ sed \
-e 's%@LOGDIR@%${logdir}%g' \ -e 's%@LOGDIR@%${TRI_LOG_DIR}%g' \
-e 's%@DATABASE@%${databasedir}%g' \ -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \
-e 's%@STATICFILES@%${pkgdatadir}%g' \ -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \
$< > $@ $< > $@
################################################################################ ################################################################################
@ -308,9 +338,9 @@ built-sources: build.h errorfiles $(JAVASCRIPT_HEADER)
bin/arango-password: bin/arango-password.in bin/arango-password: bin/arango-password.in
sed \ sed \
-e 's%@SBINDIR@%${DESTDIR}${sbindir}%g' \ -e 's%@SBINDIR@%${TRI_SBIN_DIR}%g' \
-e 's%@DATABASE@%${databasedir}%g' \ -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \
-e 's%@STATICFILES@%${pkgdatadir}%g' \ -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \
$< > $@ $< > $@
chmod 755 $@ chmod 755 $@

123
Makefile.in
View File

@ -204,20 +204,28 @@ target_triplet = @target@
@ENABLE_ZEROMQ_TRUE@am__append_1 = \ @ENABLE_ZEROMQ_TRUE@am__append_1 = \
@ENABLE_ZEROMQ_TRUE@ @ZEROMQ_CPPFLAGS@ @ENABLE_ZEROMQ_TRUE@ @ZEROMQ_CPPFLAGS@
@ENABLE_ZEROMQ_TRUE@am__append_2 = \ @ENABLE_RELATIVE_DEVEL_TRUE@@ENABLE_RELATIVE_SYSTEM_FALSE@am__append_2 = \
@ENABLE_RELATIVE_DEVEL_TRUE@@ENABLE_RELATIVE_SYSTEM_FALSE@ -D_DATABASEDIR_='"${TRI_DATABASE_DIR}"'
@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@am__append_3 = \
@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@ -D_DATABASEDIR_='"${TRI_DATABASE_DIR}"' \
@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@ -D_PKGDATADIR_='"${TRI_PKGDATA_DIR}"' \
@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@ -D_SYSCONFDIR_='"${TRI_SYSCONF_DIR}"'
@ENABLE_ZEROMQ_TRUE@am__append_4 = \
@ENABLE_ZEROMQ_TRUE@ @ZEROMQ_LDFLAGS@ @ENABLE_ZEROMQ_TRUE@ @ZEROMQ_LDFLAGS@
################################################################################ ################################################################################
### @brief ruby additions ### @brief ruby additions
################################################################################ ################################################################################
@ENABLE_MRUBY_TRUE@am__append_3 = @MRUBY_CPPFLAGS@ @MRUBY_LDFLAGS@ @ENABLE_MRUBY_TRUE@am__append_5 = @MRUBY_CPPFLAGS@ @MRUBY_LDFLAGS@
@ENABLE_MRUBY_TRUE@am__append_4 = @MRUBY_LIBS@ @ENABLE_MRUBY_TRUE@am__append_6 = @MRUBY_LIBS@
sbin_PROGRAMS = bin/arangod$(EXEEXT) bin/arango-password$(EXEEXT) sbin_PROGRAMS = bin/arangod$(EXEEXT) bin/arango-password$(EXEEXT)
bin_PROGRAMS = bin/arangosh$(EXEEXT) bin/arangoimp$(EXEEXT) \ bin_PROGRAMS = bin/arangosh$(EXEEXT) bin/arangoimp$(EXEEXT) \
$(am__EXEEXT_1) $(am__EXEEXT_1)
noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
@ENABLE_ZEROMQ_TRUE@am__append_5 = \ @ENABLE_ZEROMQ_TRUE@am__append_7 = \
@ENABLE_ZEROMQ_TRUE@ bin/zclient \ @ENABLE_ZEROMQ_TRUE@ bin/zclient \
@ENABLE_ZEROMQ_TRUE@ bin/zserver @ENABLE_ZEROMQ_TRUE@ bin/zserver
@ -225,9 +233,9 @@ noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
################################################################################ ################################################################################
### @brief ruby additions ### @brief ruby additions
################################################################################ ################################################################################
@ENABLE_MRUBY_TRUE@am__append_6 = lib/libarango_mruby.a @ENABLE_MRUBY_TRUE@am__append_8 = lib/libarango_mruby.a
@ENABLE_MRUBY_TRUE@am__append_7 = bin/arangoirb @ENABLE_MRUBY_TRUE@am__append_9 = bin/arangoirb
@ENABLE_MRUBY_TRUE@am__append_8 = \ @ENABLE_MRUBY_TRUE@am__append_10 = \
@ENABLE_MRUBY_TRUE@ $(shell find @srcdir@/mr/actions/system -name "*.rb" -print) @ENABLE_MRUBY_TRUE@ $(shell find @srcdir@/mr/actions/system -name "*.rb" -print)
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
@ -250,51 +258,51 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/lib/BasicsC/local-configuration.h.in \ $(top_srcdir)/lib/BasicsC/local-configuration.h.in \
config/compile config/config.guess config/config.sub \ config/compile config/config.guess config/config.sub \
config/depcomp config/install-sh config/missing config/depcomp config/install-sh config/missing
@ENABLE_ZEROMQ_TRUE@am__append_9 = \ @ENABLE_ZEROMQ_TRUE@am__append_11 = \
@ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ApplicationZeroMQ.cpp \ @ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ApplicationZeroMQ.cpp \
@ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ZeroMQBatchJob.cpp \ @ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ZeroMQBatchJob.cpp \
@ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ZeroMQThread.cpp \ @ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ZeroMQThread.cpp \
@ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ZeroMQQueueThread.cpp \ @ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ZeroMQQueueThread.cpp \
@ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ZeroMQWorkerThread.cpp @ENABLE_ZEROMQ_TRUE@ lib/ZeroMQ/ZeroMQWorkerThread.cpp
@ENABLE_MRUBY_TRUE@am__append_10 = \ @ENABLE_MRUBY_TRUE@am__append_12 = \
@ENABLE_MRUBY_TRUE@ lib/libarango_mruby.a \ @ENABLE_MRUBY_TRUE@ lib/libarango_mruby.a \
@ENABLE_MRUBY_TRUE@ @MRUBY_LIBS@ @ENABLE_MRUBY_TRUE@ @MRUBY_LIBS@
@ENABLE_MRUBY_TRUE@am__append_11 = \ @ENABLE_MRUBY_TRUE@am__append_13 = \
@ENABLE_MRUBY_TRUE@ arangod/MRServer/ApplicationMR.cpp \ @ENABLE_MRUBY_TRUE@ arangod/MRServer/ApplicationMR.cpp \
@ENABLE_MRUBY_TRUE@ arangod/MRServer/mr-actions.cpp @ENABLE_MRUBY_TRUE@ arangod/MRServer/mr-actions.cpp
@ENABLE_ZEROMQ_TRUE@am__append_12 = \ @ENABLE_ZEROMQ_TRUE@am__append_14 = \
@ENABLE_ZEROMQ_TRUE@ @ZEROMQ_LIBS@ @ENABLE_ZEROMQ_TRUE@ @ZEROMQ_LIBS@
@ENABLE_BOOST_TEST_TRUE@am__append_13 = UnitTests/basics_suite UnitTests/geo_suite @ENABLE_BOOST_TEST_TRUE@am__append_15 = UnitTests/basics_suite UnitTests/geo_suite
@ENABLE_BOOST_TEST_FALSE@UnitTests_basics_suite_DEPENDENCIES = @ENABLE_BOOST_TEST_FALSE@UnitTests_basics_suite_DEPENDENCIES =
@ENABLE_BOOST_TEST_FALSE@UnitTests_geo_suite_DEPENDENCIES = @ENABLE_BOOST_TEST_FALSE@UnitTests_geo_suite_DEPENDENCIES =
@ENABLE_ERRORS_DEPENDENCY_TRUE@am__append_14 = \ @ENABLE_ERRORS_DEPENDENCY_TRUE@am__append_16 = \
@ENABLE_ERRORS_DEPENDENCY_TRUE@ errorfiles @ENABLE_ERRORS_DEPENDENCY_TRUE@ errorfiles
@ENABLE_MRUBY_TRUE@am__append_15 = .setup-mr-directories @ENABLE_MRUBY_TRUE@am__append_17 = .setup-mr-directories
################################################################################ ################################################################################
### @brief cleanup ### @brief cleanup
################################################################################ ################################################################################
@ENABLE_MRUBY_TRUE@am__append_16 = $(MRUBY_HEADER) .setup-mr-directories @ENABLE_MRUBY_TRUE@am__append_18 = $(MRUBY_HEADER) .setup-mr-directories
@ENABLE_FLEX_TRUE@am__append_17 = $(FLEX_FILES) $(FLEXXX_FILES) @ENABLE_FLEX_TRUE@am__append_19 = $(FLEX_FILES) $(FLEXXX_FILES)
################################################################################ ################################################################################
### @brief cleanup ### @brief cleanup
################################################################################ ################################################################################
@ENABLE_FLEX_TRUE@am__append_18 = $(FLEX_FILES) $(FLEXXX_FILES) @ENABLE_FLEX_TRUE@am__append_20 = $(FLEX_FILES) $(FLEXXX_FILES)
@ENABLE_BISON_TRUE@am__append_19 = $(BISON_FILES) $(BISONXX_FILES) @ENABLE_BISON_TRUE@am__append_21 = $(BISON_FILES) $(BISONXX_FILES)
################################################################################ ################################################################################
### @brief CLEANUP ### @brief CLEANUP
################################################################################ ################################################################################
@ENABLE_BISON_TRUE@am__append_20 = $(BISON_FILES) $(BISONXX_FILES) @ENABLE_BISON_TRUE@am__append_22 = $(BISON_FILES) $(BISONXX_FILES)
@ENABLE_ALL_IN_ONE_TRUE@am__append_21 = @LIBEV_LIBS@ @V8_LIBS@ @ENABLE_ALL_IN_ONE_TRUE@am__append_23 = @LIBEV_LIBS@ @V8_LIBS@
@ENABLE_MRUBY_TRUE@am__append_22 = @MRUBY_LIBS@ @ENABLE_MRUBY_TRUE@am__append_24 = @MRUBY_LIBS@
@ENABLE_ZEROMQ_TRUE@am__append_23 = @ZEROMQ_LIBS@ @ENABLE_ZEROMQ_TRUE@am__append_25 = @ZEROMQ_LIBS@
subdir = . subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
@ -905,7 +913,7 @@ LIBOBJS = @LIBOBJS@
### @brief libraries ### @brief libraries
################################################################################ ################################################################################
LIBS = @BOOST_LIBS@ @LIBEV_LIBS@ @MATH_LIBS@ @NCURSES_LIBS@ \ LIBS = @BOOST_LIBS@ @LIBEV_LIBS@ @MATH_LIBS@ @NCURSES_LIBS@ \
@OPENSSL_LIBS@ @PROTOBUF_LIBS@ @READLINE_LIBS@ $(am__append_4) @OPENSSL_LIBS@ @PROTOBUF_LIBS@ @READLINE_LIBS@ $(am__append_6)
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
@ -1016,11 +1024,11 @@ ACLOCAL_AMFLAGS = -I m4
### @brief source to build before compile ### @brief source to build before compile
################################################################################ ################################################################################
BUILT_SOURCES = build.h Installation/arangod.conf $(JAVASCRIPT_HEADER) \ BUILT_SOURCES = build.h Installation/arangod.conf $(JAVASCRIPT_HEADER) \
$(JAVASCRIPT_BROWSER) $(MRUBY_HEADER) $(am__append_14) \ $(JAVASCRIPT_BROWSER) $(MRUBY_HEADER) $(am__append_16) \
$(am__append_15) Doxygen/.setup-directories \ $(am__append_17) Doxygen/.setup-directories \
.setup-js-directories $(am__append_17) $(am__append_19) \ .setup-js-directories $(am__append_19) $(am__append_21) \
@PROTOBUF_LIBS@ $(PROTOBUF_FILES) $(am__append_21) \ @PROTOBUF_LIBS@ $(PROTOBUF_FILES) $(am__append_23) \
$(am__append_22) $(am__append_23) $(am__append_24) $(am__append_25)
################################################################################ ################################################################################
### @brief files to cleanup ### @brief files to cleanup
@ -1037,10 +1045,10 @@ BUILT_SOURCES = build.h Installation/arangod.conf $(JAVASCRIPT_HEADER) \
################################################################################ ################################################################################
### @brief cleanup ### @brief cleanup
################################################################################ ################################################################################
CLEANUP = bin/arango-password $(am__append_16) $(DOXYGEN) $(addsuffix \ CLEANUP = bin/arango-password $(am__append_18) $(DOXYGEN) $(addsuffix \
.md,$(addprefix Doxygen/xml/,$(WIKI))) $(addsuffix \ .md,$(addprefix Doxygen/xml/,$(WIKI))) $(addsuffix \
.md,$(addprefix Doxygen/wiki/,$(WIKI))) $(JAVASCRIPT_HEADER) \ .md,$(addprefix Doxygen/wiki/,$(WIKI))) $(JAVASCRIPT_HEADER) \
.setup-js-directories $(am__append_18) $(am__append_20) \ .setup-js-directories $(am__append_20) $(am__append_22) \
$(PROTOBUF_FILES) $(PROTOBUF_FILES)
################################################################################ ################################################################################
@ -1102,23 +1110,31 @@ PROTOBUF_FILES = lib/ProtocolBuffers/arangodb.pb.cpp
################################################################################ ################################################################################
### @brief preprocessor flags ### @brief preprocessor flags
################################################################################ ################################################################################
arangosysconfdir = $(sysconfdir)/$(PACKAGE_TARNAME) AM_CPPFLAGS = -I@top_srcdir@/lib @BOOST_CPPFLAGS@ @LIBEV_CPPFLAGS@ \
databasedir = $(localstatedir)/$(PACKAGE_TARNAME) @MATH_CPPFLAGS@ @NCURSES_CPPFLAGS@ @OPENSSL_CPPFLAGS@ \
logdir = $(localstatedir)/log/$(PACKAGE_TARNAME) @READLINE_CPPFLAGS@ @PROTOBUF_CPPFLAGS@ @V8_CPPFLAGS@ \
AM_CPPFLAGS = -D_SYSCONFDIR_='"${arangosysconfdir}"' \ $(am__append_1) $(am__append_2) $(am__append_3) \
-D_PKGDATADIR_='"${pkgdatadir}"' \ $(am__append_5)
-D_DATABASEDIR_='"${databasedir}"' -I@top_srcdir@/lib \ @ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_LOG_DIR = $(localstatedir)/log/$(PACKAGE_TARNAME)
@BOOST_CPPFLAGS@ @LIBEV_CPPFLAGS@ @MATH_CPPFLAGS@ \ @ENABLE_RELATIVE_DEVEL_TRUE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_LOG_DIR = /tmp
@NCURSES_CPPFLAGS@ @OPENSSL_CPPFLAGS@ @READLINE_CPPFLAGS@ \ @ENABLE_RELATIVE_SYSTEM_TRUE@TRI_LOG_DIR = $(prefix)/var/log/$(PACKAGE_TARNAME)
@PROTOBUF_CPPFLAGS@ @V8_CPPFLAGS@ $(am__append_1) \ @ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_PKGDATA_DIR = ${pkgdatadir}
$(am__append_3) @ENABLE_RELATIVE_DEVEL_TRUE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_PKGDATA_DIR = .
@ENABLE_RELATIVE_SYSTEM_TRUE@TRI_PKGDATA_DIR = $(prefix)/share/$(PACKAGE_TARNAME)
@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_SBIN_DIR = ${sbindir}
@ENABLE_RELATIVE_DEVEL_TRUE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_SBIN_DIR = bin
@ENABLE_RELATIVE_SYSTEM_TRUE@TRI_SBIN_DIR = ${prefix}/sbin
@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_SYSCONF_DIR = $(sysconfdir)/$(PACKAGE_TARNAME)
@ENABLE_RELATIVE_SYSTEM_TRUE@TRI_SYSCONF_DIR = ${prefix}/etc/$(PACKAGE_TARNAME)
@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_DATABASE_DIR = $(localstatedir)/$(PACKAGE_TARNAME)
@ENABLE_RELATIVE_DEVEL_TRUE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_DATABASE_DIR = $(localstatedir)/$(PACKAGE_TARNAME)
################################################################################ ################################################################################
### @brief linker flags ### @brief linker flags
################################################################################ ################################################################################
AM_LDFLAGS = @BOOST_LDFLAGS@ @LIBEV_LDFLAGS@ @MATH_LDFLAGS@ \ AM_LDFLAGS = @BOOST_LDFLAGS@ @LIBEV_LDFLAGS@ @MATH_LDFLAGS@ \
@NCURSES_LDFLAGS@ @OPENSSL_LDFLAGS@ @READLINE_LDFLAGS@ \ @NCURSES_LDFLAGS@ @OPENSSL_LDFLAGS@ @READLINE_LDFLAGS@ \
@PROTOBUF_LDFLAGS@ @V8_LDFLAGS@ $(am__append_2) @PROTOBUF_LDFLAGS@ @V8_LDFLAGS@ $(am__append_4)
################################################################################ ################################################################################
################################################################################ ################################################################################
@ -1127,11 +1143,12 @@ AM_LDFLAGS = @BOOST_LDFLAGS@ @LIBEV_LDFLAGS@ @MATH_LDFLAGS@ \
### @brief auxiliary libraries ### @brief auxiliary libraries
################################################################################ ################################################################################
noinst_LIBRARIES = lib/libarango.a lib/libarango_v8.a \ noinst_LIBRARIES = lib/libarango.a lib/libarango_v8.a \
lib/libarango_fe.a lib/libarango_client.a $(am__append_6) lib/libarango_fe.a lib/libarango_client.a $(am__append_8)
################################################################################ ################################################################################
### @brief /etc data ### @brief /etc data
################################################################################ ################################################################################
arangosysconfdir = $(sysconfdir)/$(PACKAGE_TARNAME)
arangosysconf_DATA = Installation/arangod.conf arangosysconf_DATA = Installation/arangod.conf
################################################################################ ################################################################################
@ -1146,7 +1163,7 @@ nobase_pkgdata_DATA = $(shell find @srcdir@/js/actions -name "*.js" \
"*.html" -print) $(shell find @srcdir@/html -name "*.ico" \ "*.html" -print) $(shell find @srcdir@/html -name "*.ico" \
-print) $(shell find @srcdir@/html -name "*.js" -print) \ -print) $(shell find @srcdir@/html -name "*.js" -print) \
$(shell find @srcdir@/html -name "*.png" -print) \ $(shell find @srcdir@/html -name "*.png" -print) \
$(am__append_8) $(am__append_10)
JAVASCRIPT_HEADER = \ JAVASCRIPT_HEADER = \
js/common/bootstrap/js-errors.h \ js/common/bootstrap/js-errors.h \
js/common/bootstrap/js-modules.h \ js/common/bootstrap/js-modules.h \
@ -1307,7 +1324,7 @@ lib_libarango_a_SOURCES = lib/Basics/ConditionLocker.cpp \
lib/Variant/VariantObject.cpp lib/Variant/VariantString.cpp \ lib/Variant/VariantObject.cpp lib/Variant/VariantString.cpp \
lib/Variant/VariantUInt16.cpp lib/Variant/VariantUInt32.cpp \ lib/Variant/VariantUInt16.cpp lib/Variant/VariantUInt32.cpp \
lib/Variant/VariantUInt64.cpp lib/Variant/VariantUInt8.cpp \ lib/Variant/VariantUInt64.cpp lib/Variant/VariantUInt8.cpp \
lib/Variant/VariantVector.cpp $(am__append_9) lib/Variant/VariantVector.cpp $(am__append_11)
################################################################################ ################################################################################
### @brief library "libarango.a", client part ### @brief library "libarango.a", client part
@ -1402,8 +1419,8 @@ bin_arangod_CPPFLAGS = \
$(AM_CPPFLAGS) $(AM_CPPFLAGS)
bin_arangod_LDADD = lib/libarango_fe.a lib/libarango_v8.a \ bin_arangod_LDADD = lib/libarango_fe.a lib/libarango_v8.a \
lib/libarango.a $(LIBS) @V8_LIBS@ $(am__append_10) \ lib/libarango.a $(LIBS) @V8_LIBS@ $(am__append_12) \
$(am__append_12) $(am__append_14)
bin_arangod_SOURCES = arangod/Actions/actions.cpp \ bin_arangod_SOURCES = arangod/Actions/actions.cpp \
arangod/Actions/ActionDispatcherThread.cpp \ arangod/Actions/ActionDispatcherThread.cpp \
arangod/Actions/RestActionHandler.cpp \ arangod/Actions/RestActionHandler.cpp \
@ -1458,7 +1475,7 @@ bin_arangod_SOURCES = arangod/Actions/actions.cpp \
arangod/VocBase/index.c arangod/VocBase/shadow-data.c \ arangod/VocBase/index.c arangod/VocBase/shadow-data.c \
arangod/VocBase/simple-collection.c \ arangod/VocBase/simple-collection.c \
arangod/VocBase/synchroniser.c arangod/VocBase/voc-shaper.c \ arangod/VocBase/synchroniser.c arangod/VocBase/voc-shaper.c \
arangod/VocBase/vocbase.c $(am__append_11) arangod/VocBase/vocbase.c $(am__append_13)
bin_arangosh_CPPFLAGS = \ bin_arangosh_CPPFLAGS = \
-I@top_srcdir@/arangosh \ -I@top_srcdir@/arangosh \
$(AM_CPPFLAGS) $(AM_CPPFLAGS)
@ -5086,9 +5103,9 @@ uninstall-am: uninstall-arangosysconfDATA uninstall-binPROGRAMS \
Installation/arangod.conf: Installation/arangod.conf.in Makefile Installation/arangod.conf: Installation/arangod.conf.in Makefile
sed \ sed \
-e 's%@LOGDIR@%${logdir}%g' \ -e 's%@LOGDIR@%${TRI_LOG_DIR}%g' \
-e 's%@DATABASE@%${databasedir}%g' \ -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \
-e 's%@STATICFILES@%${pkgdatadir}%g' \ -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \
$< > $@ $< > $@
################################################################################ ################################################################################
@ -5353,9 +5370,9 @@ built-sources: build.h errorfiles $(JAVASCRIPT_HEADER)
bin/arango-password: bin/arango-password.in bin/arango-password: bin/arango-password.in
sed \ sed \
-e 's%@SBINDIR@%${DESTDIR}${sbindir}%g' \ -e 's%@SBINDIR@%${TRI_SBIN_DIR}%g' \
-e 's%@DATABASE@%${databasedir}%g' \ -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \
-e 's%@STATICFILES@%${pkgdatadir}%g' \ -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \
$< > $@ $< > $@
chmod 755 $@ chmod 755 $@

17
arangod/RestServer/ArangoServer.cpp
View File

@ -193,12 +193,14 @@ ArangoServer::ArangoServer (int argc, char** argv)
_httpAuth(false), _httpAuth(false),
_adminPort(), _adminPort(),
_dispatcherThreads(8), _dispatcherThreads(8),
_databasePath("/var/lib/arango"), _databasePath("/var/lib/arangodb"),
_removeOnDrop(true), _removeOnDrop(true),
_removeOnCompacted(true), _removeOnCompacted(true),
_defaultMaximalSize(TRI_JOURNAL_DEFAULT_MAXIMAL_SIZE), _defaultMaximalSize(TRI_JOURNAL_DEFAULT_MAXIMAL_SIZE),
_defaultWaitForSync(false), _defaultWaitForSync(false),
_vocbase(0) { _vocbase(0) {
// locate path to binary
char* p; char* p;
p = TRI_LocateBinaryPath(argv[0]); p = TRI_LocateBinaryPath(argv[0]);
@ -206,15 +208,16 @@ ArangoServer::ArangoServer (int argc, char** argv)
TRI_FreeString(TRI_CORE_MEM_ZONE, p); TRI_FreeString(TRI_CORE_MEM_ZONE, p);
// set working directory and database directory
_workingDirectory = "/var/tmp";
#ifdef TRI_ENABLE_RELATIVE_SYSTEM #ifdef TRI_ENABLE_RELATIVE_SYSTEM
_workingDirectory = _binaryPath + "/../tmp"; _workingDirectory = _binaryPath + "/../tmp";
_databasePath = _binaryPath + "/../var/arango"; _databasePath = _binaryPath + "/../var/arangodb";
#endif #endif
_workingDirectory = "/var/tmp";
#ifdef _DATABASEDIR_ #ifdef _DATABASEDIR_
_databasePath = _DATABASEDIR_; _databasePath = _DATABASEDIR_;
#endif #endif
} }
@ -331,7 +334,7 @@ void ArangoServer::buildApplicationServer () {
#ifdef TRI_ENABLE_RELATIVE_SYSTEM #ifdef TRI_ENABLE_RELATIVE_SYSTEM
_applicationServer->setSystemConfigFile("arangod.conf", _binaryPath + "/../etc"); _applicationServer->setSystemConfigFile("arangod.conf", _binaryPath + "/../etc/arangodb");
_applicationAdminServer->allowAdminDirectory(_binaryPath + "/../share/arango/html/admin"); _applicationAdminServer->allowAdminDirectory(_binaryPath + "/../share/arango/html/admin");
#else #else

20
bin/arango-password.in
View File

@ -20,8 +20,20 @@ if [ "$1" == "--database" ]; then
shift shift
fi fi
if [ "$#" -lt 2 ]; then if test ! -d "$DATABASE"; then
$ARANGOD -c none --database.directory "$DATABASE" --javascript.script "$SCRIPT" --javascript.script-parameter "$1" echo "$0: database directory '$DATABASE' does not exit"
else exit 1
$ARANGOD -c none --database.directory "$DATABASE" --javascript.script "$SCRIPT" --javascript.script-parameter "$1" --javascript.script-parameter "$2" fi
USER="$1"
if echo "$USER" | grep -q "[^a-zA-Z0-0_-]"; then
echo "$0: username '$USER' should only contain letters, numbers, underscore and minus"
exit 1
fi
if [ "$#" -lt 2 ]; then
$ARANGOD -c none --database.directory "$DATABASE" --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"
fi fi

29
configure vendored
View File

@ -752,6 +752,10 @@ build_os
build_vendor build_vendor
build_cpu build_cpu
build build
ENABLE_RELATIVE_DEVEL_FALSE
ENABLE_RELATIVE_DEVEL_TRUE
ENABLE_RELATIVE_SYSTEM_FALSE
ENABLE_RELATIVE_SYSTEM_TRUE
ENABLE_INSTALL_DBDIR_FALSE ENABLE_INSTALL_DBDIR_FALSE
ENABLE_INSTALL_DBDIR_TRUE ENABLE_INSTALL_DBDIR_TRUE
ENABLE_BOOST_TEST_FALSE ENABLE_BOOST_TEST_FALSE
@ -2642,6 +2646,23 @@ else
fi fi
fi fi
if test "x$tr_RELATIVE" = xyes; then
ENABLE_RELATIVE_SYSTEM_TRUE=
ENABLE_RELATIVE_SYSTEM_FALSE='#'
else
ENABLE_RELATIVE_SYSTEM_TRUE='#'
ENABLE_RELATIVE_SYSTEM_FALSE=
fi
if test "x$tr_RELATIVE" = xdevel; then
ENABLE_RELATIVE_DEVEL_TRUE=
ENABLE_RELATIVE_DEVEL_FALSE='#'
else
ENABLE_RELATIVE_DEVEL_TRUE='#'
ENABLE_RELATIVE_DEVEL_FALSE=
fi
@ -9713,6 +9734,14 @@ if test -z "${ENABLE_INSTALL_DBDIR_TRUE}" && test -z "${ENABLE_INSTALL_DBDIR_FAL
as_fn_error $? "conditional \"ENABLE_INSTALL_DBDIR\" was never defined. as_fn_error $? "conditional \"ENABLE_INSTALL_DBDIR\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
if test -z "${ENABLE_RELATIVE_SYSTEM_TRUE}" && test -z "${ENABLE_RELATIVE_SYSTEM_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_RELATIVE_SYSTEM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_RELATIVE_DEVEL_TRUE}" && test -z "${ENABLE_RELATIVE_DEVEL_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_RELATIVE_DEVEL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_DARWIN_TRUE}" && test -z "${ENABLE_DARWIN_FALSE}"; then if test -z "${ENABLE_DARWIN_TRUE}" && test -z "${ENABLE_DARWIN_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_DARWIN\" was never defined. as_fn_error $? "conditional \"ENABLE_DARWIN\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5

3
configure.ac
View File

@ -130,6 +130,9 @@ else
fi fi
fi fi
AM_CONDITIONAL(ENABLE_RELATIVE_SYSTEM, test "x$tr_RELATIVE" = xyes)
AM_CONDITIONAL(ENABLE_RELATIVE_DEVEL, test "x$tr_RELATIVE" = xdevel)
dnl ============================================================================ dnl ============================================================================
dnl --SECTION-- CONFIGURATION dnl --SECTION-- CONFIGURATION
dnl ============================================================================ dnl ============================================================================