diff --git a/.gitignore b/.gitignore index ebba7004b8..4d68808357 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ mr-*.h Doxygen/doc/ Doxygen/manuals/ +Doxygen/man/ Doxygen/website/ Doxygen/wiki/ Doxygen/xml/ diff --git a/Installation/build.sh b/Installation/build.sh index ea8d1e4917..3fc9d823e5 100755 --- a/Installation/build.sh +++ b/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 \ No newline at end of file diff --git a/Installation/epm/arangodb.list b/Installation/epm/arangodb.list index dec87550c2..56cc3f9503 100644 --- a/Installation/epm/arangodb.list +++ b/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 ## ----------------------------------------------------------------------------- diff --git a/Installation/packetize.sh b/Installation/packetize.sh index ef506d4d2d..74d0145de3 100755 --- a/Installation/packetize.sh +++ b/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 "########################################################" diff --git a/arangod/Documentation/command-line-options.dox b/arangod/Documentation/command-line-options.dox index b393289b59..b24a79ea4a 100644 --- a/arangod/Documentation/command-line-options.dox +++ b/arangod/Documentation/command-line-options.dox @@ -37,6 +37,7 @@ ///