Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

3rdParty/CMakeLists.txt

@@ -98,10 +98,6 @@ set(CMAKE_USE_LIBSSH2 OFF CACHE type BOOL)
 set(CMAKE_USE_OPENSSL ON CACHE type BOOL)
 # mop: super important...if this is off curl will not handle request timeouts < 1000ms
 set(ENABLE_THREADED_RESOLVER ON CACHE type BOOL)
-# bugfix for HAVE_POSIX_STRERROR_R define on cross compiling. 
-if (CROSS_COMPILING)
- add_definitions("-DHAVE_POSIX_STRERROR_R=1")
-endif()
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/curl/curl-7.50.3)
 
 ################################################################################

Documentation/DocuBlocks/Rest/Simple Queries/JSA_put_api_simple_by_example.md

@@ -17,6 +17,12 @@ The number of documents to skip in the query (optional).
 The maximal amount of documents to return. The *skip*
 is applied before the *limit* restriction. (optional)
 
+@RESTBODYPARAM{batchSize,integer,optional,int64}
+maximum number of result documents to be transferred from
+the server to the client in one roundtrip. If this attribute is
+not set, a server-controlled default value will be used. A *batchSize* value of
+*0* is disallowed.
+
 @RESTDESCRIPTION
 
 This will find all documents matching a given example.

Installation/Jenkins/build.sh

@@ -323,13 +323,9 @@ while [ $# -gt 0 ];  do
             CLEAN_IT=1
             shift
             ;;
-        --xcArmV8)
-            ARMV8=1
-            XCGCC=1
+        --xcArm)
             shift
-            ;;
-        --xcArmV7)
-            ARMV7=1
+            TOOL_PREFIX=$1
             XCGCC=1
             shift
             ;;
@@ -390,18 +386,18 @@ elif [ "$CLANG36" == 1 ]; then
     CXXFLAGS="${CXXFLAGS} -std=c++11"
 elif [ "${XCGCC}" = 1 ]; then
     USE_JEMALLOC=0
-    if [ "${ARMV8}" = 1 ]; then
-        export TOOL_PREFIX=aarch64-linux-gnu
-        BUILD_DIR="${BUILD_DIR}-ARMV8"
-    elif [ "${ARMV7}" = 1 ]; then
-        export TOOL_PREFIX=aarch64-linux-gnu
-        BUILD_DIR="${BUILD_DIR}-ARMV7"
-    else
-        echo "Unknown XC-Compiler!"
-        exit 1;
-    fi
+    BUILD_DIR="${BUILD_DIR}-${TOOL_PREFIX}"
 
-    CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DCROSS_COMPILING=true" # -DCMAKE_LIBRARY_ARCHITECTURE=${TOOL_PREFIX} "
+    # tell cmake we're cross compiling:
+    CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DCROSS_COMPILING=true -DCMAKE_SYSTEM_NAME=Linux"
+    # -DCMAKE_LIBRARY_ARCHITECTURE=${TOOL_PREFIX} "
+    # these options would be evaluated using TRY_RUN(), which obviously doesn't work:
+    CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DHAVE_POLL_FINE_EXITCODE=0"
+    CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DHAVE_GLIBC_STRERROR_R=0"
+    CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DHAVE_GLIBC_STRERROR_R__TRYRUN_OUTPUT=TRUE"
+    CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DHAVE_POSIX_STRERROR_R=1"
+    CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DHAVE_POSIX_STRERROR_R__TRYRUN_OUTPUT=FALSE"
+    
     export CXX=$TOOL_PREFIX-g++
     export AR=$TOOL_PREFIX-ar
     export RANLIB=$TOOL_PREFIX-ranlib
@@ -409,13 +405,9 @@ elif [ "${XCGCC}" = 1 ]; then
     export LD=$TOOL_PREFIX-g++
     export LINK=$TOOL_PREFIX-g++
     export STRIP=$TOOL_PREFIX-strip
-
     # we need ARM LD:
     GOLD=0;
 
-    # tell cmake we're cross compiling:
-    CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DCROSS_COMPILING=true"
-
     # V8's mksnapshot won't work - ignore it:
     MAKE_PARAMS="${MAKE_PARAMS} -i"
 fi
@@ -470,9 +462,11 @@ if [ -z "${MSVC}" ]; then
         if [ ! -f ${STRIP} ] ; then
             STRIP=`which strip`
         fi
-        CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DCMAKE_STRIP=${STRIP}"
         export STRIP
     fi
+    if test -n "${STRIP}"; then
+        CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DCMAKE_STRIP=${STRIP}"
+    fi
 fi
 
 CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} ${MAINTAINER_MODE}"

Installation/release.sh

@@ -3,7 +3,7 @@ set -ex
 
 SCRIPT_DIR=`dirname $0`
 SRC_DIR="${SCRIPT_DIR}/../"
-ENTERPRISE_SRC_DIR=${SRC_DIR}/enterprise
+ENTERPRISE_SRC_DIR=${SRC_DIR}enterprise
 
 FORCE_TAG=0
 TAG=1
@@ -113,7 +113,7 @@ else
     fi
     echo "I'm on Branch: ${GITARGS}"
 fi
-(cd enterprise; git checkout master; git fetch --tags; git pull --all; git checkout ${GITARGS} )
+(cd enterprise; git checkout master; git fetch --tags; git pull --all; git checkout ${GITARGS}; git pull )
 
 
 
@@ -220,7 +220,7 @@ if [ "$TAG" == "1" ];  then
     fi        
 
     cd ${ENTERPRISE_SRC_DIR}
-    git commit -m "release version $VERSION enterprise" -a
+    git commit --allow-empty -m "release version $VERSION enterprise" -a
     git push
 
     if test "${FORCE_TAG}" == 0; then

scripts/build-xc-deb.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+cd ${DIR}/..
+
+EP=""
+for i in $@; do
+    if test "$i" == "--enterprise"; then
+        EP="EP"
+    fi
+done
+
+
+./Installation/Jenkins/build.sh \
+    standard \
+    --rpath \
+    --parallel 25 \
+    --package DEB \
+    $SNAP \
+    --xcArm arm-linux-gnueabihf \
+    --buildDir build-${EP}deb \
+    --targetDir /var/tmp/ \
+    --noopt \
+    $@
+
+cd ${DIR}/..