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

.gitignore

@@ -20,6 +20,7 @@ mr-*.h
 
 Doxygen/doc/
 Doxygen/manuals/
+Doxygen/man/
 Doxygen/website/
 Doxygen/wiki/
 Doxygen/xml/

Installation/build.sh

@@ -5,19 +5,12 @@ echo "#                     build.sh                         #"
 echo "########################################################"
 echo
 
-. config/detect_distro.sh
-
 OPTIONS="--disable-dependency-tracking --disable-relative"
 PREFIX="--prefix=/usr --localstatedir=/var --sysconfdir=/etc"
 RESULTS="arangod arangosh arangoimp"
 USE_ICECC="no"
 EXTRA_MAKE_OPTIONS=""
 
-export CPPFLAGS=""
-export LDFLAGS=""
-export MAKEJ=2
-export LDD_INFO="no"
-
 while [ 0 -lt "$#" ];  do
   opt="$1"
   shift
@@ -28,11 +21,23 @@ while [ 0 -lt "$#" ];  do
       ;;
     *)
       echo "$0: unknown option '$opt'"
+      echo "usage: "
+      echo "  $0 [option]        build project"
+      echo "options:"
+      echo "  --enable-icecc     using icecc for compiling"
+      echo ""
       exit 1
       ;;
   esac
 done
 
+. config/detect_distro.sh
+
+export CPPFLAGS=""
+export LDFLAGS=""
+export MAKEJ=2
+export LDD_INFO="no"
+
 HAS_ICECC=$(ps aux | grep -v "grep" | grep iceccd)
 
 if [ "x$HAS_ICECC" != "x" -a "x$USE_ICECC" == "xyes" ] ; then
@@ -69,7 +74,7 @@ case $TRI_OS_LONG in
 
   Linux-openSUSE-12*)
     echo "Using configuration for openSuSE 12.X"
-    OPTIONS="$OPTIONS --enable-flex --enable-bison --disable-mruby "
+    OPTIONS="$OPTIONS --disable-mruby "
     LDD_INFO="yes"
     RESULTS="$RESULTS arangoirb"
     ;;
@@ -144,7 +149,6 @@ echo
 make setup || exit 1
 fi
 
-
 echo
 echo "########################################################"
 echo "CPPFLAGS: $CPPFLAGS"
@@ -187,3 +191,17 @@ for result in $RESULTS;  do
     echo
   fi
 done
+
+
+echo
+echo "########################################################"
+echo "create man pages:"
+echo "    make man "
+echo "########################################################"
+echo
+
+mkdir Doxygen/man
+mkdir Doxygen/man/man1
+mkdir Doxygen/man/man8
+
+make man

Installation/epm/arangodb.list

@@ -52,6 +52,10 @@ d 0755 ${susr} ${sgrp} /var/run/arangodb -
 # logfile directory
 d 0755 ${susr} ${sgrp} /var/log/arangodb -
 
+d 0755 ${rusr} ${rgrp} ${mandir} -
+d 0755 ${rusr} ${rgrp} ${mandir}/man1 -
+d 0755 ${rusr} ${rgrp} ${mandir}/man8 -
+
 %include ${project_dir}/Installation/epm/arangodb.sublist
 
 ################################################################################
@@ -107,6 +111,8 @@ if [ "`find ${data_dir}/arangodb -type d -name 'collection-*'`" == "" ] ; then
   ${bindir}/arango-upgrade --database.directory "${data_dir}/arangodb" --uid ${susr}
 fi
 
+echo "${install_message}"
+
 exit 0
 EOF
 
@@ -130,6 +136,8 @@ if [ "`find ${data_dir}/arangodb -type d -name 'collection-*'`" == "" ] ; then
   ${bindir}/arango-upgrade --database.directory "${data_dir}/arangodb" --uid ${susr}
 fi
 
+echo "${install_message}"
+
 exit 0
 EOF
 
@@ -154,6 +162,8 @@ if [ "`find ${data_dir}/arangodb -type d -name 'collection-*'`" == "" ] ; then
   ${bindir}/arango-upgrade --database.directory "${data_dir}/arangodb" --uid ${susr}
 fi
 
+echo "${install_message}"
+
 exit 0
 EOF
 
@@ -190,6 +200,8 @@ EOF
 %system linux
 i 0755 ${rusr} ${rgrp} arangodb ${project_dir}/Installation/Linux/${START_SCRIPT} runlevel(${runlevels})
 
+echo "${install_message}"
+
 %endif
 
 ## -----------------------------------------------------------------------------

Installation/packetize.sh

@@ -41,6 +41,7 @@ data_dir=/var/lib
 static_dir=${prefix}/share
 vers_dir=arangodb-${arangodb_version}
 docdir=${prefix}/share/doc/${vers_dir}
+mandir=${prefix}/share/man
 
 echo
 echo "########################################################"
@@ -168,8 +169,11 @@ echo
 echo "########################################################"
 echo "Call mkepmlist to create a sublist"
 
+  mkepmlist -u ${susr} -g ${sgrp} --prefix ${mandir}/man1 ${sfolder_name}/Doxygen/man/man1/*.1 >> ${SUBLIST}
+  mkepmlist -u ${susr} -g ${sgrp} --prefix ${mandir}/man8 ${sfolder_name}/Doxygen/man/man8/*.8 >> ${SUBLIST}
+
   for dir in `find js -type d`; do
-    echo "    mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/${dir} ${sfolder_name}/${dir}/*.js >> ${SUBLIST}"
+    # echo "    mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/${dir} ${sfolder_name}/${dir}/*.js >> ${SUBLIST}"
     mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/${dir} ${sfolder_name}/${dir}/*.js >> ${SUBLIST}
   done
 
@@ -178,7 +182,7 @@ echo "Call mkepmlist to create a sublist"
       FILES=${sfolder_name}/html/admin/${dir}/*.${typ}
 
       if test "${FILES}" != "${sfolder_name}/html/admin/${dir}/\*.${typ}";  then
-        echo "    mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/html/admin/${dir} ${sfolder_name}/html/admin/${dir}/*.${typ} >> ${SUBLIST}"
+        # echo "    mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/html/admin/${dir} ${sfolder_name}/html/admin/${dir}/*.${typ} >> ${SUBLIST}"
         mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/html/admin/${dir} ${sfolder_name}/html/admin/${dir}/*.${typ} >> ${SUBLIST}
       fi
     done
@@ -187,6 +191,30 @@ echo "Call mkepmlist to create a sublist"
 echo "########################################################"
 echo 
 
+##
+## build install/help message
+##
+
+install_message="
+
+ArangoDB (http://www.arangodb.org)
+  A universal open-source database with a flexible data model for documents, 
+  graphs, and key-values.
+
+First Steps with ArangoDB:
+  http:/www.arangodb.org/quickstart
+
+Upgrading ArangoDB:
+  http://www.arangodb.org/manuals/1.1/Upgrading.html
+
+Configuration file:
+  /etc/arangodb/arangod.conf
+
+Start ArangoDB shell client:
+  > ${bindir}/arangosh
+
+"
+
 cd ${hudson_base}
 sudo -E rm -rf ${hudson_base}/${archfolder}
 sudo -E mkdir -p ${hudson_base}/${archfolder}
@@ -213,6 +241,7 @@ echo "   export rusr=$rusr"
 echo "   export sbindir=$sbindir"
 echo "   export sgrp=$sgrp"
 echo "   export static_dir=$static_dir"
+echo "   export mandir=$mandir"
 echo "   export susr=$susr"
 echo "   export vers_dir=$vers_dir"
 echo "   export START_SCRIPT=$START_SCRIPT"
@@ -237,6 +266,8 @@ export static_dir
 export susr
 export vers_dir
 export START_SCRIPT
+export install_message
+export mandir
 
 echo 
 echo "########################################################"

arangod/Documentation/command-line-options.dox

@@ -37,6 +37,7 @@
 ///      <li>@ref CommandLineVersion "version"</li>
 ///      <li>@ref CommandLineConfiguration "configuration"</li>
 ///      <li>@ref CommandLineDaemon "daemon"</li>
+///      <li>@ref CommandLineDefaultLanguage "default-language"</li>
 ///      <li>@ref CommandLineSupervisor "supervisor"</li>
 ///      <li>@ref CommandLineUid "uid"</li>
 ///      <li>@ref CommandLineGid "gid"</li>
@@ -135,6 +136,9 @@
 /// value to the parameter pid-file is given, then the server will report an
 /// error and exit.
 ///
+/// @anchor CommandLineDefaultLanguage
+/// @copydetails triagens::arango::ArangoServer::_defaultLanguage
+///
 /// @anchor CommandLineSupervisor
 /// @CMDOPT{\--supervisor}
 ///

arangod/RestServer/ArangoServer.h

@@ -398,11 +398,16 @@ namespace triagens {
         vector<string> _scriptParameters;
 
 ////////////////////////////////////////////////////////////////////////////////
-/// @brief server default language
+/// @brief server default language for sorting strings
 ///
-/// @CMDOPT{\--default-language @CA{script-parameter}}
+/// @CMDOPT{\-\-default-language @CA{default-language}}
 ///
-/// Parameter to script.
+/// The default language ist used for sorting and comparing strings. 
+/// The language value is a two-letter language code (ISO-639) or it is 
+/// composed by a two-letter language code with and a two letter country code 
+/// (ISO-3166). Valid languages are "de", "en", "en_US" or "en_UK".
+///
+/// The default default-language is set to be the system locale on that platform.
 ////////////////////////////////////////////////////////////////////////////////
 
         string _defaultLanguage;