From 132fc3776db70cb80d3db0f7e4d1fa4c0ca50a22 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Mon, 20 Feb 2012 18:06:10 +0100 Subject: [PATCH] cleanup of Makefiles, added caveat section --- Makefile.am | 40 ++++++++++++++---- Makefile.doxygen | 2 +- Makefile.files | 105 ++++++++++++++--------------------------------- README.md | 21 +++++++--- 4 files changed, 78 insertions(+), 90 deletions(-) diff --git a/Makefile.am b/Makefile.am index a6d631dd39..3535539078 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,15 +1,39 @@ ACLOCAL_AMFLAGS = -I m4 -AM_CFLAGS = -AM_CXXFLAGS = -AM_CPPFLAGS = -D_SYSCONFDIR_='"${sysconfdir}"' -D_PKGDATADIR_='"${pkgdatadir}"' -D_DATABASEDIR_='"${localstatedir}/${PACKAGE_TARNAME}"' -AM_LDFLAGS = +AM_CPPFLAGS = \ + -D_SYSCONFDIR_='"${sysconfdir}"' \ + -D_PKGDATADIR_='"${pkgdatadir}"' \ + -D_DATABASEDIR_='"${localstatedir}/${PACKAGE_TARNAME}"' \ + @BOOST_CPPFLAGS@ \ + @LIBEV_CPPFLAGS@ \ + @MATH_CPPFLAGS@ \ + @NCURSES_CPPFLAGS@ \ + @OPENSSL_CPPFLAGS@ \ + @READLINE_CPPFLAGS@ \ + @V8_CPPFLAGS@ + +AM_LDFLAGS = \ + @BOOST_LDFLAGS@ \ + @LIBEV_LDFLAGS@ \ + @MATH_LDFLAGS@ \ + @NCURSES_LDFLAGS@ \ + @OPENSSL_LDFLAGS@ \ + @READLINE_LDFLAGS@ \ + @V8_LDFLAGS@ + +LIBS = \ + @BOOST_LIBS@ \ + @LIBEV_LIBS@ \ + @MATH_LIBS@ \ + @NCURSES_LIBS@ \ + @OPENSSL_LIBS@ \ + @READLINE_LIBS@ \ + @V8_LIBS@ + BUILT_SOURCES = CLEANUP = -LIBS = -noinst_LIBRARIES = libavocadodb.a -bin_PROGRAMS = avocado +sbin_PROGRAMS = avocado nobase_pkgdata_DATA = \ $(shell find @srcdir@/js/system -name "*.js" -print) \ @@ -25,7 +49,7 @@ install-data-local: test -d @localstatedir@//${PACKAGE_TARNAME} || mkdir -p @localstatedir@//${PACKAGE_TARNAME} ################################################################################ -## avocado +## avocadodb ################################################################################ include Makefile.files diff --git a/Makefile.doxygen b/Makefile.doxygen index 4529597449..5f8b8553b4 100644 --- a/Makefile.doxygen +++ b/Makefile.doxygen @@ -54,6 +54,6 @@ wiki: $(WIKI) ## CLEANUP ################################################################################ -CLEANUP += $(DOXYGEN) $(WIKI) +CLEANUP += $(DOXYGEN) $(WIKI) $(subst Doxygen/xml,Doxygen/wiki,$(WIKI)) diff --git a/Makefile.files b/Makefile.files index 3a4f08425d..3aa19b9d9f 100644 --- a/Makefile.files +++ b/Makefile.files @@ -4,17 +4,7 @@ ## avocadodb ################################################################################ -libavocadodb_a_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - @BOOST_CPPFLAGS@ \ - @LIBEV_CPPFLAGS@ \ - @MATH_CPPFLAGS@ \ - @NCURSES_CPPFLAGS@ \ - @OPENSSL_CPPFLAGS@ \ - @READLINE_CPPFLAGS@ \ - @V8_CPPFLAGS@ - -libavocadodb_a_SOURCES = \ +avocado_SOURCES = \ Admin/ApplicationAdminServer.cpp \ Admin/RestAdminBaseHandler.cpp \ Admin/RestAdminFeConfigurationHandler.cpp \ @@ -99,6 +89,16 @@ libavocadodb_a_SOURCES = \ Logger/LoggerStream.cpp \ Logger/LoggerTiming.cpp \ ProgramOptions/program-options.c \ + QL/ParserWrapper.cpp \ + QL/ast-node.c \ + QL/ast-query.c \ + QL/error.c \ + QL/formatter.c \ + QL/javascripter.c \ + QL/optimize.c \ + QL/parser-context.c \ + QL/parser.c \ + QL/tokens.c \ Rest/AddressPort.cpp \ Rest/AnyServer.cpp \ Rest/HttpRequest.cpp \ @@ -106,6 +106,16 @@ libavocadodb_a_SOURCES = \ Rest/Initialise.cpp \ Rest/SslInterface.cpp \ Rest/Url.cpp \ + RestHandler/RestActionHandler.cpp \ + RestHandler/RestDocumentHandler.cpp \ + RestHandler/RestSystemActionHandler.cpp \ + RestHandler/RestVocbaseBaseHandler.cpp \ + RestServer/ActionDispatcherThread.cpp \ + RestServer/AvocadoHttpServer.cpp \ + RestServer/AvocadoServer.cpp \ + RestServer/JSLoader.cpp \ + RestServer/SystemActionDispatcherThread.cpp \ + RestServer/avocado.cpp \ ResultGenerator/HtmlResultGenerator.cpp \ ResultGenerator/Initialise.cpp \ ResultGenerator/JsonResultGenerator.cpp \ @@ -130,11 +140,11 @@ libavocadodb_a_SOURCES = \ ShapedJson/shape-accessor.c \ ShapedJson/shaped-json.c \ V8/v8-actions.cpp \ + V8/v8-conv.cpp \ V8/v8-json.cpp \ + V8/v8-line-editor.cpp \ V8/v8-shell.cpp \ V8/v8-utils.cpp \ - V8/v8-conv.cpp \ - V8/v8-line-editor.cpp \ V8/v8-vocbase.cpp \ Variant/VariantArray.cpp \ Variant/VariantBlob.cpp \ @@ -156,79 +166,25 @@ libavocadodb_a_SOURCES = \ Variant/VariantUInt64.cpp \ Variant/VariantUInt8.cpp \ Variant/VariantVector.cpp \ - VocBase/data-feeder.c \ - VocBase/join-execute.c \ - VocBase/order.c \ VocBase/blob-collection.c \ VocBase/collection.c \ VocBase/compactor.c \ + VocBase/data-feeder.c \ VocBase/datafile.c \ VocBase/document-collection.c \ VocBase/fluent-query.c \ - VocBase/select-result.c \ - VocBase/join.c \ - VocBase/query.c \ VocBase/headers.c \ VocBase/index.c \ + VocBase/join-execute.c \ + VocBase/join.c \ + VocBase/order.c \ + VocBase/query.c \ VocBase/result-set.c \ + VocBase/select-result.c \ VocBase/simple-collection.c \ VocBase/synchroniser.c \ VocBase/voc-shaper.c \ - VocBase/vocbase.c \ - QL/ParserWrapper.cpp \ - QL/ast-node.c \ - QL/ast-query.c \ - QL/error.c \ - QL/formatter.c \ - QL/javascripter.c \ - QL/optimize.c \ - QL/parser-context.c \ - QL/parser.c \ - QL/tokens.c - -avocado_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - @BOOST_CPPFLAGS@ \ - @LIBEV_CPPFLAGS@ \ - @MATH_CPPFLAGS@ \ - @NCURSES_CPPFLAGS@ \ - @OPENSSL_CPPFLAGS@ \ - @READLINE_CPPFLAGS@ \ - @V8_CPPFLAGS@ - -avocado_LDFLAGS = \ - -L. \ - @BOOST_LDFLAGS@ \ - @LIBEV_LDFLAGS@ \ - @MATH_LDFLAGS@ \ - @NCURSES_LDFLAGS@ \ - @OPENSSL_LDFLAGS@ \ - @READLINE_LDFLAGS@ \ - @V8_LDFLAGS@ - -avocado_LDADD = \ - -lavocadodb \ - @BOOST_LIBS@ \ - @LIBEV_LIBS@ \ - @MATH_LIBS@ \ - @NCURSES_LIBS@ \ - @OPENSSL_LIBS@ \ - @READLINE_LIBS@ \ - @V8_LIBS@ - -avocado_DEPENDENCIES = @builddir@/libavocadodb.a - -avocado_SOURCES = \ - RestHandler/RestActionHandler.cpp \ - RestHandler/RestDocumentHandler.cpp \ - RestHandler/RestSystemActionHandler.cpp \ - RestHandler/RestVocbaseBaseHandler.cpp \ - RestServer/ActionDispatcherThread.cpp \ - RestServer/AvocadoHttpServer.cpp \ - RestServer/AvocadoServer.cpp \ - RestServer/JSLoader.cpp \ - RestServer/SystemActionDispatcherThread.cpp \ - RestServer/avocado.cpp + VocBase/vocbase.c ################################################################################ ## JavaScript source code as header @@ -243,7 +199,6 @@ JAVASCRIPT_HEADER = \ js/server/js-json.h \ js/server/js-shell.h - BUILT_SOURCES += $(JAVASCRIPT_HEADER) ################################################################################ diff --git a/README.md b/README.md index 9733300017..f82bad25d0 100644 --- a/README.md +++ b/README.md @@ -14,15 +14,24 @@ effort to operate for the administrator. 5. create a directory `/var/lib/avocado` where you are allowed to read and write 6. "./avocado /var/lib/avocado" to start a REST server or "./avocado /var/lib/avocado --shell" for debugging -### Mac OS X Hints - -If you install AvocadoDB on Mac OS X we collected some hints for you: - -* The version of bison delivered with OS X is out of date. Update it before installing. - ## First Steps ./avocado --shell avocado> db.examples.count(); avocado> db.examples.save({ Hallo: "World" }); avocado> db.examples.select(); + +## Caveat + +Please note that this is a very early version if AvocadoDB. There will be +bugs and we'd realy appreciate it if you report them: + + https://github.com/triAGENS/AvocadoDB/issues + +To start AvocadoDB, run: + + avocado + +To start AvocadoDB with an interactive (REPL) shell, run: + + avocado --shell