From 0e0a7c47abf3a9a39b64687e3b7f47d567a261ca Mon Sep 17 00:00:00 2001 From: Thomas Schmidts Date: Mon, 23 Mar 2015 16:12:52 +0100 Subject: [PATCH 1/7] Fixed broken Links in Foxx/Install/README --- Documentation/Books/Users/Foxx/Install/README.mdpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/Books/Users/Foxx/Install/README.mdpp b/Documentation/Books/Users/Foxx/Install/README.mdpp index bd72bbd0a0..4ed6728fa9 100644 --- a/Documentation/Books/Users/Foxx/Install/README.mdpp +++ b/Documentation/Books/Users/Foxx/Install/README.mdpp @@ -128,7 +128,7 @@ But in most cases you will install you own application that is probably not publ The Application identifier supports several input formats: * `appname:version` Install an App from the ArangoDB store [Read More](Store.md) -* `git:user/repository:tag` Install an App from github [Read More](github.md) -* `http(s)://example.com/app.zip` Install an App from an URL [Read More](remote.md) +* `git:user/repository:tag` Install an App from github [Read More](Github.md) +* `http(s)://example.com/app.zip` Install an App from an URL [Read More](Remote.md) * `/usr/tmp/app.zip` Install an App from local file system [Read More](Local.md) * `EMPTY` Generate a new Application [Read More](Generate.md) From fad2e608951b165932b7b3f02765ea00cad9c122 Mon Sep 17 00:00:00 2001 From: Willi Goesgens Date: Mon, 23 Mar 2015 17:06:09 +0100 Subject: [PATCH 2/7] Fix windows compile of getenv facilities --- lib/V8/v8-environment.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/V8/v8-environment.cpp b/lib/V8/v8-environment.cpp index 2894c89716..adbc4e6a1c 100644 --- a/lib/V8/v8-environment.cpp +++ b/lib/V8/v8-environment.cpp @@ -26,12 +26,12 @@ /// https://github.com/joyent/node/blob/master/src/node.cc //////////////////////////////////////////////////////////////////////////////// +#include "Basics/Common.h" +#include "v8-utils.h" + #ifdef _WIN32 #include "Basics/win-utils.h" #else - -#include "v8-utils.h" - #ifdef __APPLE__ #include #define environ (*_NSGetEnviron()) From 486d86e0cbbc1f7e5a1c2dcd846255f10f40af80 Mon Sep 17 00:00:00 2001 From: Willi Goesgens Date: Mon, 23 Mar 2015 17:47:34 +0100 Subject: [PATCH 3/7] add new file from a1af44bf4900600f54d4b8dc233429df488633db to CMake too. --- arangod/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt index 5dd268f0ed..9a46985629 100644 --- a/arangod/CMakeLists.txt +++ b/arangod/CMakeLists.txt @@ -106,6 +106,7 @@ add_executable( RestHandler/RestEdgeHandler.cpp RestHandler/RestImportHandler.cpp RestHandler/RestPleaseUpgradeHandler.cpp + RestHandler/RestQueryHandler.cpp RestHandler/RestReplicationHandler.cpp RestHandler/RestUploadHandler.cpp RestHandler/RestVocbaseBaseHandler.cpp From ac141a4e147395d5bab27db0fe66edffb5d0aba3 Mon Sep 17 00:00:00 2001 From: Willi Goesgens Date: Mon, 23 Mar 2015 18:45:46 +0100 Subject: [PATCH 4/7] options.test is always there - need to check whether its defined. --- js/server/modules/org/arangodb/testing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/server/modules/org/arangodb/testing.js b/js/server/modules/org/arangodb/testing.js index 8c681f8583..58545a6450 100644 --- a/js/server/modules/org/arangodb/testing.js +++ b/js/server/modules/org/arangodb/testing.js @@ -179,7 +179,7 @@ function printUsage () { } function filterTestcaseByOptions (testname, options, whichFilter) { - if (options.hasOwnProperty('test')) { + if (options.hasOwnProperty('test') && (typeof(options.test) !== 'undefined')) { whichFilter.filter = "testcase"; return testname === options.test; } From c4ecaffbb4f2c706619540a2af2f781b376b0c5e Mon Sep 17 00:00:00 2001 From: Willi Goesgens Date: Mon, 23 Mar 2015 18:58:55 +0100 Subject: [PATCH 5/7] Remove MRuby from the macos build --- CMakeLists.txt | 9 --------- GNUmakefile | 3 +-- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 095e644d8e..f5268f9394 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,6 @@ set(BIN_ARANGOB arangob) set(BIN_ARANGOD arangod) set(BIN_ARANGODUMP arangodump) set(BIN_ARANGOIMP arangoimp) -set(BIN_ARANGOIRB arangoirb) set(BIN_ARANGORESTORE arangorestore) set(BIN_ARANGOSH arangosh) @@ -745,14 +744,6 @@ add_subdirectory(arangosh) add_subdirectory(arangod) -################################################################################ -### @brief arangoirb -################################################################################ - -if (USE_MRUBY) - add_subdirectory(arangoirb) -endif () - ## ----------------------------------------------------------------------------- ## --SECTION-- DOCUMENTATIONS ## ----------------------------------------------------------------------------- diff --git a/GNUmakefile b/GNUmakefile index 9d4ab3190d..eac904f672 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -97,8 +97,7 @@ pack-dmg: rm -rf Build && mkdir Build ./configure \ - --prefix=/opt/arangodb \ - --enable-mruby + --prefix=/opt/arangodb ${MAKE} pack-dmg-cmake From 9fbfcf245e580364a06dbda309bab24d7a6a1c75 Mon Sep 17 00:00:00 2001 From: Willi Goesgens Date: Mon, 23 Mar 2015 19:05:29 +0100 Subject: [PATCH 6/7] more places to remove mruby --- CMakeLists.txt | 10 ---------- GNUmakefile | 15 +++------------ 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5268f9394..6bea9e8243 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,16 +145,6 @@ endif () set(ARANGODB_VERSION "1.x.y-rc1" CACHE path "ArangoDB version") -################################################################################ -### @brief MRUBY -################################################################################ - -option(USE_MRUBY "Do you want to use MRUBY" OFF) - -if (USE_MRUBY) - add_definitions("-DTRI_ENABLE_MRUBY=1") -endif () - ################################################################################ ### @brief VISTA LOCKS ################################################################################ diff --git a/GNUmakefile b/GNUmakefile index eac904f672..0dbc8e7676 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -111,7 +111,6 @@ pack-dmg-cmake: -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "LIBEV_VERSION=${LIBEV_VERSION}" \ -D "READLINE_VERSION=${READLINE_VERSION}" \ - -D "USE_MRUBY=ON" \ -D "V8_VERSION=${V8_VERSION}" \ -D "ZLIB_VERSION=${ZLIB_VERSION}" \ .. @@ -119,7 +118,6 @@ pack-dmg-cmake: ${MAKE} .libev-build-64 ${MAKE} .zlib-build-64 ${MAKE} .v8-build-64 - ${MAKE} .mruby-build-64 ${MAKE} ${BUILT_SOURCES} @@ -144,8 +142,7 @@ pack-macosx: rm -rf Build && mkdir Build ./configure \ - --prefix=/opt/arangodb \ - --enable-mruby + --prefix=/opt/arangodb ${MAKE} pack-macosx-cmake @@ -159,7 +156,6 @@ pack-macosx-cmake: -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "LIBEV_VERSION=${LIBEV_VERSION}" \ -D "READLINE_VERSION=${READLINE_VERSION}" \ - -D "USE_MRUBY=ON" \ -D "V8_VERSION=${V8_VERSION}" \ -D "ZLIB_VERSION=${ZLIB_VERSION}" \ .. @@ -167,7 +163,6 @@ pack-macosx-cmake: ${MAKE} .libev-build-64 ${MAKE} .zlib-build-64 ${MAKE} .v8-build-64 - ${MAKE} .mruby-build-64 ${MAKE} ${BUILT_SOURCES} @@ -189,8 +184,7 @@ pack-arm: ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-mruby + --localstatedir=/var touch .libev-build-32 touch .v8-build-32 @@ -211,7 +205,6 @@ pack-arm-cmake: -D "ETCDIR=${sysconfdir}" \ -D "LIBEV_VERSION=${LIBEV_VERSION}" \ -D "READLINE_VERSION=${READLINE_VERSION}" \ - -D "USE_MRUBY=OFF" \ -D "V8_VERSION=${V8_VERSION}" \ -D "VARDIR=${localstatedir}" \ -D "ZLIB_VERSION=${ZLIB_VERSION}" \ @@ -269,7 +262,6 @@ winXX-cmake: checkcmake -D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \ -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "LIBEV_VERSION=4.11" \ - -D "USE_MRUBY=OFF" \ -D "V8_VERSION=3.31.74.1" \ -D "ZLIB_VERSION=1.2.7" \ $(MOREOPTS) \ @@ -300,8 +292,7 @@ pack-tar-config: ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-mruby + --localstatedir=/var pack-tar: rm -rf /tmp/pack-arangodb From 1a269dcee135cb6a8d10a38b3cb3d4c89a416a0e Mon Sep 17 00:00:00 2001 From: Willi Goesgens Date: Mon, 23 Mar 2015 19:07:56 +0100 Subject: [PATCH 7/7] Fix sequence so TRI_BINDIR_INSTALL is defined. --- CMakeLists.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bea9e8243..61f248cfcc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,15 +155,6 @@ if (USE_VISTA_LOCKS) add_definitions("-DTRI_WINDOWS_VISTA_LOCKS=1") endif () -################################################################################ -### @brief etcd -################################################################################ - -if (DARWIN) - install(PROGRAMS ${PROJECT_SOURCE_DIR}/bin/etcd-arango - DESTINATION ${TRI_BINDIR_INSTALL}) -endif () - ## ----------------------------------------------------------------------------- ## --SECTION-- DIRECTORIES ## ----------------------------------------------------------------------------- @@ -378,6 +369,16 @@ else() endif () + +################################################################################ +### @brief etcd +################################################################################ + +if (DARWIN) + install(PROGRAMS ${PROJECT_SOURCE_DIR}/bin/etcd-arango + DESTINATION ${TRI_BINDIR_INSTALL}) +endif () + ## ----------------------------------------------------------------------------- ## --SECTION-- COMMON INCLUDES ## -----------------------------------------------------------------------------