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

CHANGELOG

@@ -1,4 +1,12 @@
-v1.1.beta1 (2012-XX-XX)
+v1.1.beta2 (2012-11-13)
+-----------------------
+
+* fixed arangoirb compilation
+
+* fixed doxygen
+
+
+v1.1.beta1 (2012-10-24)
 -----------------------
 
 * fixed AQL optimiser bug

Documentation/Makefile.files

@@ -113,6 +113,7 @@ Doxygen/.setup-directories:
 	@test -d Doxygen/website/images || mkdir -p Doxygen/website/images
 	@test -d Doxygen/js/actions/system || mkdir -p Doxygen/js/actions/system
 	@test -d Doxygen/js/common/bootstrap || mkdir -p Doxygen/js/common/bootstrap
+	@test -d Doxygen/js/common/modules || mkdir -p Doxygen/js/common/modules
 	@test -d Doxygen/js/server/modules/org/arangodb || mkdir -p Doxygen/js/server/modules/org/arangodb
 	@test -d Doxygen/js/client || mkdir -p Doxygen/js/client
 	@test -d Doxygen/latex/images || mkdir -p Doxygen/latex/images

GNUmakefile

@@ -40,6 +40,7 @@ MAINTAINER = \
 AUTOMAGIC = \
 	Makefile.in \
 	aclocal.m4 \
+	configure \
 	config/compile \
 	config/config.guess \
 	config/config.sub \

Installation/build.sh

@@ -119,7 +119,7 @@ case $TRI_OS_LONG in
     echo "Using configuration for DARWIN"
     CPPFLAGS='-isystem /usr/include -isystem /opt/local/include -Wno-deprecated-declarations'
     LDFLAGS='-L/usr/lib -L/opt/local/lib' # need to use OpenSSL from system
-    OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --disable-mruby"
+    OPTIONS="$OPTIONS --enable-all-in-one-libev --enable-all-in-one-v8 --enable-all-in-one-icu --enable-mruby"
     RESULTS="$RESULTS arangoirb"
     if [ "${TRI_MACH}" == "x86_64" ]; then
        X=$(uname -r)

Installation/release.sh

@@ -39,6 +39,8 @@ mv configure.ac.tmp configure.ac
 
 ./configure --enable-all-in-one-v8 --enable-all-in-one-libev --enable-all-in-one-icu --enable-maintainer-mode --disable-mruby || exit 1
 make built-sources || exit 1
+make add-maintainer || exit 1
+make add-automagic || exit 1
 make doxygen || exit 1
 make latex || exit 1
 make wiki || exit 1

VERSION

@@ -1 +1 @@
-1.1.beta1
+1.1.beta2

arangoirb/MRClient/arangoirb.cpp

@@ -244,7 +244,7 @@ static void InitMRClientConnection (mrb_state* mrb, MRubyClientConnection* conne
 ////////////////////////////////////////////////////////////////////////////////
 
 static void RunShell (mrb_state* mrb) {
-  MRLineEditor* console(mrb, ".arango-mrb");
+  MRLineEditor console(mrb, ".arango-mrb");
 
   console.open(false /*! NoAutoComplete*/);
 

configure.ac

@@ -6,7 +6,7 @@ dnl ============================================================================
 dnl --SECTION--                                  triAGENS GmbH Build Environment
 dnl ============================================================================
 
-AC_INIT([triAGENS ArangoDB], [1.1.beta1], [info@triagens.de], [arangodb], [http://www.arangodb.org])
+AC_INIT([triAGENS ArangoDB], [1.1.beta2], [info@triagens.de], [arangodb], [http://www.arangodb.org])
 
 dnl ----------------------------------------------------------------------------
 dnl auxillary directory for install-sh and missing

etc/arangodb/arangod.conf.in

@@ -17,6 +17,10 @@ threads = 3
 action-directory= @PKGDATADIR@/js/actions/system
 modules-path = @PKGDATADIR@/js/server/modules;@PKGDATADIR@/js/common/modules
 
+[ruby]
+action-directory= @PKGDATADIR@/mr/actions/system
+modules-path = @PKGDATADIR@/mr/server/modules;@PKGDATADIR@/mr/common/modules
+
 [log]
 level = info
 severity = human