Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '1.0' of github.com:triAGENS/ArangoDB

This commit is contained in:
Frank Celler 2012-06-06 14:22:02 +02:00
parent 089d57c175 6063327d04
commit 388e553858
5 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -1088,7 +1088,7 @@ VOCDIR := /tmp/vocdir.$(PID)
VOCPORT := $(shell printf "3%04d" `expr $(PID) % 10000`)
VOCHOST := 127.0.0.1
SERVER_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/server/modules:./js/common/modules --javascript.action-directory ./js/actions/system
CLIENT_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/client/modules:./js/common/modules --no-colors
CLIENT_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/client/modules:./js/common/modules --no-colors --quiet
@ENABLE_BOOST_TEST_TRUE@UnitTests_basics_suite_LDADD = -L@top_builddir@ -larango -lboost_unit_test_framework
@ENABLE_BOOST_TEST_TRUE@UnitTests_basics_suite_DEPENDENCIES = @top_builddir@/libarango.a
@ENABLE_BOOST_TEST_TRUE@UnitTests_basics_suite_SOURCES = \
@ -3260,7 +3260,7 @@ unittests-shell-client:
@echo "================================================================================"
@echo
$(VALGRIND) @builddir@/arangosh $(CLIENT_OPT) --server $(VOCHOST):$(VOCPORT) "$(VOCDIR)" $(UNITTESTS_CLIENT) || test "x$(FORCE)" == "x1"
$(VALGRIND) @builddir@/arangosh $(CLIENT_OPT) --server $(VOCHOST):$(VOCPORT) $(UNITTESTS_CLIENT) || test "x$(FORCE)" == "x1"
kill `cat $(PIDFILE)`

4
Makefile.unittests
View File

@ -46,7 +46,7 @@ VOCDIR := /tmp/vocdir.$(PID)
VOCPORT := $(shell printf "3%04d" `expr $(PID) % 10000`)
VOCHOST := 127.0.0.1
SERVER_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/server/modules:./js/common/modules --javascript.action-directory ./js/actions/system
CLIENT_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/client/modules:./js/common/modules --no-colors
CLIENT_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/client/modules:./js/common/modules --no-colors --quiet
.PHONY: start-server
@ -234,7 +234,7 @@ unittests-shell-client:
@echo "================================================================================"
@echo
$(VALGRIND) @builddir@/arangosh $(CLIENT_OPT) --server $(VOCHOST):$(VOCPORT) "$(VOCDIR)" $(UNITTESTS_CLIENT) || test "x$(FORCE)" == "x1"
$(VALGRIND) @builddir@/arangosh $(CLIENT_OPT) --server $(VOCHOST):$(VOCPORT) $(UNITTESTS_CLIENT) || test "x$(FORCE)" == "x1"
kill `cat $(PIDFILE)`

26
V8Client/arangosh.cpp
View File

@ -531,21 +531,21 @@ static void ParseProgramOptions (int argc, char* argv[]) {
;
description
("help,h", "help message")
("quiet,s", "no banner")
("log.level,l", &level, "log level")
("server", &ServerAddressPort, "server address and port")
("startup.directory", &StartupPath, "startup paths containing the JavaScript files; multiple directories can be separated by cola")
("startup.modules-path", &StartupModules, "one or more directories separated by cola")
("pager", &OutputPager, "output pager")
("use-pager", "use pager")
("pretty-print", "pretty print values")
("no-colors", "deactivate color support")
("no-auto-complete", "disable auto completion")
("connect-timeout", &ConnectTimeout, "connect timeout in seconds")
("request-timeout", &RequestTimeout, "request timeout in seconds")
("unit-tests", &UnitTests, "do not start as shell, run unit tests instead")
("help,h", "help message")
("javascript.modules-path", &StartupModules, "one or more directories separated by cola")
("javascript.startup-directory", &StartupPath, "startup paths containing the JavaScript files; multiple directories can be separated by cola")
("log.level,l", &level, "log level")
("max-upload-size", &MaxUploadSize, "maximum size of import chunks")
("no-auto-complete", "disable auto completion")
("no-colors", "deactivate color support")
("pager", &OutputPager, "output pager")
("pretty-print", "pretty print values")
("quiet,s", "no banner")
("request-timeout", &RequestTimeout, "request timeout in seconds")
("server", &ServerAddressPort, "server address and port, use 'none' to start without a server")
("unit-tests", &UnitTests, "do not start as shell, run unit tests instead")
("use-pager", "use pager")
(hidden, true)
;

6
js/client/client.js
View File

@ -387,6 +387,12 @@ function help () {
(function () {
var internal = require("internal");
////////////////////////////////////////////////////////////////////////////////
/// @brief be quiet
////////////////////////////////////////////////////////////////////////////////
internal.ARANGO_QUIET = ARANGO_QUIET;
////////////////////////////////////////////////////////////////////////////////
/// @brief log function
////////////////////////////////////////////////////////////////////////////////

6
js/client/js-client.h
View File

@ -389,6 +389,12 @@ static string JS_client_client =
" var internal = require(\"internal\");\n"
"\n"
"////////////////////////////////////////////////////////////////////////////////\n"
"/// @brief be quiet\n"
"////////////////////////////////////////////////////////////////////////////////\n"
"\n"
" internal.ARANGO_QUIET = ARANGO_QUIET;\n"
"\n"
"////////////////////////////////////////////////////////////////////////////////\n"
"/// @brief log function\n"
"////////////////////////////////////////////////////////////////////////////////\n"
"\n"