From 4804f2b324d68053241f23a0b188edd8a0e64ff1 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Tue, 13 Nov 2012 15:56:57 +0100 Subject: [PATCH 1/5] fixed arangoirb compile error --- Installation/build.sh | 2 +- arangoirb/MRClient/arangoirb.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Installation/build.sh b/Installation/build.sh index 34582250cd..ea8d1e4917 100755 --- a/Installation/build.sh +++ b/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) diff --git a/arangoirb/MRClient/arangoirb.cpp b/arangoirb/MRClient/arangoirb.cpp index 7fe2ae89eb..a01043d0b3 100644 --- a/arangoirb/MRClient/arangoirb.cpp +++ b/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*/); From bec6e7343ba4020a1549cf943f6878ea3dccd42a Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Tue, 13 Nov 2012 16:09:25 +0100 Subject: [PATCH 2/5] create modules directory --- Documentation/Makefile.files | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/Makefile.files b/Documentation/Makefile.files index 1456313390..27d2390232 100644 --- a/Documentation/Makefile.files +++ b/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 From efdad9df1014c4d9cd521cfe655e35bd3e193176 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Tue, 13 Nov 2012 16:17:28 +0100 Subject: [PATCH 3/5] add maintainer and automagic files --- CHANGELOG | 10 +++++++++- Installation/release.sh | 2 ++ VERSION | 2 +- configure.ac | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b52e9c97b0..2337d85d7d 100644 --- a/CHANGELOG +++ b/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 diff --git a/Installation/release.sh b/Installation/release.sh index 041018c3e4..8a41d4f904 100755 --- a/Installation/release.sh +++ b/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 diff --git a/VERSION b/VERSION index 480d4c7ebc..a5bffc6e71 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.beta1 +1.1.beta2 diff --git a/configure.ac b/configure.ac index 7199c54502..eee1637542 100644 --- a/configure.ac +++ b/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 From a138874b52f7aa796aa5d6220e7c5df7b5fb5ea0 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Tue, 13 Nov 2012 16:27:16 +0100 Subject: [PATCH 4/5] added configure to AUTOMAGIC files --- GNUmakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/GNUmakefile b/GNUmakefile index 693e084689..49d09179e9 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -40,6 +40,7 @@ MAINTAINER = \ AUTOMAGIC = \ Makefile.in \ aclocal.m4 \ + configure \ config/compile \ config/config.guess \ config/config.sub \ From a128bb998bde6089bcf0636aa34a8346b92fdcc5 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Tue, 13 Nov 2012 16:53:35 +0100 Subject: [PATCH 5/5] added ruby path --- etc/arangodb/arangod.conf.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/arangodb/arangod.conf.in b/etc/arangodb/arangod.conf.in index e89906022f..6bfc499305 100644 --- a/etc/arangodb/arangod.conf.in +++ b/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