1
0
Fork 0

Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types

This commit is contained in:
jsteemann 2016-08-29 17:06:20 +02:00
commit 89e047283b
2 changed files with 21 additions and 12 deletions

View File

@ -101,16 +101,6 @@ if test -f last_compiled_version.sha; then
fi
COMPILE_MATTERS="3rdParty"
CLEAN_IT=1
if test -n "$LASTREV"; then
lines=`git diff ${LASTREV}: ${COMPILE_MATTERS} | wc -l`
if test $lines -eq 0; then
echo "no relevant changes, no need for full recompile"
CLEAN_IT=0
fi
fi
# setup make options
if test -z "${CXX}"; then
@ -193,6 +183,8 @@ case "$1" in
;;
esac
CLEAN_IT=0
while [ $# -gt 0 ]; do
case "$1" in
@ -303,7 +295,11 @@ while [ $# -gt 0 ]; do
TARGET_DIR=$1
shift
;;
--checkCleanBuild)
CLEAN_IT=1
shift
;;
*)
echo "Unknown option: $1"
exit 1
@ -311,6 +307,18 @@ while [ $# -gt 0 ]; do
esac
done
if test -n "$LASTREV"; then
lines=`git diff ${LASTREV}: ${COMPILE_MATTERS} | wc -l`
if test $lines -eq 0; then
echo "no relevant changes, no need for full recompile"
CLEAN_IT=0
fi
fi
if [ "$GCC5" == 1 ]; then
CC=/usr/bin/gcc-5
CXX=/usr/bin/g++-5

View File

@ -15,8 +15,9 @@ if [ "$1" = "configure" -a -z "$2" ]; then
/usr/sbin/arango-init-database \
--uid arangodb --gid arangodb || true
fi
db_set arangodb3/password_again ""
db_set arangodb3/password ""
db_go
fi
# check if we should upgrade the database directory