From 39f4a8f833128a0a37a0987f98a2ce490667fee7 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Wed, 29 Aug 2012 17:40:16 +0200 Subject: [PATCH] cleanup directory structure and init file handling moved common functions to ArangoClient --- .gitignore | 27 +- {m4 => 3rdParty}/Makefile.all-in-one-libev | 30 +- {m4 => 3rdParty}/Makefile.all-in-one-mruby | 8 +- {m4 => 3rdParty}/Makefile.all-in-one-protobuf | 8 +- {m4 => 3rdParty}/Makefile.all-in-one-v8 | 8 +- {m4 => 3rdParty}/Makefile.all-in-one-zeromq | 8 +- .../Examples.Ahuacatl/aqlarithmetic | 0 .../Examples.Ahuacatl/aqlattributenamesvalid | 0 .../Examples.Ahuacatl/aqlbind | 0 .../Examples.Ahuacatl/aqlbindcollection | 0 .../Examples.Ahuacatl/aqlcollect | 0 .../Examples.Ahuacatl/aqlcollect2 | 0 .../Examples.Ahuacatl/aqlcollectsyntax | 0 .../Examples.Ahuacatl/aqlcomments | 0 .../Examples.Ahuacatl/aqlcompareexamples1 | 0 .../Examples.Ahuacatl/aqlcompareexamples2 | 0 .../Examples.Ahuacatl/aqlcompareexamples3 | 0 .../Examples.Ahuacatl/aqlcomparison | 0 .../Examples.Ahuacatl/aqldocumentaccess | 0 .../Examples.Ahuacatl/aqldocumentempty | 0 .../Examples.Ahuacatl/aqlexample-collection | 0 .../Examples.Ahuacatl/aqlexample-grouping | 0 .../Examples.Ahuacatl/aqlexample-join | 0 .../Examples.Ahuacatl/aqlexample-simple | 0 .../Examples.Ahuacatl/aqlexpansion | 0 .../Examples.Ahuacatl/aqlfilter | 0 .../Examples.Ahuacatl/aqlfiltermultiple | 0 .../Examples.Ahuacatl/aqlfiltersyntax | 0 .../Examples.Ahuacatl/aqlfor | 0 .../Examples.Ahuacatl/aqlfornested | 0 .../Examples.Ahuacatl/aqlforstatic | 0 .../Examples.Ahuacatl/aqlforsyntax | 0 .../Examples.Ahuacatl/aqlfunctions | 0 .../Examples.Ahuacatl/aqlfunctionsyntax | 0 .../Examples.Ahuacatl/aqllet | 0 .../Examples.Ahuacatl/aqllet2 | 0 .../Examples.Ahuacatl/aqlletsyntax | 0 .../Examples.Ahuacatl/aqllimit | 0 .../Examples.Ahuacatl/aqllimitsyntax | 0 .../Examples.Ahuacatl/aqllistaccess | 0 .../Examples.Ahuacatl/aqllistempty | 0 .../Examples.Ahuacatl/aqllistvalues | 0 .../Examples.Ahuacatl/aqllogical | 0 .../Examples.Ahuacatl/aqlnamebackticks | 0 .../Examples.Ahuacatl/aqlnamedattributes | 0 .../Examples.Ahuacatl/aqlnull | 0 .../Examples.Ahuacatl/aqlnull2 | 0 .../Examples.Ahuacatl/aqlnumbers | 0 .../Examples.Ahuacatl/aqlpaths | 0 .../Examples.Ahuacatl/aqlqueryintro | 0 .../Examples.Ahuacatl/aqlqueryresultempty | 0 .../aqlqueryresulthomogenuous | 0 .../aqlqueryresultinhomogenuous | 0 .../Examples.Ahuacatl/aqlqueryresultscalar | 0 .../Examples.Ahuacatl/aqlreturn | 0 .../Examples.Ahuacatl/aqlreturnsyntax | 0 .../Examples.Ahuacatl/aqlsort | 0 .../Examples.Ahuacatl/aqlsortsyntax | 0 .../Examples.Ahuacatl/aqlstrings | 0 .../Examples.Ahuacatl/aqlsubquery | 0 .../Examples.Ahuacatl/aqlternary | 0 .../Examples.Ahuacatl/aqltypeorder | 0 .../Examples.Ahuacatl/aqlvariablenames | 0 .../api-collection-all-collections | 0 .../api-collection-bad-handle | 0 .../api-collection-create-collection | 0 ...pi-collection-delete-collection-identifier | 0 .../api-collection-delete-collection-name | 0 .../api-collection-get-collection-count | 0 .../api-collection-get-collection-figures | 0 .../api-collection-get-collection-identifier | 0 .../api-collection-get-collection-name | 0 .../api-collection-identifier-load | 0 .../api-collection-identifier-properties-sync | 0 .../api-collection-identifier-rename | 0 .../api-collection-identifier-truncate | 0 .../api-collection-identifier-unload | 0 .../api-cursor-create-for-limit-return | 0 .../api-cursor-create-for-limit-return-cont | 0 .../api-cursor-create-for-limit-return-cont2 | 0 .../api-cursor-create-for-limit-return-cont3 | 0 .../api-cursor-create-for-limit-return-single | 0 .../Examples.ArangoDB/api-cursor-delete | 0 .../api-cursor-invalid-cursor-identifier | 0 .../Examples.ArangoDB/api-cursor-missing-body | 0 .../api-cursor-missing-cursor-identifier | 0 .../api-cursor-unknown-collection | 0 .../Examples.ArangoDB/api-explain-invalid | 0 .../Examples.ArangoDB/api-explain-valid | 0 .../Examples.ArangoDB/api-import-documents | 0 .../Examples.ArangoDB/api-import-headers | 0 .../Examples.ArangoDB/api-index-all-indexes | 0 .../api-index-create-geo-latitude-longitude | 0 .../api-index-create-geo-location | 0 .../api-index-create-new-cap-constraint | 0 .../api-index-create-new-hash-index | 0 .../api-index-create-new-skiplist | 0 .../api-index-create-new-unique-constraint | 0 .../api-index-create-new-unique-skiplist | 0 .../api-index-delete-unique-skiplist | 0 .../Examples.ArangoDB/api-index-primary-index | 0 .../Examples.ArangoDB/api-query-invalid | 0 .../Examples.ArangoDB/api-query-valid | 0 .../api-simple-all-skip-limit | 0 .../Examples.ArangoDB/api-simple-by-example1 | 0 .../Examples.ArangoDB/api-simple-by-example2 | 0 .../Examples.ArangoDB/api-simple-by-example3 | 0 .../api-simple-first-example | 0 .../api-simple-first-example-not-found | 0 .../Examples.ArangoDB/api-simple-near | 0 .../api-simple-near-distance | 0 .../Examples.ArangoDB/api-simple-range | 0 .../Examples.ArangoDB/api-simple-within | 0 .../api-simple-within-distance | 0 .../Examples.ArangoDB/api_database1 | 0 .../Examples.ArangoDB/api_database2 | 0 .../Examples.ArangoDB/api_database3 | 0 .../Examples.ArangoDB/api_database4 | 0 .../Examples.ArangoDB/api_database5 | 0 .../Examples.ArangoDB/arangosh-options | 0 .../Examples.ArangoDB/arangosh-start | 0 .../Examples.ArangoDB/arangosh-start-full | 0 .../Examples.ArangoDB/connection-statistics | 0 .../connection-statistics-current | 0 .../Examples.ArangoDB/document1 | 0 .../key-value_delete-key-bad | 0 .../Examples.ArangoDB/key-value_delete-key-ok | 0 .../key-value_delete-key-request | 0 .../Examples.ArangoDB/key-value_get-key-bad | 0 .../Examples.ArangoDB/key-value_get-key-ok | 0 .../key-value_get-key-request | 0 .../Examples.ArangoDB/key-value_get-keys-bad | 0 .../Examples.ArangoDB/key-value_get-keys-ok | 0 .../key-value_get-keys-request | 0 .../Examples.ArangoDB/key-value_post-key-bad | 0 .../Examples.ArangoDB/key-value_post-key-ok | 0 .../key-value_post-key-request | 0 .../Examples.ArangoDB/key-value_put-key-bad | 0 .../Examples.ArangoDB/key-value_put-key-ok | 0 .../key-value_put-key-request | 0 .../Examples.ArangoDB/openssl-ciphers | 0 .../Examples.ArangoDB/openssl-options | 0 .../option-database-directory | 0 .../Examples.ArangoDB/option-server-endpoint | 0 .../Examples.ArangoDB/querypost | 0 .../Examples.ArangoDB/querypostfail | 0 .../Examples.ArangoDB/request-statistics | 0 .../request-statistics-current | 0 .../Examples.ArangoDB/rest-create-document | 0 .../rest-create-document-accept | 0 .../rest-create-document-bad-json | 0 .../rest-create-document-create-collection | 0 .../rest-create-document-named-collection | 0 .../rest-create-document-new-named-collection | 0 .../rest-create-document-unknown-cid | 0 .../Examples.ArangoDB/rest-delete-document | 0 .../rest-delete-document-if-match-other | 0 .../rest-delete-document-unknown-handle | 0 .../Examples.ArangoDB/rest-edge-create-edge | 0 .../Examples.ArangoDB/rest-edge-read-edge | 0 .../rest-edge-read-edges-any | 0 .../Examples.ArangoDB/rest-edge-read-edges-in | 0 .../rest-edge-read-edges-out | 0 .../Examples.ArangoDB/rest-patch-document | 0 .../Examples.ArangoDB/rest-read-document | 0 .../Examples.ArangoDB/rest-read-document-all | 0 .../Examples.ArangoDB/rest-read-document-head | 0 .../rest-read-document-if-none-match | 0 .../rest-read-document-unknown-handle | 0 .../Examples.ArangoDB/rest-update-document | 0 .../rest-update-document-if-match-other | 0 ...-update-document-if-match-other-last-write | 0 .../rest-update-document-rev-other | 0 .../rest-update-document-unknown-handle | 0 .../Examples.ArangoDB/server-keyfile | 0 .../Examples.ArangoDB/server-keyfile-openssl | 0 .../Examples.ArangoDB/start-emergency-console | 0 .../Examples.ArangoDB/startup1 | 0 .../Examples.ArangoDB/supervisor | 0 .../Examples.ArangoDB/supervisor-ps1 | 0 .../Examples.ArangoDB/supervisor-ps2 | 0 .../Examples.ArangoDB/user-document | 0 .../Examples.Durham/action1 | 0 .../Examples.Durham/action2 | 0 .../Examples.Durham/action3 | 0 .../Examples.Durham/action4 | 0 .../Examples.Durham/arangoimp-data-csv | 0 .../Examples.Durham/arangoimp-data-json | 0 .../Examples.Durham/arangosh-all-documents | 0 .../arangosh-create-collection | 0 .../Examples.Durham/arangosh-db | 0 .../Examples.Durham/arangosh-save-documents | 0 .../arangosh-unload-collection | 0 .../Examples.Durham/demo1 | 0 .../Examples.Durham/ensure-cap-constraint | 0 .../Examples.Durham/ensure-geo-index-array | 0 .../Examples.Durham/ensure-geo-index-list | 0 .../Examples.Durham/five1 | 0 .../Examples.Durham/fluent14 | 0 .../Examples.Durham/fluent36 | 0 .../Examples.Durham/fluent37 | 0 .../Examples.Durham/fluent38 | 0 .../Examples.Durham/fluent39 | 0 .../Examples.Durham/fluent40 | 0 .../Examples.Durham/fluent47 | 0 .../Examples.Durham/fluent48 | 0 .../Examples.Durham/fluent49 | 0 .../Examples.Durham/fluent50 | 0 .../Examples.Durham/geojs1 | 0 .../Examples.Durham/graph-constructor | 0 .../Examples.Durham/graph-edge-get-id | 0 .../Examples.Durham/graph-edge-get-in-vertex | 0 .../Examples.Durham/graph-edge-get-label | 0 .../Examples.Durham/graph-edge-get-out-vertex | 0 .../Examples.Durham/graph-edge-get-property | 0 .../graph-edge-get-property-keys | 0 .../Examples.Durham/graph-edge-properties | 0 .../Examples.Durham/graph-edge-set-property | 0 .../Examples.Durham/graph-graph-add-edge | 0 .../Examples.Durham/graph-graph-add-edge2 | 0 .../Examples.Durham/graph-graph-add-vertex | 0 .../Examples.Durham/graph-graph-add-vertex2 | 0 .../Examples.Durham/graph-graph-get-edges | 0 .../Examples.Durham/graph-graph-get-vertex | 0 .../Examples.Durham/graph-graph-get-vertices | 0 .../Examples.Durham/graph-graph-remove-edge | 0 .../Examples.Durham/graph-graph-remove-vertex | 0 .../Examples.Durham/graph-setup | 0 .../Examples.Durham/graph-vertex-add-in-edge | 0 .../Examples.Durham/graph-vertex-add-in-edge2 | 0 .../Examples.Durham/graph-vertex-add-out-edge | 0 .../graph-vertex-add-out-edge2 | 0 .../graph-vertex-add-out-edge3 | 0 .../Examples.Durham/graph-vertex-edges | 0 .../Examples.Durham/graph-vertex-get-id | 0 .../Examples.Durham/graph-vertex-get-in-edges | 0 .../graph-vertex-get-out-edges | 0 .../Examples.Durham/graph-vertex-get-property | 0 .../graph-vertex-get-property-keys | 0 .../Examples.Durham/graph-vertex-inbound | 0 .../Examples.Durham/graph-vertex-outbound | 0 .../Examples.Durham/graph-vertex-properties | 0 .../Examples.Durham/graph-vertex-set-property | 0 .../Examples.Durham/graph25 | 0 .../Examples.Durham/graph26 | 0 .../Examples.Durham/jsunity1 | 0 .../Examples.Durham/jsunity2 | 0 .../Examples.Durham/modules-require-1 | 0 .../Examples.Durham/modules-require-2 | 0 .../Examples.Durham/shell-collection-count | 0 .../Examples.Durham/shell-edge-edges | 0 .../Examples.Durham/shell-edge-in-edges | 0 .../Examples.Durham/shell-edge-out-edges | 0 .../shell-index-create-hash-index | 0 .../shell-index-create-unique-constraint | 0 .../Examples.Durham/shell-read-document | 0 .../shell-read-document-bad-handle | 0 .../shell-read-document-not-found | 0 .../shell-simple-query-first-example | 0 .../Examples.Durham/shell_collection-drop | 0 .../Examples.Durham/shell_collection-drop-db | 0 .../shell_collection-drop-name-db | 0 .../Examples.Durham/shell_collection-figures | 0 .../Examples.Durham/shell_collection-load | 0 .../shell_collection-properties | 0 .../shell_collection-properties-change | 0 .../Examples.Durham/shell_collection-rename | 0 .../Examples.Durham/shell_collection-truncate | 0 .../shell_collection-truncate-db | 0 .../shell_collection-truncate-name-db | 0 .../Examples.Durham/shell_collection-unload | 0 .../Examples.Durham/shell_create-collection | 0 .../shell_create-collection-properties | 0 .../Examples.Durham/shell_create-document | 0 .../Examples.Durham/shell_create-edge | 0 .../Examples.Durham/shell_index-drop-index | 0 .../Examples.Durham/shell_index-drop-index-db | 0 .../Examples.Durham/shell_index-read | 0 .../Examples.Durham/shell_index-read-all | 0 .../Examples.Durham/shell_index-read-db | 0 .../Examples.Durham/shell_read-collection-all | 0 .../Examples.Durham/shell_read-collection-id | 0 .../shell_read-collection-name | 0 .../shell_read-collection-short-cut | 0 .../shell_read-collection-unknown | 0 .../Examples.Durham/shell_read-document-db | 0 .../Examples.Durham/shell_remove-document | 0 .../shell_remove-document-conflict | 0 .../shell_remove-document-conflict-db | 0 .../Examples.Durham/shell_remove-document-db | 0 .../Examples.Durham/shell_replace-document | 0 .../Examples.Durham/shell_replace-document-db | 0 .../shell_replace-document-handle | 0 .../Examples.Durham/shell_update-document | 0 .../shell_update-document-array | 0 .../Examples.Durham/shell_update-document-db | 0 .../shell_update-document-handle | 0 .../shell_update-document-keep-null | 0 .../simple-query-closed-range-to-array | 0 .../Examples.Durham/simple-query-geo | 0 .../Examples.Durham/simple-query-near | 0 .../Examples.Durham/simple-query-near2 | 0 .../simple-query-range-to-array | 0 .../Examples.Durham/simple-query-within | 0 .../Examples.Durham/simple10 | 0 .../Examples.Durham/simple18 | 0 .../Examples.Durham/simple19 | 0 .../Examples.Durham/simple2 | 0 .../Examples.Durham/simple3 | 0 .../Examples.Durham/simple4 | 0 .../Examples.Durham/simple5 | 0 .../Examples.Durham/simple7 | 0 .../Examples.Durham/simple8 | 0 .../Examples.Durham/simple9 | 0 .../Examples.Durham/system1 | 0 {Doxygen => Documentation}/Examples.Fyn/conf1 | 0 {Doxygen => Documentation}/Examples.Fyn/conf2 | 0 {Doxygen => Documentation}/Examples.Fyn/conf3 | 0 {Doxygen => Documentation}/Examples.Fyn/conf4 | 0 {Doxygen => Documentation}/Examples.Fyn/conf5 | 0 Documentation/Makefile.doxygen | 127 + .../Scripts/arangodb.css | 0 .../Scripts/arangodb_footer.html | 0 .../Scripts/arangodb_header.html | 0 .../Scripts/findverb.sh | 0 {Doxygen => Documentation}/Scripts/fixmd.sh | 0 .../Scripts/html2html.sh | 0 {Doxygen => Documentation}/Scripts/js2doxy.py | 0 {Doxygen => Documentation}/Scripts/tex2tex.py | 0 {Doxygen => Documentation}/Scripts/xml2md.py | 0 {Doxygen => Documentation}/arango-html.doxy | 0 {Doxygen => Documentation}/arango-latex.doxy | 0 {Doxygen => Documentation}/arango-xml.doxy | 0 {Doxygen => Documentation}/arango.template.in | 0 .../latex/dba-manual.tex | 0 {Doxygen => Documentation}/latex/header.tex | 0 .../latex/images/fe1.png | Bin .../latex/imp-manual.tex | 0 .../latex/implementor-manual.tex | 0 .../latex/install-manual.tex | 0 .../latex/ref-manual.tex | 0 .../latex/user-manual.tex | 0 {Doxygen => Documentation}/web/images/fe1.png | Bin .../web/images/logo_arangodb.png | Bin Doxygen/Makefile.doxygen | 127 - .../Contribute}/Makefile.ubuntu | 0 Installation/{ => Linux}/rc.arangodb.Centos | 0 Installation/{ => Linux}/rc.arangodb.Debian | 0 Installation/{ => Linux}/rc.arangodb.OpenSuSE | 0 Installation/{ => Linux}/rc.arangodb.Ubuntu | 0 Installation/{ => MacOSX}/org.arangodb.plist | 0 Makefile.local => Installation/Makefile.local | 0 Installation/arangod-local.conf | 24 - build.sh => Installation/build.sh | 0 coverage.sh => Installation/coverage.sh | 0 Installation/{ => epm}/arangodb.list | 2 +- packetize.sh => Installation/packetize.sh | 10 +- release.sh => Installation/release.sh | 1 - unittests.sh => Installation/unittests.sh | 0 Makefile.am | 137 +- Makefile.in | 618 ++-- README.md | 34 +- UnitTests/Makefile.files | 140 +- aclocal.m4 | 359 +- arangod/Documentation/install-manual.dox | 111 +- arangod/MRServer/ApplicationMR.cpp | 56 +- arangod/RestServer/ArangoServer.cpp | 100 +- arangod/RestServer/ArangoServer.h | 2 +- arangod/V8Server/ApplicationV8.cpp | 79 +- arangod/V8Server/ApplicationV8.h | 6 + arangoirb/MRClient/arangoirb.cpp | 285 +- arangosh/ArangoShell/ArangoClient.cpp | 674 ++++ arangosh/ArangoShell/ArangoClient.h | 554 +++ arangosh/Makefile.files | 2 + arangosh/V8Client/arangoimp.cpp | 250 +- arangosh/V8Client/arangosh.cpp | 586 +-- build.c | 5 - config/compile | 227 +- config/config.guess | 375 +- config/config.sub | 204 +- config/depcomp | 189 +- config/install-sh | 35 +- config/missing | 148 +- configure | 3280 +++++++++-------- configure.ac | 196 +- etc/relative/arangod.conf | 26 + etc/relative/arangosh.conf | 2 + {m4 => js}/Makefile.javascript | 0 js/client/client.js | 21 +- js/client/js-client.h | 21 +- js/common/bootstrap/js-modules.h | 23 +- js/common/bootstrap/js-print.h | 6 +- js/common/bootstrap/modules.js | 23 +- js/common/bootstrap/print.js | 6 +- lib/Admin/ApplicationAdminServer.cpp | 35 +- lib/Admin/ApplicationAdminServer.h | 6 + lib/ApplicationServer/ApplicationServer.cpp | 10 +- lib/BasicsC/local-configuration.h.in | 12 - lib/BasicsC/operating-system.h | 3 + {m4 => lib}/Makefile.bison | 20 +- {m4 => lib}/Makefile.flex | 20 +- {m4 => lib}/Makefile.protobuf | 22 +- m4/all-in-one.boost | 28 +- m4/all-in-one.libev | 43 +- m4/all-in-one.mruby | 35 +- m4/all-in-one.protobuf | 36 +- m4/all-in-one.v8 | 30 +- m4/configure.32bit | 46 - m4/configure.basics | 79 +- m4/configure.bison | 75 +- m4/configure.dot | 27 +- m4/configure.flex | 75 +- m4/external.boost | 52 +- m4/external.libev | 96 +- m4/external.math | 24 +- m4/external.ncurses | 122 +- m4/external.openssl | 11 +- m4/external.protobuf | 127 + m4/external.readline | 63 +- m4/external.v8 | 56 +- {m4 => mr}/Makefile.mruby | 0 {bin => utils}/arango-dfdb.in | 0 {bin => utils}/arango-password.in | 0 423 files changed, 5490 insertions(+), 4823 deletions(-) rename {m4 => 3rdParty}/Makefile.all-in-one-libev (54%) rename {m4 => 3rdParty}/Makefile.all-in-one-mruby (77%) rename {m4 => 3rdParty}/Makefile.all-in-one-protobuf (81%) rename {m4 => 3rdParty}/Makefile.all-in-one-v8 (77%) rename {m4 => 3rdParty}/Makefile.all-in-one-zeromq (87%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlarithmetic (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlattributenamesvalid (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlbind (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlbindcollection (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlcollect (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlcollect2 (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlcollectsyntax (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlcomments (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlcompareexamples1 (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlcompareexamples2 (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlcompareexamples3 (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlcomparison (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqldocumentaccess (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqldocumentempty (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlexample-collection (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlexample-grouping (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlexample-join (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlexample-simple (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlexpansion (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlfilter (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlfiltermultiple (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlfiltersyntax (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlfor (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlfornested (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlforstatic (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlforsyntax (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlfunctions (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlfunctionsyntax (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqllet (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqllet2 (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlletsyntax (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqllimit (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqllimitsyntax (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqllistaccess (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqllistempty (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqllistvalues (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqllogical (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlnamebackticks (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlnamedattributes (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlnull (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlnull2 (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlnumbers (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlpaths (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlqueryintro (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlqueryresultempty (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlqueryresulthomogenuous (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlqueryresultinhomogenuous (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlqueryresultscalar (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlreturn (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlreturnsyntax (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlsort (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlsortsyntax (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlstrings (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlsubquery (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlternary (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqltypeorder (100%) rename {Doxygen => Documentation}/Examples.Ahuacatl/aqlvariablenames (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-all-collections (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-bad-handle (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-create-collection (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-delete-collection-identifier (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-delete-collection-name (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-get-collection-count (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-get-collection-figures (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-get-collection-identifier (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-get-collection-name (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-identifier-load (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-identifier-properties-sync (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-identifier-rename (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-identifier-truncate (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-collection-identifier-unload (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-cursor-create-for-limit-return (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-cursor-create-for-limit-return-cont (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-cursor-create-for-limit-return-cont2 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-cursor-create-for-limit-return-cont3 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-cursor-create-for-limit-return-single (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-cursor-delete (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-cursor-invalid-cursor-identifier (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-cursor-missing-body (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-cursor-missing-cursor-identifier (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-cursor-unknown-collection (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-explain-invalid (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-explain-valid (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-import-documents (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-import-headers (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-index-all-indexes (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-index-create-geo-latitude-longitude (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-index-create-geo-location (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-index-create-new-cap-constraint (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-index-create-new-hash-index (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-index-create-new-skiplist (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-index-create-new-unique-constraint (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-index-create-new-unique-skiplist (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-index-delete-unique-skiplist (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-index-primary-index (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-query-invalid (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-query-valid (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-simple-all-skip-limit (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-simple-by-example1 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-simple-by-example2 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-simple-by-example3 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-simple-first-example (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-simple-first-example-not-found (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-simple-near (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-simple-near-distance (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-simple-range (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-simple-within (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api-simple-within-distance (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api_database1 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api_database2 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api_database3 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api_database4 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/api_database5 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/arangosh-options (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/arangosh-start (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/arangosh-start-full (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/connection-statistics (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/connection-statistics-current (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/document1 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_delete-key-bad (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_delete-key-ok (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_delete-key-request (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_get-key-bad (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_get-key-ok (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_get-key-request (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_get-keys-bad (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_get-keys-ok (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_get-keys-request (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_post-key-bad (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_post-key-ok (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_post-key-request (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_put-key-bad (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_put-key-ok (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/key-value_put-key-request (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/openssl-ciphers (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/openssl-options (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/option-database-directory (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/option-server-endpoint (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/querypost (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/querypostfail (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/request-statistics (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/request-statistics-current (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-create-document (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-create-document-accept (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-create-document-bad-json (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-create-document-create-collection (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-create-document-named-collection (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-create-document-new-named-collection (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-create-document-unknown-cid (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-delete-document (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-delete-document-if-match-other (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-delete-document-unknown-handle (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-edge-create-edge (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-edge-read-edge (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-edge-read-edges-any (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-edge-read-edges-in (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-edge-read-edges-out (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-patch-document (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-read-document (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-read-document-all (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-read-document-head (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-read-document-if-none-match (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-read-document-unknown-handle (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-update-document (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-update-document-if-match-other (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-update-document-if-match-other-last-write (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-update-document-rev-other (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/rest-update-document-unknown-handle (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/server-keyfile (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/server-keyfile-openssl (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/start-emergency-console (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/startup1 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/supervisor (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/supervisor-ps1 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/supervisor-ps2 (100%) rename {Doxygen => Documentation}/Examples.ArangoDB/user-document (100%) rename {Doxygen => Documentation}/Examples.Durham/action1 (100%) rename {Doxygen => Documentation}/Examples.Durham/action2 (100%) rename {Doxygen => Documentation}/Examples.Durham/action3 (100%) rename {Doxygen => Documentation}/Examples.Durham/action4 (100%) rename {Doxygen => Documentation}/Examples.Durham/arangoimp-data-csv (100%) rename {Doxygen => Documentation}/Examples.Durham/arangoimp-data-json (100%) rename {Doxygen => Documentation}/Examples.Durham/arangosh-all-documents (100%) rename {Doxygen => Documentation}/Examples.Durham/arangosh-create-collection (100%) rename {Doxygen => Documentation}/Examples.Durham/arangosh-db (100%) rename {Doxygen => Documentation}/Examples.Durham/arangosh-save-documents (100%) rename {Doxygen => Documentation}/Examples.Durham/arangosh-unload-collection (100%) rename {Doxygen => Documentation}/Examples.Durham/demo1 (100%) rename {Doxygen => Documentation}/Examples.Durham/ensure-cap-constraint (100%) rename {Doxygen => Documentation}/Examples.Durham/ensure-geo-index-array (100%) rename {Doxygen => Documentation}/Examples.Durham/ensure-geo-index-list (100%) rename {Doxygen => Documentation}/Examples.Durham/five1 (100%) rename {Doxygen => Documentation}/Examples.Durham/fluent14 (100%) rename {Doxygen => Documentation}/Examples.Durham/fluent36 (100%) rename {Doxygen => Documentation}/Examples.Durham/fluent37 (100%) rename {Doxygen => Documentation}/Examples.Durham/fluent38 (100%) rename {Doxygen => Documentation}/Examples.Durham/fluent39 (100%) rename {Doxygen => Documentation}/Examples.Durham/fluent40 (100%) rename {Doxygen => Documentation}/Examples.Durham/fluent47 (100%) rename {Doxygen => Documentation}/Examples.Durham/fluent48 (100%) rename {Doxygen => Documentation}/Examples.Durham/fluent49 (100%) rename {Doxygen => Documentation}/Examples.Durham/fluent50 (100%) rename {Doxygen => Documentation}/Examples.Durham/geojs1 (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-constructor (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-edge-get-id (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-edge-get-in-vertex (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-edge-get-label (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-edge-get-out-vertex (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-edge-get-property (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-edge-get-property-keys (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-edge-properties (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-edge-set-property (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-graph-add-edge (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-graph-add-edge2 (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-graph-add-vertex (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-graph-add-vertex2 (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-graph-get-edges (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-graph-get-vertex (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-graph-get-vertices (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-graph-remove-edge (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-graph-remove-vertex (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-setup (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-add-in-edge (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-add-in-edge2 (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-add-out-edge (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-add-out-edge2 (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-add-out-edge3 (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-edges (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-get-id (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-get-in-edges (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-get-out-edges (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-get-property (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-get-property-keys (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-inbound (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-outbound (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-properties (100%) rename {Doxygen => Documentation}/Examples.Durham/graph-vertex-set-property (100%) rename {Doxygen => Documentation}/Examples.Durham/graph25 (100%) rename {Doxygen => Documentation}/Examples.Durham/graph26 (100%) rename {Doxygen => Documentation}/Examples.Durham/jsunity1 (100%) rename {Doxygen => Documentation}/Examples.Durham/jsunity2 (100%) rename {Doxygen => Documentation}/Examples.Durham/modules-require-1 (100%) rename {Doxygen => Documentation}/Examples.Durham/modules-require-2 (100%) rename {Doxygen => Documentation}/Examples.Durham/shell-collection-count (100%) rename {Doxygen => Documentation}/Examples.Durham/shell-edge-edges (100%) rename {Doxygen => Documentation}/Examples.Durham/shell-edge-in-edges (100%) rename {Doxygen => Documentation}/Examples.Durham/shell-edge-out-edges (100%) rename {Doxygen => Documentation}/Examples.Durham/shell-index-create-hash-index (100%) rename {Doxygen => Documentation}/Examples.Durham/shell-index-create-unique-constraint (100%) rename {Doxygen => Documentation}/Examples.Durham/shell-read-document (100%) rename {Doxygen => Documentation}/Examples.Durham/shell-read-document-bad-handle (100%) rename {Doxygen => Documentation}/Examples.Durham/shell-read-document-not-found (100%) rename {Doxygen => Documentation}/Examples.Durham/shell-simple-query-first-example (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_collection-drop (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_collection-drop-db (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_collection-drop-name-db (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_collection-figures (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_collection-load (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_collection-properties (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_collection-properties-change (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_collection-rename (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_collection-truncate (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_collection-truncate-db (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_collection-truncate-name-db (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_collection-unload (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_create-collection (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_create-collection-properties (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_create-document (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_create-edge (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_index-drop-index (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_index-drop-index-db (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_index-read (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_index-read-all (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_index-read-db (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_read-collection-all (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_read-collection-id (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_read-collection-name (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_read-collection-short-cut (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_read-collection-unknown (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_read-document-db (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_remove-document (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_remove-document-conflict (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_remove-document-conflict-db (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_remove-document-db (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_replace-document (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_replace-document-db (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_replace-document-handle (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_update-document (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_update-document-array (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_update-document-db (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_update-document-handle (100%) rename {Doxygen => Documentation}/Examples.Durham/shell_update-document-keep-null (100%) rename {Doxygen => Documentation}/Examples.Durham/simple-query-closed-range-to-array (100%) rename {Doxygen => Documentation}/Examples.Durham/simple-query-geo (100%) rename {Doxygen => Documentation}/Examples.Durham/simple-query-near (100%) rename {Doxygen => Documentation}/Examples.Durham/simple-query-near2 (100%) rename {Doxygen => Documentation}/Examples.Durham/simple-query-range-to-array (100%) rename {Doxygen => Documentation}/Examples.Durham/simple-query-within (100%) rename {Doxygen => Documentation}/Examples.Durham/simple10 (100%) rename {Doxygen => Documentation}/Examples.Durham/simple18 (100%) rename {Doxygen => Documentation}/Examples.Durham/simple19 (100%) rename {Doxygen => Documentation}/Examples.Durham/simple2 (100%) rename {Doxygen => Documentation}/Examples.Durham/simple3 (100%) rename {Doxygen => Documentation}/Examples.Durham/simple4 (100%) rename {Doxygen => Documentation}/Examples.Durham/simple5 (100%) rename {Doxygen => Documentation}/Examples.Durham/simple7 (100%) rename {Doxygen => Documentation}/Examples.Durham/simple8 (100%) rename {Doxygen => Documentation}/Examples.Durham/simple9 (100%) rename {Doxygen => Documentation}/Examples.Durham/system1 (100%) rename {Doxygen => Documentation}/Examples.Fyn/conf1 (100%) rename {Doxygen => Documentation}/Examples.Fyn/conf2 (100%) rename {Doxygen => Documentation}/Examples.Fyn/conf3 (100%) rename {Doxygen => Documentation}/Examples.Fyn/conf4 (100%) rename {Doxygen => Documentation}/Examples.Fyn/conf5 (100%) create mode 100644 Documentation/Makefile.doxygen rename {Doxygen => Documentation}/Scripts/arangodb.css (100%) rename {Doxygen => Documentation}/Scripts/arangodb_footer.html (100%) rename {Doxygen => Documentation}/Scripts/arangodb_header.html (100%) rename {Doxygen => Documentation}/Scripts/findverb.sh (100%) rename {Doxygen => Documentation}/Scripts/fixmd.sh (100%) rename {Doxygen => Documentation}/Scripts/html2html.sh (100%) rename {Doxygen => Documentation}/Scripts/js2doxy.py (100%) rename {Doxygen => Documentation}/Scripts/tex2tex.py (100%) rename {Doxygen => Documentation}/Scripts/xml2md.py (100%) rename {Doxygen => Documentation}/arango-html.doxy (100%) rename {Doxygen => Documentation}/arango-latex.doxy (100%) rename {Doxygen => Documentation}/arango-xml.doxy (100%) rename {Doxygen => Documentation}/arango.template.in (100%) rename {Doxygen => Documentation}/latex/dba-manual.tex (100%) rename {Doxygen => Documentation}/latex/header.tex (100%) rename {Doxygen => Documentation}/latex/images/fe1.png (100%) rename {Doxygen => Documentation}/latex/imp-manual.tex (100%) rename {Doxygen => Documentation}/latex/implementor-manual.tex (100%) rename {Doxygen => Documentation}/latex/install-manual.tex (100%) rename {Doxygen => Documentation}/latex/ref-manual.tex (100%) rename {Doxygen => Documentation}/latex/user-manual.tex (100%) rename {Doxygen => Documentation}/web/images/fe1.png (100%) rename {Doxygen => Documentation}/web/images/logo_arangodb.png (100%) delete mode 100644 Doxygen/Makefile.doxygen rename {Contribute => Installation/Contribute}/Makefile.ubuntu (100%) rename Installation/{ => Linux}/rc.arangodb.Centos (100%) rename Installation/{ => Linux}/rc.arangodb.Debian (100%) rename Installation/{ => Linux}/rc.arangodb.OpenSuSE (100%) rename Installation/{ => Linux}/rc.arangodb.Ubuntu (100%) rename Installation/{ => MacOSX}/org.arangodb.plist (100%) rename Makefile.local => Installation/Makefile.local (100%) delete mode 100644 Installation/arangod-local.conf rename build.sh => Installation/build.sh (100%) rename coverage.sh => Installation/coverage.sh (100%) mode change 100644 => 100755 rename Installation/{ => epm}/arangodb.list (98%) rename packetize.sh => Installation/packetize.sh (98%) rename release.sh => Installation/release.sh (99%) rename unittests.sh => Installation/unittests.sh (100%) create mode 100644 arangosh/ArangoShell/ArangoClient.cpp create mode 100644 arangosh/ArangoShell/ArangoClient.h delete mode 100644 build.c create mode 100644 etc/relative/arangod.conf create mode 100644 etc/relative/arangosh.conf rename {m4 => js}/Makefile.javascript (100%) rename {m4 => lib}/Makefile.bison (79%) rename {m4 => lib}/Makefile.flex (79%) rename {m4 => lib}/Makefile.protobuf (71%) delete mode 100644 m4/configure.32bit create mode 100644 m4/external.protobuf rename {m4 => mr}/Makefile.mruby (100%) rename {bin => utils}/arango-dfdb.in (100%) rename {bin => utils}/arango-password.in (100%) mode change 100755 => 100644 diff --git a/.gitignore b/.gitignore index 26aaac25a1..b4aad3efb1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ 3rdParty/czmq-1.1.0/src/czmq_selftest 3rdParty/czmq-1.1.0/src/libczmq.pc 3rdParty/czmq-1.1.0/src/platform.h -3rdParty/libev/ARCH.x64 +3rdParty/libev/BUILD 3rdParty/libev/libtool 3rdParty/mruby/bin/mrbc 3rdParty/mruby/bin/mruby @@ -88,18 +88,19 @@ config.status configure config/version.sh COVERAGE -.czmq-build-64 +.czmq-build-* .deps .dirstamp -Doxygen/arango.doxy -Doxygen/html/ -Doxygen/js -Doxygen/latex/ -Doxygen/manuals -Doxygen/.setup-directories -Doxygen/web/*.html -Doxygen/wiki/ -Doxygen/xml/ +Documentation/arango.template +Documentation/arango.doxy +Documentation/html/ +Documentation/js +Documentation/latex/ +Documentation/manuals +Documentation/.setup-directories +Documentation/web/*.html +Documentation/wiki/ +Documentation/xml/ .DS_Store *.gcda *.gcno @@ -140,7 +141,7 @@ Makefile.local *.old out *.Po -.protobuf-build-64 +.protobuf-build-* *.pyc .setup-js-directories .setup-mr-directories @@ -162,4 +163,4 @@ UnitTests/Philadelphia/Makefile.py UnitTests/Philadelphia/Runner.cpp .v8-build-* VC++ -.zeromq-build-64 +.zeromq-build-* diff --git a/m4/Makefile.all-in-one-libev b/3rdParty/Makefile.all-in-one-libev similarity index 54% rename from m4/Makefile.all-in-one-libev rename to 3rdParty/Makefile.all-in-one-libev index 7daeb173d5..3e894ee27a 100644 --- a/m4/Makefile.all-in-one-libev +++ b/3rdParty/Makefile.all-in-one-libev @@ -1,29 +1,13 @@ # -*- mode: Makefile; -*- -################################################################################ +## ----------------------------------------------------------------------------- ## --SECTION-- LIBRARY -################################################################################ +## ----------------------------------------------------------------------------- ################################################################################ ### @brief libev ################################################################################ -if ENABLE_64BIT -LIBEV_BUILD_VERSION=ARCH.x64 -endif - -if ENABLE_32BIT -LIBEV_BUILD_VERSION=ARCH.ia32 -endif - -if ENABLE_FORCE_32BIT -LIBEV_BUILD_CFLAGS_X=-m32 -O2 -g -LIBEV_BUILD_LDFLAGS_X=-m32 -else -LIBEV_BUILD_CFLAGS_X=-O2 -g -LIBEV_BUILD_LDFLAGS_X= -endif - BUILT_SOURCES += @LIBEV_LIBS@ @LIBEV_LIBS@: .libev-build-@TRI_BITS@ @@ -35,9 +19,9 @@ BUILT_SOURCES += @LIBEV_LIBS@ @echo "--------------------------------------------------------------------------------" @echo - mkdir @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) || true - cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && CFLAGS="$(LIBEV_BUILD_CFLAGS_X)" orig_CFLAGS="$(LIBEV_BUILD_CFLAGS_X)" LDFLAGS="$(LIBEV_BUILD_LDFLAGS_X)" ../configure --disable-shared - cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && $(MAKE) + mkdir @top_srcdir@/3rdParty/libev/BUILD || true + cd @top_srcdir@/3rdParty/libev/BUILD && ../configure --disable-shared + cd @top_srcdir@/3rdParty/libev/BUILD && $(MAKE) touch .libev-build-@TRI_BITS@ @@ -47,9 +31,9 @@ BUILT_SOURCES += @LIBEV_LIBS@ @echo "--------------------------------------------------------------------------------" @echo -################################################################################ +## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE -################################################################################ +## ----------------------------------------------------------------------------- ## Local Variables: ## mode: outline-minor diff --git a/m4/Makefile.all-in-one-mruby b/3rdParty/Makefile.all-in-one-mruby similarity index 77% rename from m4/Makefile.all-in-one-mruby rename to 3rdParty/Makefile.all-in-one-mruby index 4adb0431ae..76e2ebd266 100644 --- a/m4/Makefile.all-in-one-mruby +++ b/3rdParty/Makefile.all-in-one-mruby @@ -1,8 +1,8 @@ # -*- mode: Makefile; -*- -################################################################################ +## ----------------------------------------------------------------------------- ## --SECTION-- LIBRARY -################################################################################ +## ----------------------------------------------------------------------------- ################################################################################ ### @brief mruby @@ -29,9 +29,9 @@ BUILT_SOURCES += @MRUBY_LIBS@ @echo "--------------------------------------------------------------------------------" @echo -################################################################################ +## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE -################################################################################ +## ----------------------------------------------------------------------------- ## Local Variables: ## mode: outline-minor diff --git a/m4/Makefile.all-in-one-protobuf b/3rdParty/Makefile.all-in-one-protobuf similarity index 81% rename from m4/Makefile.all-in-one-protobuf rename to 3rdParty/Makefile.all-in-one-protobuf index 492ceb3558..cbe0cd55ec 100644 --- a/m4/Makefile.all-in-one-protobuf +++ b/3rdParty/Makefile.all-in-one-protobuf @@ -1,8 +1,8 @@ # -*- mode: Makefile; -*- -################################################################################ +## ----------------------------------------------------------------------------- ## --SECTION-- LIBRARY -################################################################################ +## ----------------------------------------------------------------------------- ################################################################################ ### @brief Protobuf @@ -36,9 +36,9 @@ PROTOBUFDIR = @abs_top_srcdir@/3rdParty/protobuf-2.4.1/BUILD @echo "--------------------------------------------------------------------------------" @echo -################################################################################ +## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE -################################################################################ +## ----------------------------------------------------------------------------- ## Local Variables: ## mode: outline-minor diff --git a/m4/Makefile.all-in-one-v8 b/3rdParty/Makefile.all-in-one-v8 similarity index 77% rename from m4/Makefile.all-in-one-v8 rename to 3rdParty/Makefile.all-in-one-v8 index 8b3eb0de1c..6f1a4a5fb4 100644 --- a/m4/Makefile.all-in-one-v8 +++ b/3rdParty/Makefile.all-in-one-v8 @@ -1,8 +1,8 @@ # -*- mode: Makefile; -*- -################################################################################ +## ----------------------------------------------------------------------------- ## --SECTION-- LIBRARY -################################################################################ +## ----------------------------------------------------------------------------- ################################################################################ ### @brief V8 @@ -29,9 +29,9 @@ BUILT_SOURCES += @V8_LIBS@ @echo "--------------------------------------------------------------------------------" @echo -################################################################################ +## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE -################################################################################ +## ----------------------------------------------------------------------------- ## Local Variables: ## mode: outline-minor diff --git a/m4/Makefile.all-in-one-zeromq b/3rdParty/Makefile.all-in-one-zeromq similarity index 87% rename from m4/Makefile.all-in-one-zeromq rename to 3rdParty/Makefile.all-in-one-zeromq index 47e5ff221e..4822ad7c85 100644 --- a/m4/Makefile.all-in-one-zeromq +++ b/3rdParty/Makefile.all-in-one-zeromq @@ -1,8 +1,8 @@ # -*- mode: Makefile; -*- -################################################################################ +## ----------------------------------------------------------------------------- ## --SECTION-- LIBRARY -################################################################################ +## ----------------------------------------------------------------------------- ################################################################################ ### @brief ZeroMQ @@ -62,9 +62,9 @@ ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD @echo "--------------------------------------------------------------------------------" @echo -################################################################################ +## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE -################################################################################ +## ----------------------------------------------------------------------------- ## Local Variables: ## mode: outline-minor diff --git a/Doxygen/Examples.Ahuacatl/aqlarithmetic b/Documentation/Examples.Ahuacatl/aqlarithmetic similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlarithmetic rename to Documentation/Examples.Ahuacatl/aqlarithmetic diff --git a/Doxygen/Examples.Ahuacatl/aqlattributenamesvalid b/Documentation/Examples.Ahuacatl/aqlattributenamesvalid similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlattributenamesvalid rename to Documentation/Examples.Ahuacatl/aqlattributenamesvalid diff --git a/Doxygen/Examples.Ahuacatl/aqlbind b/Documentation/Examples.Ahuacatl/aqlbind similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlbind rename to Documentation/Examples.Ahuacatl/aqlbind diff --git a/Doxygen/Examples.Ahuacatl/aqlbindcollection b/Documentation/Examples.Ahuacatl/aqlbindcollection similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlbindcollection rename to Documentation/Examples.Ahuacatl/aqlbindcollection diff --git a/Doxygen/Examples.Ahuacatl/aqlcollect b/Documentation/Examples.Ahuacatl/aqlcollect similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlcollect rename to Documentation/Examples.Ahuacatl/aqlcollect diff --git a/Doxygen/Examples.Ahuacatl/aqlcollect2 b/Documentation/Examples.Ahuacatl/aqlcollect2 similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlcollect2 rename to Documentation/Examples.Ahuacatl/aqlcollect2 diff --git a/Doxygen/Examples.Ahuacatl/aqlcollectsyntax b/Documentation/Examples.Ahuacatl/aqlcollectsyntax similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlcollectsyntax rename to Documentation/Examples.Ahuacatl/aqlcollectsyntax diff --git a/Doxygen/Examples.Ahuacatl/aqlcomments b/Documentation/Examples.Ahuacatl/aqlcomments similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlcomments rename to Documentation/Examples.Ahuacatl/aqlcomments diff --git a/Doxygen/Examples.Ahuacatl/aqlcompareexamples1 b/Documentation/Examples.Ahuacatl/aqlcompareexamples1 similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlcompareexamples1 rename to Documentation/Examples.Ahuacatl/aqlcompareexamples1 diff --git a/Doxygen/Examples.Ahuacatl/aqlcompareexamples2 b/Documentation/Examples.Ahuacatl/aqlcompareexamples2 similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlcompareexamples2 rename to Documentation/Examples.Ahuacatl/aqlcompareexamples2 diff --git a/Doxygen/Examples.Ahuacatl/aqlcompareexamples3 b/Documentation/Examples.Ahuacatl/aqlcompareexamples3 similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlcompareexamples3 rename to Documentation/Examples.Ahuacatl/aqlcompareexamples3 diff --git a/Doxygen/Examples.Ahuacatl/aqlcomparison b/Documentation/Examples.Ahuacatl/aqlcomparison similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlcomparison rename to Documentation/Examples.Ahuacatl/aqlcomparison diff --git a/Doxygen/Examples.Ahuacatl/aqldocumentaccess b/Documentation/Examples.Ahuacatl/aqldocumentaccess similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqldocumentaccess rename to Documentation/Examples.Ahuacatl/aqldocumentaccess diff --git a/Doxygen/Examples.Ahuacatl/aqldocumentempty b/Documentation/Examples.Ahuacatl/aqldocumentempty similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqldocumentempty rename to Documentation/Examples.Ahuacatl/aqldocumentempty diff --git a/Doxygen/Examples.Ahuacatl/aqlexample-collection b/Documentation/Examples.Ahuacatl/aqlexample-collection similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlexample-collection rename to Documentation/Examples.Ahuacatl/aqlexample-collection diff --git a/Doxygen/Examples.Ahuacatl/aqlexample-grouping b/Documentation/Examples.Ahuacatl/aqlexample-grouping similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlexample-grouping rename to Documentation/Examples.Ahuacatl/aqlexample-grouping diff --git a/Doxygen/Examples.Ahuacatl/aqlexample-join b/Documentation/Examples.Ahuacatl/aqlexample-join similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlexample-join rename to Documentation/Examples.Ahuacatl/aqlexample-join diff --git a/Doxygen/Examples.Ahuacatl/aqlexample-simple b/Documentation/Examples.Ahuacatl/aqlexample-simple similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlexample-simple rename to Documentation/Examples.Ahuacatl/aqlexample-simple diff --git a/Doxygen/Examples.Ahuacatl/aqlexpansion b/Documentation/Examples.Ahuacatl/aqlexpansion similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlexpansion rename to Documentation/Examples.Ahuacatl/aqlexpansion diff --git a/Doxygen/Examples.Ahuacatl/aqlfilter b/Documentation/Examples.Ahuacatl/aqlfilter similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlfilter rename to Documentation/Examples.Ahuacatl/aqlfilter diff --git a/Doxygen/Examples.Ahuacatl/aqlfiltermultiple b/Documentation/Examples.Ahuacatl/aqlfiltermultiple similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlfiltermultiple rename to Documentation/Examples.Ahuacatl/aqlfiltermultiple diff --git a/Doxygen/Examples.Ahuacatl/aqlfiltersyntax b/Documentation/Examples.Ahuacatl/aqlfiltersyntax similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlfiltersyntax rename to Documentation/Examples.Ahuacatl/aqlfiltersyntax diff --git a/Doxygen/Examples.Ahuacatl/aqlfor b/Documentation/Examples.Ahuacatl/aqlfor similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlfor rename to Documentation/Examples.Ahuacatl/aqlfor diff --git a/Doxygen/Examples.Ahuacatl/aqlfornested b/Documentation/Examples.Ahuacatl/aqlfornested similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlfornested rename to Documentation/Examples.Ahuacatl/aqlfornested diff --git a/Doxygen/Examples.Ahuacatl/aqlforstatic b/Documentation/Examples.Ahuacatl/aqlforstatic similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlforstatic rename to Documentation/Examples.Ahuacatl/aqlforstatic diff --git a/Doxygen/Examples.Ahuacatl/aqlforsyntax b/Documentation/Examples.Ahuacatl/aqlforsyntax similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlforsyntax rename to Documentation/Examples.Ahuacatl/aqlforsyntax diff --git a/Doxygen/Examples.Ahuacatl/aqlfunctions b/Documentation/Examples.Ahuacatl/aqlfunctions similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlfunctions rename to Documentation/Examples.Ahuacatl/aqlfunctions diff --git a/Doxygen/Examples.Ahuacatl/aqlfunctionsyntax b/Documentation/Examples.Ahuacatl/aqlfunctionsyntax similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlfunctionsyntax rename to Documentation/Examples.Ahuacatl/aqlfunctionsyntax diff --git a/Doxygen/Examples.Ahuacatl/aqllet b/Documentation/Examples.Ahuacatl/aqllet similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqllet rename to Documentation/Examples.Ahuacatl/aqllet diff --git a/Doxygen/Examples.Ahuacatl/aqllet2 b/Documentation/Examples.Ahuacatl/aqllet2 similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqllet2 rename to Documentation/Examples.Ahuacatl/aqllet2 diff --git a/Doxygen/Examples.Ahuacatl/aqlletsyntax b/Documentation/Examples.Ahuacatl/aqlletsyntax similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlletsyntax rename to Documentation/Examples.Ahuacatl/aqlletsyntax diff --git a/Doxygen/Examples.Ahuacatl/aqllimit b/Documentation/Examples.Ahuacatl/aqllimit similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqllimit rename to Documentation/Examples.Ahuacatl/aqllimit diff --git a/Doxygen/Examples.Ahuacatl/aqllimitsyntax b/Documentation/Examples.Ahuacatl/aqllimitsyntax similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqllimitsyntax rename to Documentation/Examples.Ahuacatl/aqllimitsyntax diff --git a/Doxygen/Examples.Ahuacatl/aqllistaccess b/Documentation/Examples.Ahuacatl/aqllistaccess similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqllistaccess rename to Documentation/Examples.Ahuacatl/aqllistaccess diff --git a/Doxygen/Examples.Ahuacatl/aqllistempty b/Documentation/Examples.Ahuacatl/aqllistempty similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqllistempty rename to Documentation/Examples.Ahuacatl/aqllistempty diff --git a/Doxygen/Examples.Ahuacatl/aqllistvalues b/Documentation/Examples.Ahuacatl/aqllistvalues similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqllistvalues rename to Documentation/Examples.Ahuacatl/aqllistvalues diff --git a/Doxygen/Examples.Ahuacatl/aqllogical b/Documentation/Examples.Ahuacatl/aqllogical similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqllogical rename to Documentation/Examples.Ahuacatl/aqllogical diff --git a/Doxygen/Examples.Ahuacatl/aqlnamebackticks b/Documentation/Examples.Ahuacatl/aqlnamebackticks similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlnamebackticks rename to Documentation/Examples.Ahuacatl/aqlnamebackticks diff --git a/Doxygen/Examples.Ahuacatl/aqlnamedattributes b/Documentation/Examples.Ahuacatl/aqlnamedattributes similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlnamedattributes rename to Documentation/Examples.Ahuacatl/aqlnamedattributes diff --git a/Doxygen/Examples.Ahuacatl/aqlnull b/Documentation/Examples.Ahuacatl/aqlnull similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlnull rename to Documentation/Examples.Ahuacatl/aqlnull diff --git a/Doxygen/Examples.Ahuacatl/aqlnull2 b/Documentation/Examples.Ahuacatl/aqlnull2 similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlnull2 rename to Documentation/Examples.Ahuacatl/aqlnull2 diff --git a/Doxygen/Examples.Ahuacatl/aqlnumbers b/Documentation/Examples.Ahuacatl/aqlnumbers similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlnumbers rename to Documentation/Examples.Ahuacatl/aqlnumbers diff --git a/Doxygen/Examples.Ahuacatl/aqlpaths b/Documentation/Examples.Ahuacatl/aqlpaths similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlpaths rename to Documentation/Examples.Ahuacatl/aqlpaths diff --git a/Doxygen/Examples.Ahuacatl/aqlqueryintro b/Documentation/Examples.Ahuacatl/aqlqueryintro similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlqueryintro rename to Documentation/Examples.Ahuacatl/aqlqueryintro diff --git a/Doxygen/Examples.Ahuacatl/aqlqueryresultempty b/Documentation/Examples.Ahuacatl/aqlqueryresultempty similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlqueryresultempty rename to Documentation/Examples.Ahuacatl/aqlqueryresultempty diff --git a/Doxygen/Examples.Ahuacatl/aqlqueryresulthomogenuous b/Documentation/Examples.Ahuacatl/aqlqueryresulthomogenuous similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlqueryresulthomogenuous rename to Documentation/Examples.Ahuacatl/aqlqueryresulthomogenuous diff --git a/Doxygen/Examples.Ahuacatl/aqlqueryresultinhomogenuous b/Documentation/Examples.Ahuacatl/aqlqueryresultinhomogenuous similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlqueryresultinhomogenuous rename to Documentation/Examples.Ahuacatl/aqlqueryresultinhomogenuous diff --git a/Doxygen/Examples.Ahuacatl/aqlqueryresultscalar b/Documentation/Examples.Ahuacatl/aqlqueryresultscalar similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlqueryresultscalar rename to Documentation/Examples.Ahuacatl/aqlqueryresultscalar diff --git a/Doxygen/Examples.Ahuacatl/aqlreturn b/Documentation/Examples.Ahuacatl/aqlreturn similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlreturn rename to Documentation/Examples.Ahuacatl/aqlreturn diff --git a/Doxygen/Examples.Ahuacatl/aqlreturnsyntax b/Documentation/Examples.Ahuacatl/aqlreturnsyntax similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlreturnsyntax rename to Documentation/Examples.Ahuacatl/aqlreturnsyntax diff --git a/Doxygen/Examples.Ahuacatl/aqlsort b/Documentation/Examples.Ahuacatl/aqlsort similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlsort rename to Documentation/Examples.Ahuacatl/aqlsort diff --git a/Doxygen/Examples.Ahuacatl/aqlsortsyntax b/Documentation/Examples.Ahuacatl/aqlsortsyntax similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlsortsyntax rename to Documentation/Examples.Ahuacatl/aqlsortsyntax diff --git a/Doxygen/Examples.Ahuacatl/aqlstrings b/Documentation/Examples.Ahuacatl/aqlstrings similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlstrings rename to Documentation/Examples.Ahuacatl/aqlstrings diff --git a/Doxygen/Examples.Ahuacatl/aqlsubquery b/Documentation/Examples.Ahuacatl/aqlsubquery similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlsubquery rename to Documentation/Examples.Ahuacatl/aqlsubquery diff --git a/Doxygen/Examples.Ahuacatl/aqlternary b/Documentation/Examples.Ahuacatl/aqlternary similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlternary rename to Documentation/Examples.Ahuacatl/aqlternary diff --git a/Doxygen/Examples.Ahuacatl/aqltypeorder b/Documentation/Examples.Ahuacatl/aqltypeorder similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqltypeorder rename to Documentation/Examples.Ahuacatl/aqltypeorder diff --git a/Doxygen/Examples.Ahuacatl/aqlvariablenames b/Documentation/Examples.Ahuacatl/aqlvariablenames similarity index 100% rename from Doxygen/Examples.Ahuacatl/aqlvariablenames rename to Documentation/Examples.Ahuacatl/aqlvariablenames diff --git a/Doxygen/Examples.ArangoDB/api-collection-all-collections b/Documentation/Examples.ArangoDB/api-collection-all-collections similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-all-collections rename to Documentation/Examples.ArangoDB/api-collection-all-collections diff --git a/Doxygen/Examples.ArangoDB/api-collection-bad-handle b/Documentation/Examples.ArangoDB/api-collection-bad-handle similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-bad-handle rename to Documentation/Examples.ArangoDB/api-collection-bad-handle diff --git a/Doxygen/Examples.ArangoDB/api-collection-create-collection b/Documentation/Examples.ArangoDB/api-collection-create-collection similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-create-collection rename to Documentation/Examples.ArangoDB/api-collection-create-collection diff --git a/Doxygen/Examples.ArangoDB/api-collection-delete-collection-identifier b/Documentation/Examples.ArangoDB/api-collection-delete-collection-identifier similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-delete-collection-identifier rename to Documentation/Examples.ArangoDB/api-collection-delete-collection-identifier diff --git a/Doxygen/Examples.ArangoDB/api-collection-delete-collection-name b/Documentation/Examples.ArangoDB/api-collection-delete-collection-name similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-delete-collection-name rename to Documentation/Examples.ArangoDB/api-collection-delete-collection-name diff --git a/Doxygen/Examples.ArangoDB/api-collection-get-collection-count b/Documentation/Examples.ArangoDB/api-collection-get-collection-count similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-get-collection-count rename to Documentation/Examples.ArangoDB/api-collection-get-collection-count diff --git a/Doxygen/Examples.ArangoDB/api-collection-get-collection-figures b/Documentation/Examples.ArangoDB/api-collection-get-collection-figures similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-get-collection-figures rename to Documentation/Examples.ArangoDB/api-collection-get-collection-figures diff --git a/Doxygen/Examples.ArangoDB/api-collection-get-collection-identifier b/Documentation/Examples.ArangoDB/api-collection-get-collection-identifier similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-get-collection-identifier rename to Documentation/Examples.ArangoDB/api-collection-get-collection-identifier diff --git a/Doxygen/Examples.ArangoDB/api-collection-get-collection-name b/Documentation/Examples.ArangoDB/api-collection-get-collection-name similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-get-collection-name rename to Documentation/Examples.ArangoDB/api-collection-get-collection-name diff --git a/Doxygen/Examples.ArangoDB/api-collection-identifier-load b/Documentation/Examples.ArangoDB/api-collection-identifier-load similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-identifier-load rename to Documentation/Examples.ArangoDB/api-collection-identifier-load diff --git a/Doxygen/Examples.ArangoDB/api-collection-identifier-properties-sync b/Documentation/Examples.ArangoDB/api-collection-identifier-properties-sync similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-identifier-properties-sync rename to Documentation/Examples.ArangoDB/api-collection-identifier-properties-sync diff --git a/Doxygen/Examples.ArangoDB/api-collection-identifier-rename b/Documentation/Examples.ArangoDB/api-collection-identifier-rename similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-identifier-rename rename to Documentation/Examples.ArangoDB/api-collection-identifier-rename diff --git a/Doxygen/Examples.ArangoDB/api-collection-identifier-truncate b/Documentation/Examples.ArangoDB/api-collection-identifier-truncate similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-identifier-truncate rename to Documentation/Examples.ArangoDB/api-collection-identifier-truncate diff --git a/Doxygen/Examples.ArangoDB/api-collection-identifier-unload b/Documentation/Examples.ArangoDB/api-collection-identifier-unload similarity index 100% rename from Doxygen/Examples.ArangoDB/api-collection-identifier-unload rename to Documentation/Examples.ArangoDB/api-collection-identifier-unload diff --git a/Doxygen/Examples.ArangoDB/api-cursor-create-for-limit-return b/Documentation/Examples.ArangoDB/api-cursor-create-for-limit-return similarity index 100% rename from Doxygen/Examples.ArangoDB/api-cursor-create-for-limit-return rename to Documentation/Examples.ArangoDB/api-cursor-create-for-limit-return diff --git a/Doxygen/Examples.ArangoDB/api-cursor-create-for-limit-return-cont b/Documentation/Examples.ArangoDB/api-cursor-create-for-limit-return-cont similarity index 100% rename from Doxygen/Examples.ArangoDB/api-cursor-create-for-limit-return-cont rename to Documentation/Examples.ArangoDB/api-cursor-create-for-limit-return-cont diff --git a/Doxygen/Examples.ArangoDB/api-cursor-create-for-limit-return-cont2 b/Documentation/Examples.ArangoDB/api-cursor-create-for-limit-return-cont2 similarity index 100% rename from Doxygen/Examples.ArangoDB/api-cursor-create-for-limit-return-cont2 rename to Documentation/Examples.ArangoDB/api-cursor-create-for-limit-return-cont2 diff --git a/Doxygen/Examples.ArangoDB/api-cursor-create-for-limit-return-cont3 b/Documentation/Examples.ArangoDB/api-cursor-create-for-limit-return-cont3 similarity index 100% rename from Doxygen/Examples.ArangoDB/api-cursor-create-for-limit-return-cont3 rename to Documentation/Examples.ArangoDB/api-cursor-create-for-limit-return-cont3 diff --git a/Doxygen/Examples.ArangoDB/api-cursor-create-for-limit-return-single b/Documentation/Examples.ArangoDB/api-cursor-create-for-limit-return-single similarity index 100% rename from Doxygen/Examples.ArangoDB/api-cursor-create-for-limit-return-single rename to Documentation/Examples.ArangoDB/api-cursor-create-for-limit-return-single diff --git a/Doxygen/Examples.ArangoDB/api-cursor-delete b/Documentation/Examples.ArangoDB/api-cursor-delete similarity index 100% rename from Doxygen/Examples.ArangoDB/api-cursor-delete rename to Documentation/Examples.ArangoDB/api-cursor-delete diff --git a/Doxygen/Examples.ArangoDB/api-cursor-invalid-cursor-identifier b/Documentation/Examples.ArangoDB/api-cursor-invalid-cursor-identifier similarity index 100% rename from Doxygen/Examples.ArangoDB/api-cursor-invalid-cursor-identifier rename to Documentation/Examples.ArangoDB/api-cursor-invalid-cursor-identifier diff --git a/Doxygen/Examples.ArangoDB/api-cursor-missing-body b/Documentation/Examples.ArangoDB/api-cursor-missing-body similarity index 100% rename from Doxygen/Examples.ArangoDB/api-cursor-missing-body rename to Documentation/Examples.ArangoDB/api-cursor-missing-body diff --git a/Doxygen/Examples.ArangoDB/api-cursor-missing-cursor-identifier b/Documentation/Examples.ArangoDB/api-cursor-missing-cursor-identifier similarity index 100% rename from Doxygen/Examples.ArangoDB/api-cursor-missing-cursor-identifier rename to Documentation/Examples.ArangoDB/api-cursor-missing-cursor-identifier diff --git a/Doxygen/Examples.ArangoDB/api-cursor-unknown-collection b/Documentation/Examples.ArangoDB/api-cursor-unknown-collection similarity index 100% rename from Doxygen/Examples.ArangoDB/api-cursor-unknown-collection rename to Documentation/Examples.ArangoDB/api-cursor-unknown-collection diff --git a/Doxygen/Examples.ArangoDB/api-explain-invalid b/Documentation/Examples.ArangoDB/api-explain-invalid similarity index 100% rename from Doxygen/Examples.ArangoDB/api-explain-invalid rename to Documentation/Examples.ArangoDB/api-explain-invalid diff --git a/Doxygen/Examples.ArangoDB/api-explain-valid b/Documentation/Examples.ArangoDB/api-explain-valid similarity index 100% rename from Doxygen/Examples.ArangoDB/api-explain-valid rename to Documentation/Examples.ArangoDB/api-explain-valid diff --git a/Doxygen/Examples.ArangoDB/api-import-documents b/Documentation/Examples.ArangoDB/api-import-documents similarity index 100% rename from Doxygen/Examples.ArangoDB/api-import-documents rename to Documentation/Examples.ArangoDB/api-import-documents diff --git a/Doxygen/Examples.ArangoDB/api-import-headers b/Documentation/Examples.ArangoDB/api-import-headers similarity index 100% rename from Doxygen/Examples.ArangoDB/api-import-headers rename to Documentation/Examples.ArangoDB/api-import-headers diff --git a/Doxygen/Examples.ArangoDB/api-index-all-indexes b/Documentation/Examples.ArangoDB/api-index-all-indexes similarity index 100% rename from Doxygen/Examples.ArangoDB/api-index-all-indexes rename to Documentation/Examples.ArangoDB/api-index-all-indexes diff --git a/Doxygen/Examples.ArangoDB/api-index-create-geo-latitude-longitude b/Documentation/Examples.ArangoDB/api-index-create-geo-latitude-longitude similarity index 100% rename from Doxygen/Examples.ArangoDB/api-index-create-geo-latitude-longitude rename to Documentation/Examples.ArangoDB/api-index-create-geo-latitude-longitude diff --git a/Doxygen/Examples.ArangoDB/api-index-create-geo-location b/Documentation/Examples.ArangoDB/api-index-create-geo-location similarity index 100% rename from Doxygen/Examples.ArangoDB/api-index-create-geo-location rename to Documentation/Examples.ArangoDB/api-index-create-geo-location diff --git a/Doxygen/Examples.ArangoDB/api-index-create-new-cap-constraint b/Documentation/Examples.ArangoDB/api-index-create-new-cap-constraint similarity index 100% rename from Doxygen/Examples.ArangoDB/api-index-create-new-cap-constraint rename to Documentation/Examples.ArangoDB/api-index-create-new-cap-constraint diff --git a/Doxygen/Examples.ArangoDB/api-index-create-new-hash-index b/Documentation/Examples.ArangoDB/api-index-create-new-hash-index similarity index 100% rename from Doxygen/Examples.ArangoDB/api-index-create-new-hash-index rename to Documentation/Examples.ArangoDB/api-index-create-new-hash-index diff --git a/Doxygen/Examples.ArangoDB/api-index-create-new-skiplist b/Documentation/Examples.ArangoDB/api-index-create-new-skiplist similarity index 100% rename from Doxygen/Examples.ArangoDB/api-index-create-new-skiplist rename to Documentation/Examples.ArangoDB/api-index-create-new-skiplist diff --git a/Doxygen/Examples.ArangoDB/api-index-create-new-unique-constraint b/Documentation/Examples.ArangoDB/api-index-create-new-unique-constraint similarity index 100% rename from Doxygen/Examples.ArangoDB/api-index-create-new-unique-constraint rename to Documentation/Examples.ArangoDB/api-index-create-new-unique-constraint diff --git a/Doxygen/Examples.ArangoDB/api-index-create-new-unique-skiplist b/Documentation/Examples.ArangoDB/api-index-create-new-unique-skiplist similarity index 100% rename from Doxygen/Examples.ArangoDB/api-index-create-new-unique-skiplist rename to Documentation/Examples.ArangoDB/api-index-create-new-unique-skiplist diff --git a/Doxygen/Examples.ArangoDB/api-index-delete-unique-skiplist b/Documentation/Examples.ArangoDB/api-index-delete-unique-skiplist similarity index 100% rename from Doxygen/Examples.ArangoDB/api-index-delete-unique-skiplist rename to Documentation/Examples.ArangoDB/api-index-delete-unique-skiplist diff --git a/Doxygen/Examples.ArangoDB/api-index-primary-index b/Documentation/Examples.ArangoDB/api-index-primary-index similarity index 100% rename from Doxygen/Examples.ArangoDB/api-index-primary-index rename to Documentation/Examples.ArangoDB/api-index-primary-index diff --git a/Doxygen/Examples.ArangoDB/api-query-invalid b/Documentation/Examples.ArangoDB/api-query-invalid similarity index 100% rename from Doxygen/Examples.ArangoDB/api-query-invalid rename to Documentation/Examples.ArangoDB/api-query-invalid diff --git a/Doxygen/Examples.ArangoDB/api-query-valid b/Documentation/Examples.ArangoDB/api-query-valid similarity index 100% rename from Doxygen/Examples.ArangoDB/api-query-valid rename to Documentation/Examples.ArangoDB/api-query-valid diff --git a/Doxygen/Examples.ArangoDB/api-simple-all-skip-limit b/Documentation/Examples.ArangoDB/api-simple-all-skip-limit similarity index 100% rename from Doxygen/Examples.ArangoDB/api-simple-all-skip-limit rename to Documentation/Examples.ArangoDB/api-simple-all-skip-limit diff --git a/Doxygen/Examples.ArangoDB/api-simple-by-example1 b/Documentation/Examples.ArangoDB/api-simple-by-example1 similarity index 100% rename from Doxygen/Examples.ArangoDB/api-simple-by-example1 rename to Documentation/Examples.ArangoDB/api-simple-by-example1 diff --git a/Doxygen/Examples.ArangoDB/api-simple-by-example2 b/Documentation/Examples.ArangoDB/api-simple-by-example2 similarity index 100% rename from Doxygen/Examples.ArangoDB/api-simple-by-example2 rename to Documentation/Examples.ArangoDB/api-simple-by-example2 diff --git a/Doxygen/Examples.ArangoDB/api-simple-by-example3 b/Documentation/Examples.ArangoDB/api-simple-by-example3 similarity index 100% rename from Doxygen/Examples.ArangoDB/api-simple-by-example3 rename to Documentation/Examples.ArangoDB/api-simple-by-example3 diff --git a/Doxygen/Examples.ArangoDB/api-simple-first-example b/Documentation/Examples.ArangoDB/api-simple-first-example similarity index 100% rename from Doxygen/Examples.ArangoDB/api-simple-first-example rename to Documentation/Examples.ArangoDB/api-simple-first-example diff --git a/Doxygen/Examples.ArangoDB/api-simple-first-example-not-found b/Documentation/Examples.ArangoDB/api-simple-first-example-not-found similarity index 100% rename from Doxygen/Examples.ArangoDB/api-simple-first-example-not-found rename to Documentation/Examples.ArangoDB/api-simple-first-example-not-found diff --git a/Doxygen/Examples.ArangoDB/api-simple-near b/Documentation/Examples.ArangoDB/api-simple-near similarity index 100% rename from Doxygen/Examples.ArangoDB/api-simple-near rename to Documentation/Examples.ArangoDB/api-simple-near diff --git a/Doxygen/Examples.ArangoDB/api-simple-near-distance b/Documentation/Examples.ArangoDB/api-simple-near-distance similarity index 100% rename from Doxygen/Examples.ArangoDB/api-simple-near-distance rename to Documentation/Examples.ArangoDB/api-simple-near-distance diff --git a/Doxygen/Examples.ArangoDB/api-simple-range b/Documentation/Examples.ArangoDB/api-simple-range similarity index 100% rename from Doxygen/Examples.ArangoDB/api-simple-range rename to Documentation/Examples.ArangoDB/api-simple-range diff --git a/Doxygen/Examples.ArangoDB/api-simple-within b/Documentation/Examples.ArangoDB/api-simple-within similarity index 100% rename from Doxygen/Examples.ArangoDB/api-simple-within rename to Documentation/Examples.ArangoDB/api-simple-within diff --git a/Doxygen/Examples.ArangoDB/api-simple-within-distance b/Documentation/Examples.ArangoDB/api-simple-within-distance similarity index 100% rename from Doxygen/Examples.ArangoDB/api-simple-within-distance rename to Documentation/Examples.ArangoDB/api-simple-within-distance diff --git a/Doxygen/Examples.ArangoDB/api_database1 b/Documentation/Examples.ArangoDB/api_database1 similarity index 100% rename from Doxygen/Examples.ArangoDB/api_database1 rename to Documentation/Examples.ArangoDB/api_database1 diff --git a/Doxygen/Examples.ArangoDB/api_database2 b/Documentation/Examples.ArangoDB/api_database2 similarity index 100% rename from Doxygen/Examples.ArangoDB/api_database2 rename to Documentation/Examples.ArangoDB/api_database2 diff --git a/Doxygen/Examples.ArangoDB/api_database3 b/Documentation/Examples.ArangoDB/api_database3 similarity index 100% rename from Doxygen/Examples.ArangoDB/api_database3 rename to Documentation/Examples.ArangoDB/api_database3 diff --git a/Doxygen/Examples.ArangoDB/api_database4 b/Documentation/Examples.ArangoDB/api_database4 similarity index 100% rename from Doxygen/Examples.ArangoDB/api_database4 rename to Documentation/Examples.ArangoDB/api_database4 diff --git a/Doxygen/Examples.ArangoDB/api_database5 b/Documentation/Examples.ArangoDB/api_database5 similarity index 100% rename from Doxygen/Examples.ArangoDB/api_database5 rename to Documentation/Examples.ArangoDB/api_database5 diff --git a/Doxygen/Examples.ArangoDB/arangosh-options b/Documentation/Examples.ArangoDB/arangosh-options similarity index 100% rename from Doxygen/Examples.ArangoDB/arangosh-options rename to Documentation/Examples.ArangoDB/arangosh-options diff --git a/Doxygen/Examples.ArangoDB/arangosh-start b/Documentation/Examples.ArangoDB/arangosh-start similarity index 100% rename from Doxygen/Examples.ArangoDB/arangosh-start rename to Documentation/Examples.ArangoDB/arangosh-start diff --git a/Doxygen/Examples.ArangoDB/arangosh-start-full b/Documentation/Examples.ArangoDB/arangosh-start-full similarity index 100% rename from Doxygen/Examples.ArangoDB/arangosh-start-full rename to Documentation/Examples.ArangoDB/arangosh-start-full diff --git a/Doxygen/Examples.ArangoDB/connection-statistics b/Documentation/Examples.ArangoDB/connection-statistics similarity index 100% rename from Doxygen/Examples.ArangoDB/connection-statistics rename to Documentation/Examples.ArangoDB/connection-statistics diff --git a/Doxygen/Examples.ArangoDB/connection-statistics-current b/Documentation/Examples.ArangoDB/connection-statistics-current similarity index 100% rename from Doxygen/Examples.ArangoDB/connection-statistics-current rename to Documentation/Examples.ArangoDB/connection-statistics-current diff --git a/Doxygen/Examples.ArangoDB/document1 b/Documentation/Examples.ArangoDB/document1 similarity index 100% rename from Doxygen/Examples.ArangoDB/document1 rename to Documentation/Examples.ArangoDB/document1 diff --git a/Doxygen/Examples.ArangoDB/key-value_delete-key-bad b/Documentation/Examples.ArangoDB/key-value_delete-key-bad similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_delete-key-bad rename to Documentation/Examples.ArangoDB/key-value_delete-key-bad diff --git a/Doxygen/Examples.ArangoDB/key-value_delete-key-ok b/Documentation/Examples.ArangoDB/key-value_delete-key-ok similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_delete-key-ok rename to Documentation/Examples.ArangoDB/key-value_delete-key-ok diff --git a/Doxygen/Examples.ArangoDB/key-value_delete-key-request b/Documentation/Examples.ArangoDB/key-value_delete-key-request similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_delete-key-request rename to Documentation/Examples.ArangoDB/key-value_delete-key-request diff --git a/Doxygen/Examples.ArangoDB/key-value_get-key-bad b/Documentation/Examples.ArangoDB/key-value_get-key-bad similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_get-key-bad rename to Documentation/Examples.ArangoDB/key-value_get-key-bad diff --git a/Doxygen/Examples.ArangoDB/key-value_get-key-ok b/Documentation/Examples.ArangoDB/key-value_get-key-ok similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_get-key-ok rename to Documentation/Examples.ArangoDB/key-value_get-key-ok diff --git a/Doxygen/Examples.ArangoDB/key-value_get-key-request b/Documentation/Examples.ArangoDB/key-value_get-key-request similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_get-key-request rename to Documentation/Examples.ArangoDB/key-value_get-key-request diff --git a/Doxygen/Examples.ArangoDB/key-value_get-keys-bad b/Documentation/Examples.ArangoDB/key-value_get-keys-bad similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_get-keys-bad rename to Documentation/Examples.ArangoDB/key-value_get-keys-bad diff --git a/Doxygen/Examples.ArangoDB/key-value_get-keys-ok b/Documentation/Examples.ArangoDB/key-value_get-keys-ok similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_get-keys-ok rename to Documentation/Examples.ArangoDB/key-value_get-keys-ok diff --git a/Doxygen/Examples.ArangoDB/key-value_get-keys-request b/Documentation/Examples.ArangoDB/key-value_get-keys-request similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_get-keys-request rename to Documentation/Examples.ArangoDB/key-value_get-keys-request diff --git a/Doxygen/Examples.ArangoDB/key-value_post-key-bad b/Documentation/Examples.ArangoDB/key-value_post-key-bad similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_post-key-bad rename to Documentation/Examples.ArangoDB/key-value_post-key-bad diff --git a/Doxygen/Examples.ArangoDB/key-value_post-key-ok b/Documentation/Examples.ArangoDB/key-value_post-key-ok similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_post-key-ok rename to Documentation/Examples.ArangoDB/key-value_post-key-ok diff --git a/Doxygen/Examples.ArangoDB/key-value_post-key-request b/Documentation/Examples.ArangoDB/key-value_post-key-request similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_post-key-request rename to Documentation/Examples.ArangoDB/key-value_post-key-request diff --git a/Doxygen/Examples.ArangoDB/key-value_put-key-bad b/Documentation/Examples.ArangoDB/key-value_put-key-bad similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_put-key-bad rename to Documentation/Examples.ArangoDB/key-value_put-key-bad diff --git a/Doxygen/Examples.ArangoDB/key-value_put-key-ok b/Documentation/Examples.ArangoDB/key-value_put-key-ok similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_put-key-ok rename to Documentation/Examples.ArangoDB/key-value_put-key-ok diff --git a/Doxygen/Examples.ArangoDB/key-value_put-key-request b/Documentation/Examples.ArangoDB/key-value_put-key-request similarity index 100% rename from Doxygen/Examples.ArangoDB/key-value_put-key-request rename to Documentation/Examples.ArangoDB/key-value_put-key-request diff --git a/Doxygen/Examples.ArangoDB/openssl-ciphers b/Documentation/Examples.ArangoDB/openssl-ciphers similarity index 100% rename from Doxygen/Examples.ArangoDB/openssl-ciphers rename to Documentation/Examples.ArangoDB/openssl-ciphers diff --git a/Doxygen/Examples.ArangoDB/openssl-options b/Documentation/Examples.ArangoDB/openssl-options similarity index 100% rename from Doxygen/Examples.ArangoDB/openssl-options rename to Documentation/Examples.ArangoDB/openssl-options diff --git a/Doxygen/Examples.ArangoDB/option-database-directory b/Documentation/Examples.ArangoDB/option-database-directory similarity index 100% rename from Doxygen/Examples.ArangoDB/option-database-directory rename to Documentation/Examples.ArangoDB/option-database-directory diff --git a/Doxygen/Examples.ArangoDB/option-server-endpoint b/Documentation/Examples.ArangoDB/option-server-endpoint similarity index 100% rename from Doxygen/Examples.ArangoDB/option-server-endpoint rename to Documentation/Examples.ArangoDB/option-server-endpoint diff --git a/Doxygen/Examples.ArangoDB/querypost b/Documentation/Examples.ArangoDB/querypost similarity index 100% rename from Doxygen/Examples.ArangoDB/querypost rename to Documentation/Examples.ArangoDB/querypost diff --git a/Doxygen/Examples.ArangoDB/querypostfail b/Documentation/Examples.ArangoDB/querypostfail similarity index 100% rename from Doxygen/Examples.ArangoDB/querypostfail rename to Documentation/Examples.ArangoDB/querypostfail diff --git a/Doxygen/Examples.ArangoDB/request-statistics b/Documentation/Examples.ArangoDB/request-statistics similarity index 100% rename from Doxygen/Examples.ArangoDB/request-statistics rename to Documentation/Examples.ArangoDB/request-statistics diff --git a/Doxygen/Examples.ArangoDB/request-statistics-current b/Documentation/Examples.ArangoDB/request-statistics-current similarity index 100% rename from Doxygen/Examples.ArangoDB/request-statistics-current rename to Documentation/Examples.ArangoDB/request-statistics-current diff --git a/Doxygen/Examples.ArangoDB/rest-create-document b/Documentation/Examples.ArangoDB/rest-create-document similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-create-document rename to Documentation/Examples.ArangoDB/rest-create-document diff --git a/Doxygen/Examples.ArangoDB/rest-create-document-accept b/Documentation/Examples.ArangoDB/rest-create-document-accept similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-create-document-accept rename to Documentation/Examples.ArangoDB/rest-create-document-accept diff --git a/Doxygen/Examples.ArangoDB/rest-create-document-bad-json b/Documentation/Examples.ArangoDB/rest-create-document-bad-json similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-create-document-bad-json rename to Documentation/Examples.ArangoDB/rest-create-document-bad-json diff --git a/Doxygen/Examples.ArangoDB/rest-create-document-create-collection b/Documentation/Examples.ArangoDB/rest-create-document-create-collection similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-create-document-create-collection rename to Documentation/Examples.ArangoDB/rest-create-document-create-collection diff --git a/Doxygen/Examples.ArangoDB/rest-create-document-named-collection b/Documentation/Examples.ArangoDB/rest-create-document-named-collection similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-create-document-named-collection rename to Documentation/Examples.ArangoDB/rest-create-document-named-collection diff --git a/Doxygen/Examples.ArangoDB/rest-create-document-new-named-collection b/Documentation/Examples.ArangoDB/rest-create-document-new-named-collection similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-create-document-new-named-collection rename to Documentation/Examples.ArangoDB/rest-create-document-new-named-collection diff --git a/Doxygen/Examples.ArangoDB/rest-create-document-unknown-cid b/Documentation/Examples.ArangoDB/rest-create-document-unknown-cid similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-create-document-unknown-cid rename to Documentation/Examples.ArangoDB/rest-create-document-unknown-cid diff --git a/Doxygen/Examples.ArangoDB/rest-delete-document b/Documentation/Examples.ArangoDB/rest-delete-document similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-delete-document rename to Documentation/Examples.ArangoDB/rest-delete-document diff --git a/Doxygen/Examples.ArangoDB/rest-delete-document-if-match-other b/Documentation/Examples.ArangoDB/rest-delete-document-if-match-other similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-delete-document-if-match-other rename to Documentation/Examples.ArangoDB/rest-delete-document-if-match-other diff --git a/Doxygen/Examples.ArangoDB/rest-delete-document-unknown-handle b/Documentation/Examples.ArangoDB/rest-delete-document-unknown-handle similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-delete-document-unknown-handle rename to Documentation/Examples.ArangoDB/rest-delete-document-unknown-handle diff --git a/Doxygen/Examples.ArangoDB/rest-edge-create-edge b/Documentation/Examples.ArangoDB/rest-edge-create-edge similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-edge-create-edge rename to Documentation/Examples.ArangoDB/rest-edge-create-edge diff --git a/Doxygen/Examples.ArangoDB/rest-edge-read-edge b/Documentation/Examples.ArangoDB/rest-edge-read-edge similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-edge-read-edge rename to Documentation/Examples.ArangoDB/rest-edge-read-edge diff --git a/Doxygen/Examples.ArangoDB/rest-edge-read-edges-any b/Documentation/Examples.ArangoDB/rest-edge-read-edges-any similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-edge-read-edges-any rename to Documentation/Examples.ArangoDB/rest-edge-read-edges-any diff --git a/Doxygen/Examples.ArangoDB/rest-edge-read-edges-in b/Documentation/Examples.ArangoDB/rest-edge-read-edges-in similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-edge-read-edges-in rename to Documentation/Examples.ArangoDB/rest-edge-read-edges-in diff --git a/Doxygen/Examples.ArangoDB/rest-edge-read-edges-out b/Documentation/Examples.ArangoDB/rest-edge-read-edges-out similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-edge-read-edges-out rename to Documentation/Examples.ArangoDB/rest-edge-read-edges-out diff --git a/Doxygen/Examples.ArangoDB/rest-patch-document b/Documentation/Examples.ArangoDB/rest-patch-document similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-patch-document rename to Documentation/Examples.ArangoDB/rest-patch-document diff --git a/Doxygen/Examples.ArangoDB/rest-read-document b/Documentation/Examples.ArangoDB/rest-read-document similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-read-document rename to Documentation/Examples.ArangoDB/rest-read-document diff --git a/Doxygen/Examples.ArangoDB/rest-read-document-all b/Documentation/Examples.ArangoDB/rest-read-document-all similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-read-document-all rename to Documentation/Examples.ArangoDB/rest-read-document-all diff --git a/Doxygen/Examples.ArangoDB/rest-read-document-head b/Documentation/Examples.ArangoDB/rest-read-document-head similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-read-document-head rename to Documentation/Examples.ArangoDB/rest-read-document-head diff --git a/Doxygen/Examples.ArangoDB/rest-read-document-if-none-match b/Documentation/Examples.ArangoDB/rest-read-document-if-none-match similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-read-document-if-none-match rename to Documentation/Examples.ArangoDB/rest-read-document-if-none-match diff --git a/Doxygen/Examples.ArangoDB/rest-read-document-unknown-handle b/Documentation/Examples.ArangoDB/rest-read-document-unknown-handle similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-read-document-unknown-handle rename to Documentation/Examples.ArangoDB/rest-read-document-unknown-handle diff --git a/Doxygen/Examples.ArangoDB/rest-update-document b/Documentation/Examples.ArangoDB/rest-update-document similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-update-document rename to Documentation/Examples.ArangoDB/rest-update-document diff --git a/Doxygen/Examples.ArangoDB/rest-update-document-if-match-other b/Documentation/Examples.ArangoDB/rest-update-document-if-match-other similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-update-document-if-match-other rename to Documentation/Examples.ArangoDB/rest-update-document-if-match-other diff --git a/Doxygen/Examples.ArangoDB/rest-update-document-if-match-other-last-write b/Documentation/Examples.ArangoDB/rest-update-document-if-match-other-last-write similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-update-document-if-match-other-last-write rename to Documentation/Examples.ArangoDB/rest-update-document-if-match-other-last-write diff --git a/Doxygen/Examples.ArangoDB/rest-update-document-rev-other b/Documentation/Examples.ArangoDB/rest-update-document-rev-other similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-update-document-rev-other rename to Documentation/Examples.ArangoDB/rest-update-document-rev-other diff --git a/Doxygen/Examples.ArangoDB/rest-update-document-unknown-handle b/Documentation/Examples.ArangoDB/rest-update-document-unknown-handle similarity index 100% rename from Doxygen/Examples.ArangoDB/rest-update-document-unknown-handle rename to Documentation/Examples.ArangoDB/rest-update-document-unknown-handle diff --git a/Doxygen/Examples.ArangoDB/server-keyfile b/Documentation/Examples.ArangoDB/server-keyfile similarity index 100% rename from Doxygen/Examples.ArangoDB/server-keyfile rename to Documentation/Examples.ArangoDB/server-keyfile diff --git a/Doxygen/Examples.ArangoDB/server-keyfile-openssl b/Documentation/Examples.ArangoDB/server-keyfile-openssl similarity index 100% rename from Doxygen/Examples.ArangoDB/server-keyfile-openssl rename to Documentation/Examples.ArangoDB/server-keyfile-openssl diff --git a/Doxygen/Examples.ArangoDB/start-emergency-console b/Documentation/Examples.ArangoDB/start-emergency-console similarity index 100% rename from Doxygen/Examples.ArangoDB/start-emergency-console rename to Documentation/Examples.ArangoDB/start-emergency-console diff --git a/Doxygen/Examples.ArangoDB/startup1 b/Documentation/Examples.ArangoDB/startup1 similarity index 100% rename from Doxygen/Examples.ArangoDB/startup1 rename to Documentation/Examples.ArangoDB/startup1 diff --git a/Doxygen/Examples.ArangoDB/supervisor b/Documentation/Examples.ArangoDB/supervisor similarity index 100% rename from Doxygen/Examples.ArangoDB/supervisor rename to Documentation/Examples.ArangoDB/supervisor diff --git a/Doxygen/Examples.ArangoDB/supervisor-ps1 b/Documentation/Examples.ArangoDB/supervisor-ps1 similarity index 100% rename from Doxygen/Examples.ArangoDB/supervisor-ps1 rename to Documentation/Examples.ArangoDB/supervisor-ps1 diff --git a/Doxygen/Examples.ArangoDB/supervisor-ps2 b/Documentation/Examples.ArangoDB/supervisor-ps2 similarity index 100% rename from Doxygen/Examples.ArangoDB/supervisor-ps2 rename to Documentation/Examples.ArangoDB/supervisor-ps2 diff --git a/Doxygen/Examples.ArangoDB/user-document b/Documentation/Examples.ArangoDB/user-document similarity index 100% rename from Doxygen/Examples.ArangoDB/user-document rename to Documentation/Examples.ArangoDB/user-document diff --git a/Doxygen/Examples.Durham/action1 b/Documentation/Examples.Durham/action1 similarity index 100% rename from Doxygen/Examples.Durham/action1 rename to Documentation/Examples.Durham/action1 diff --git a/Doxygen/Examples.Durham/action2 b/Documentation/Examples.Durham/action2 similarity index 100% rename from Doxygen/Examples.Durham/action2 rename to Documentation/Examples.Durham/action2 diff --git a/Doxygen/Examples.Durham/action3 b/Documentation/Examples.Durham/action3 similarity index 100% rename from Doxygen/Examples.Durham/action3 rename to Documentation/Examples.Durham/action3 diff --git a/Doxygen/Examples.Durham/action4 b/Documentation/Examples.Durham/action4 similarity index 100% rename from Doxygen/Examples.Durham/action4 rename to Documentation/Examples.Durham/action4 diff --git a/Doxygen/Examples.Durham/arangoimp-data-csv b/Documentation/Examples.Durham/arangoimp-data-csv similarity index 100% rename from Doxygen/Examples.Durham/arangoimp-data-csv rename to Documentation/Examples.Durham/arangoimp-data-csv diff --git a/Doxygen/Examples.Durham/arangoimp-data-json b/Documentation/Examples.Durham/arangoimp-data-json similarity index 100% rename from Doxygen/Examples.Durham/arangoimp-data-json rename to Documentation/Examples.Durham/arangoimp-data-json diff --git a/Doxygen/Examples.Durham/arangosh-all-documents b/Documentation/Examples.Durham/arangosh-all-documents similarity index 100% rename from Doxygen/Examples.Durham/arangosh-all-documents rename to Documentation/Examples.Durham/arangosh-all-documents diff --git a/Doxygen/Examples.Durham/arangosh-create-collection b/Documentation/Examples.Durham/arangosh-create-collection similarity index 100% rename from Doxygen/Examples.Durham/arangosh-create-collection rename to Documentation/Examples.Durham/arangosh-create-collection diff --git a/Doxygen/Examples.Durham/arangosh-db b/Documentation/Examples.Durham/arangosh-db similarity index 100% rename from Doxygen/Examples.Durham/arangosh-db rename to Documentation/Examples.Durham/arangosh-db diff --git a/Doxygen/Examples.Durham/arangosh-save-documents b/Documentation/Examples.Durham/arangosh-save-documents similarity index 100% rename from Doxygen/Examples.Durham/arangosh-save-documents rename to Documentation/Examples.Durham/arangosh-save-documents diff --git a/Doxygen/Examples.Durham/arangosh-unload-collection b/Documentation/Examples.Durham/arangosh-unload-collection similarity index 100% rename from Doxygen/Examples.Durham/arangosh-unload-collection rename to Documentation/Examples.Durham/arangosh-unload-collection diff --git a/Doxygen/Examples.Durham/demo1 b/Documentation/Examples.Durham/demo1 similarity index 100% rename from Doxygen/Examples.Durham/demo1 rename to Documentation/Examples.Durham/demo1 diff --git a/Doxygen/Examples.Durham/ensure-cap-constraint b/Documentation/Examples.Durham/ensure-cap-constraint similarity index 100% rename from Doxygen/Examples.Durham/ensure-cap-constraint rename to Documentation/Examples.Durham/ensure-cap-constraint diff --git a/Doxygen/Examples.Durham/ensure-geo-index-array b/Documentation/Examples.Durham/ensure-geo-index-array similarity index 100% rename from Doxygen/Examples.Durham/ensure-geo-index-array rename to Documentation/Examples.Durham/ensure-geo-index-array diff --git a/Doxygen/Examples.Durham/ensure-geo-index-list b/Documentation/Examples.Durham/ensure-geo-index-list similarity index 100% rename from Doxygen/Examples.Durham/ensure-geo-index-list rename to Documentation/Examples.Durham/ensure-geo-index-list diff --git a/Doxygen/Examples.Durham/five1 b/Documentation/Examples.Durham/five1 similarity index 100% rename from Doxygen/Examples.Durham/five1 rename to Documentation/Examples.Durham/five1 diff --git a/Doxygen/Examples.Durham/fluent14 b/Documentation/Examples.Durham/fluent14 similarity index 100% rename from Doxygen/Examples.Durham/fluent14 rename to Documentation/Examples.Durham/fluent14 diff --git a/Doxygen/Examples.Durham/fluent36 b/Documentation/Examples.Durham/fluent36 similarity index 100% rename from Doxygen/Examples.Durham/fluent36 rename to Documentation/Examples.Durham/fluent36 diff --git a/Doxygen/Examples.Durham/fluent37 b/Documentation/Examples.Durham/fluent37 similarity index 100% rename from Doxygen/Examples.Durham/fluent37 rename to Documentation/Examples.Durham/fluent37 diff --git a/Doxygen/Examples.Durham/fluent38 b/Documentation/Examples.Durham/fluent38 similarity index 100% rename from Doxygen/Examples.Durham/fluent38 rename to Documentation/Examples.Durham/fluent38 diff --git a/Doxygen/Examples.Durham/fluent39 b/Documentation/Examples.Durham/fluent39 similarity index 100% rename from Doxygen/Examples.Durham/fluent39 rename to Documentation/Examples.Durham/fluent39 diff --git a/Doxygen/Examples.Durham/fluent40 b/Documentation/Examples.Durham/fluent40 similarity index 100% rename from Doxygen/Examples.Durham/fluent40 rename to Documentation/Examples.Durham/fluent40 diff --git a/Doxygen/Examples.Durham/fluent47 b/Documentation/Examples.Durham/fluent47 similarity index 100% rename from Doxygen/Examples.Durham/fluent47 rename to Documentation/Examples.Durham/fluent47 diff --git a/Doxygen/Examples.Durham/fluent48 b/Documentation/Examples.Durham/fluent48 similarity index 100% rename from Doxygen/Examples.Durham/fluent48 rename to Documentation/Examples.Durham/fluent48 diff --git a/Doxygen/Examples.Durham/fluent49 b/Documentation/Examples.Durham/fluent49 similarity index 100% rename from Doxygen/Examples.Durham/fluent49 rename to Documentation/Examples.Durham/fluent49 diff --git a/Doxygen/Examples.Durham/fluent50 b/Documentation/Examples.Durham/fluent50 similarity index 100% rename from Doxygen/Examples.Durham/fluent50 rename to Documentation/Examples.Durham/fluent50 diff --git a/Doxygen/Examples.Durham/geojs1 b/Documentation/Examples.Durham/geojs1 similarity index 100% rename from Doxygen/Examples.Durham/geojs1 rename to Documentation/Examples.Durham/geojs1 diff --git a/Doxygen/Examples.Durham/graph-constructor b/Documentation/Examples.Durham/graph-constructor similarity index 100% rename from Doxygen/Examples.Durham/graph-constructor rename to Documentation/Examples.Durham/graph-constructor diff --git a/Doxygen/Examples.Durham/graph-edge-get-id b/Documentation/Examples.Durham/graph-edge-get-id similarity index 100% rename from Doxygen/Examples.Durham/graph-edge-get-id rename to Documentation/Examples.Durham/graph-edge-get-id diff --git a/Doxygen/Examples.Durham/graph-edge-get-in-vertex b/Documentation/Examples.Durham/graph-edge-get-in-vertex similarity index 100% rename from Doxygen/Examples.Durham/graph-edge-get-in-vertex rename to Documentation/Examples.Durham/graph-edge-get-in-vertex diff --git a/Doxygen/Examples.Durham/graph-edge-get-label b/Documentation/Examples.Durham/graph-edge-get-label similarity index 100% rename from Doxygen/Examples.Durham/graph-edge-get-label rename to Documentation/Examples.Durham/graph-edge-get-label diff --git a/Doxygen/Examples.Durham/graph-edge-get-out-vertex b/Documentation/Examples.Durham/graph-edge-get-out-vertex similarity index 100% rename from Doxygen/Examples.Durham/graph-edge-get-out-vertex rename to Documentation/Examples.Durham/graph-edge-get-out-vertex diff --git a/Doxygen/Examples.Durham/graph-edge-get-property b/Documentation/Examples.Durham/graph-edge-get-property similarity index 100% rename from Doxygen/Examples.Durham/graph-edge-get-property rename to Documentation/Examples.Durham/graph-edge-get-property diff --git a/Doxygen/Examples.Durham/graph-edge-get-property-keys b/Documentation/Examples.Durham/graph-edge-get-property-keys similarity index 100% rename from Doxygen/Examples.Durham/graph-edge-get-property-keys rename to Documentation/Examples.Durham/graph-edge-get-property-keys diff --git a/Doxygen/Examples.Durham/graph-edge-properties b/Documentation/Examples.Durham/graph-edge-properties similarity index 100% rename from Doxygen/Examples.Durham/graph-edge-properties rename to Documentation/Examples.Durham/graph-edge-properties diff --git a/Doxygen/Examples.Durham/graph-edge-set-property b/Documentation/Examples.Durham/graph-edge-set-property similarity index 100% rename from Doxygen/Examples.Durham/graph-edge-set-property rename to Documentation/Examples.Durham/graph-edge-set-property diff --git a/Doxygen/Examples.Durham/graph-graph-add-edge b/Documentation/Examples.Durham/graph-graph-add-edge similarity index 100% rename from Doxygen/Examples.Durham/graph-graph-add-edge rename to Documentation/Examples.Durham/graph-graph-add-edge diff --git a/Doxygen/Examples.Durham/graph-graph-add-edge2 b/Documentation/Examples.Durham/graph-graph-add-edge2 similarity index 100% rename from Doxygen/Examples.Durham/graph-graph-add-edge2 rename to Documentation/Examples.Durham/graph-graph-add-edge2 diff --git a/Doxygen/Examples.Durham/graph-graph-add-vertex b/Documentation/Examples.Durham/graph-graph-add-vertex similarity index 100% rename from Doxygen/Examples.Durham/graph-graph-add-vertex rename to Documentation/Examples.Durham/graph-graph-add-vertex diff --git a/Doxygen/Examples.Durham/graph-graph-add-vertex2 b/Documentation/Examples.Durham/graph-graph-add-vertex2 similarity index 100% rename from Doxygen/Examples.Durham/graph-graph-add-vertex2 rename to Documentation/Examples.Durham/graph-graph-add-vertex2 diff --git a/Doxygen/Examples.Durham/graph-graph-get-edges b/Documentation/Examples.Durham/graph-graph-get-edges similarity index 100% rename from Doxygen/Examples.Durham/graph-graph-get-edges rename to Documentation/Examples.Durham/graph-graph-get-edges diff --git a/Doxygen/Examples.Durham/graph-graph-get-vertex b/Documentation/Examples.Durham/graph-graph-get-vertex similarity index 100% rename from Doxygen/Examples.Durham/graph-graph-get-vertex rename to Documentation/Examples.Durham/graph-graph-get-vertex diff --git a/Doxygen/Examples.Durham/graph-graph-get-vertices b/Documentation/Examples.Durham/graph-graph-get-vertices similarity index 100% rename from Doxygen/Examples.Durham/graph-graph-get-vertices rename to Documentation/Examples.Durham/graph-graph-get-vertices diff --git a/Doxygen/Examples.Durham/graph-graph-remove-edge b/Documentation/Examples.Durham/graph-graph-remove-edge similarity index 100% rename from Doxygen/Examples.Durham/graph-graph-remove-edge rename to Documentation/Examples.Durham/graph-graph-remove-edge diff --git a/Doxygen/Examples.Durham/graph-graph-remove-vertex b/Documentation/Examples.Durham/graph-graph-remove-vertex similarity index 100% rename from Doxygen/Examples.Durham/graph-graph-remove-vertex rename to Documentation/Examples.Durham/graph-graph-remove-vertex diff --git a/Doxygen/Examples.Durham/graph-setup b/Documentation/Examples.Durham/graph-setup similarity index 100% rename from Doxygen/Examples.Durham/graph-setup rename to Documentation/Examples.Durham/graph-setup diff --git a/Doxygen/Examples.Durham/graph-vertex-add-in-edge b/Documentation/Examples.Durham/graph-vertex-add-in-edge similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-add-in-edge rename to Documentation/Examples.Durham/graph-vertex-add-in-edge diff --git a/Doxygen/Examples.Durham/graph-vertex-add-in-edge2 b/Documentation/Examples.Durham/graph-vertex-add-in-edge2 similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-add-in-edge2 rename to Documentation/Examples.Durham/graph-vertex-add-in-edge2 diff --git a/Doxygen/Examples.Durham/graph-vertex-add-out-edge b/Documentation/Examples.Durham/graph-vertex-add-out-edge similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-add-out-edge rename to Documentation/Examples.Durham/graph-vertex-add-out-edge diff --git a/Doxygen/Examples.Durham/graph-vertex-add-out-edge2 b/Documentation/Examples.Durham/graph-vertex-add-out-edge2 similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-add-out-edge2 rename to Documentation/Examples.Durham/graph-vertex-add-out-edge2 diff --git a/Doxygen/Examples.Durham/graph-vertex-add-out-edge3 b/Documentation/Examples.Durham/graph-vertex-add-out-edge3 similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-add-out-edge3 rename to Documentation/Examples.Durham/graph-vertex-add-out-edge3 diff --git a/Doxygen/Examples.Durham/graph-vertex-edges b/Documentation/Examples.Durham/graph-vertex-edges similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-edges rename to Documentation/Examples.Durham/graph-vertex-edges diff --git a/Doxygen/Examples.Durham/graph-vertex-get-id b/Documentation/Examples.Durham/graph-vertex-get-id similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-get-id rename to Documentation/Examples.Durham/graph-vertex-get-id diff --git a/Doxygen/Examples.Durham/graph-vertex-get-in-edges b/Documentation/Examples.Durham/graph-vertex-get-in-edges similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-get-in-edges rename to Documentation/Examples.Durham/graph-vertex-get-in-edges diff --git a/Doxygen/Examples.Durham/graph-vertex-get-out-edges b/Documentation/Examples.Durham/graph-vertex-get-out-edges similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-get-out-edges rename to Documentation/Examples.Durham/graph-vertex-get-out-edges diff --git a/Doxygen/Examples.Durham/graph-vertex-get-property b/Documentation/Examples.Durham/graph-vertex-get-property similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-get-property rename to Documentation/Examples.Durham/graph-vertex-get-property diff --git a/Doxygen/Examples.Durham/graph-vertex-get-property-keys b/Documentation/Examples.Durham/graph-vertex-get-property-keys similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-get-property-keys rename to Documentation/Examples.Durham/graph-vertex-get-property-keys diff --git a/Doxygen/Examples.Durham/graph-vertex-inbound b/Documentation/Examples.Durham/graph-vertex-inbound similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-inbound rename to Documentation/Examples.Durham/graph-vertex-inbound diff --git a/Doxygen/Examples.Durham/graph-vertex-outbound b/Documentation/Examples.Durham/graph-vertex-outbound similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-outbound rename to Documentation/Examples.Durham/graph-vertex-outbound diff --git a/Doxygen/Examples.Durham/graph-vertex-properties b/Documentation/Examples.Durham/graph-vertex-properties similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-properties rename to Documentation/Examples.Durham/graph-vertex-properties diff --git a/Doxygen/Examples.Durham/graph-vertex-set-property b/Documentation/Examples.Durham/graph-vertex-set-property similarity index 100% rename from Doxygen/Examples.Durham/graph-vertex-set-property rename to Documentation/Examples.Durham/graph-vertex-set-property diff --git a/Doxygen/Examples.Durham/graph25 b/Documentation/Examples.Durham/graph25 similarity index 100% rename from Doxygen/Examples.Durham/graph25 rename to Documentation/Examples.Durham/graph25 diff --git a/Doxygen/Examples.Durham/graph26 b/Documentation/Examples.Durham/graph26 similarity index 100% rename from Doxygen/Examples.Durham/graph26 rename to Documentation/Examples.Durham/graph26 diff --git a/Doxygen/Examples.Durham/jsunity1 b/Documentation/Examples.Durham/jsunity1 similarity index 100% rename from Doxygen/Examples.Durham/jsunity1 rename to Documentation/Examples.Durham/jsunity1 diff --git a/Doxygen/Examples.Durham/jsunity2 b/Documentation/Examples.Durham/jsunity2 similarity index 100% rename from Doxygen/Examples.Durham/jsunity2 rename to Documentation/Examples.Durham/jsunity2 diff --git a/Doxygen/Examples.Durham/modules-require-1 b/Documentation/Examples.Durham/modules-require-1 similarity index 100% rename from Doxygen/Examples.Durham/modules-require-1 rename to Documentation/Examples.Durham/modules-require-1 diff --git a/Doxygen/Examples.Durham/modules-require-2 b/Documentation/Examples.Durham/modules-require-2 similarity index 100% rename from Doxygen/Examples.Durham/modules-require-2 rename to Documentation/Examples.Durham/modules-require-2 diff --git a/Doxygen/Examples.Durham/shell-collection-count b/Documentation/Examples.Durham/shell-collection-count similarity index 100% rename from Doxygen/Examples.Durham/shell-collection-count rename to Documentation/Examples.Durham/shell-collection-count diff --git a/Doxygen/Examples.Durham/shell-edge-edges b/Documentation/Examples.Durham/shell-edge-edges similarity index 100% rename from Doxygen/Examples.Durham/shell-edge-edges rename to Documentation/Examples.Durham/shell-edge-edges diff --git a/Doxygen/Examples.Durham/shell-edge-in-edges b/Documentation/Examples.Durham/shell-edge-in-edges similarity index 100% rename from Doxygen/Examples.Durham/shell-edge-in-edges rename to Documentation/Examples.Durham/shell-edge-in-edges diff --git a/Doxygen/Examples.Durham/shell-edge-out-edges b/Documentation/Examples.Durham/shell-edge-out-edges similarity index 100% rename from Doxygen/Examples.Durham/shell-edge-out-edges rename to Documentation/Examples.Durham/shell-edge-out-edges diff --git a/Doxygen/Examples.Durham/shell-index-create-hash-index b/Documentation/Examples.Durham/shell-index-create-hash-index similarity index 100% rename from Doxygen/Examples.Durham/shell-index-create-hash-index rename to Documentation/Examples.Durham/shell-index-create-hash-index diff --git a/Doxygen/Examples.Durham/shell-index-create-unique-constraint b/Documentation/Examples.Durham/shell-index-create-unique-constraint similarity index 100% rename from Doxygen/Examples.Durham/shell-index-create-unique-constraint rename to Documentation/Examples.Durham/shell-index-create-unique-constraint diff --git a/Doxygen/Examples.Durham/shell-read-document b/Documentation/Examples.Durham/shell-read-document similarity index 100% rename from Doxygen/Examples.Durham/shell-read-document rename to Documentation/Examples.Durham/shell-read-document diff --git a/Doxygen/Examples.Durham/shell-read-document-bad-handle b/Documentation/Examples.Durham/shell-read-document-bad-handle similarity index 100% rename from Doxygen/Examples.Durham/shell-read-document-bad-handle rename to Documentation/Examples.Durham/shell-read-document-bad-handle diff --git a/Doxygen/Examples.Durham/shell-read-document-not-found b/Documentation/Examples.Durham/shell-read-document-not-found similarity index 100% rename from Doxygen/Examples.Durham/shell-read-document-not-found rename to Documentation/Examples.Durham/shell-read-document-not-found diff --git a/Doxygen/Examples.Durham/shell-simple-query-first-example b/Documentation/Examples.Durham/shell-simple-query-first-example similarity index 100% rename from Doxygen/Examples.Durham/shell-simple-query-first-example rename to Documentation/Examples.Durham/shell-simple-query-first-example diff --git a/Doxygen/Examples.Durham/shell_collection-drop b/Documentation/Examples.Durham/shell_collection-drop similarity index 100% rename from Doxygen/Examples.Durham/shell_collection-drop rename to Documentation/Examples.Durham/shell_collection-drop diff --git a/Doxygen/Examples.Durham/shell_collection-drop-db b/Documentation/Examples.Durham/shell_collection-drop-db similarity index 100% rename from Doxygen/Examples.Durham/shell_collection-drop-db rename to Documentation/Examples.Durham/shell_collection-drop-db diff --git a/Doxygen/Examples.Durham/shell_collection-drop-name-db b/Documentation/Examples.Durham/shell_collection-drop-name-db similarity index 100% rename from Doxygen/Examples.Durham/shell_collection-drop-name-db rename to Documentation/Examples.Durham/shell_collection-drop-name-db diff --git a/Doxygen/Examples.Durham/shell_collection-figures b/Documentation/Examples.Durham/shell_collection-figures similarity index 100% rename from Doxygen/Examples.Durham/shell_collection-figures rename to Documentation/Examples.Durham/shell_collection-figures diff --git a/Doxygen/Examples.Durham/shell_collection-load b/Documentation/Examples.Durham/shell_collection-load similarity index 100% rename from Doxygen/Examples.Durham/shell_collection-load rename to Documentation/Examples.Durham/shell_collection-load diff --git a/Doxygen/Examples.Durham/shell_collection-properties b/Documentation/Examples.Durham/shell_collection-properties similarity index 100% rename from Doxygen/Examples.Durham/shell_collection-properties rename to Documentation/Examples.Durham/shell_collection-properties diff --git a/Doxygen/Examples.Durham/shell_collection-properties-change b/Documentation/Examples.Durham/shell_collection-properties-change similarity index 100% rename from Doxygen/Examples.Durham/shell_collection-properties-change rename to Documentation/Examples.Durham/shell_collection-properties-change diff --git a/Doxygen/Examples.Durham/shell_collection-rename b/Documentation/Examples.Durham/shell_collection-rename similarity index 100% rename from Doxygen/Examples.Durham/shell_collection-rename rename to Documentation/Examples.Durham/shell_collection-rename diff --git a/Doxygen/Examples.Durham/shell_collection-truncate b/Documentation/Examples.Durham/shell_collection-truncate similarity index 100% rename from Doxygen/Examples.Durham/shell_collection-truncate rename to Documentation/Examples.Durham/shell_collection-truncate diff --git a/Doxygen/Examples.Durham/shell_collection-truncate-db b/Documentation/Examples.Durham/shell_collection-truncate-db similarity index 100% rename from Doxygen/Examples.Durham/shell_collection-truncate-db rename to Documentation/Examples.Durham/shell_collection-truncate-db diff --git a/Doxygen/Examples.Durham/shell_collection-truncate-name-db b/Documentation/Examples.Durham/shell_collection-truncate-name-db similarity index 100% rename from Doxygen/Examples.Durham/shell_collection-truncate-name-db rename to Documentation/Examples.Durham/shell_collection-truncate-name-db diff --git a/Doxygen/Examples.Durham/shell_collection-unload b/Documentation/Examples.Durham/shell_collection-unload similarity index 100% rename from Doxygen/Examples.Durham/shell_collection-unload rename to Documentation/Examples.Durham/shell_collection-unload diff --git a/Doxygen/Examples.Durham/shell_create-collection b/Documentation/Examples.Durham/shell_create-collection similarity index 100% rename from Doxygen/Examples.Durham/shell_create-collection rename to Documentation/Examples.Durham/shell_create-collection diff --git a/Doxygen/Examples.Durham/shell_create-collection-properties b/Documentation/Examples.Durham/shell_create-collection-properties similarity index 100% rename from Doxygen/Examples.Durham/shell_create-collection-properties rename to Documentation/Examples.Durham/shell_create-collection-properties diff --git a/Doxygen/Examples.Durham/shell_create-document b/Documentation/Examples.Durham/shell_create-document similarity index 100% rename from Doxygen/Examples.Durham/shell_create-document rename to Documentation/Examples.Durham/shell_create-document diff --git a/Doxygen/Examples.Durham/shell_create-edge b/Documentation/Examples.Durham/shell_create-edge similarity index 100% rename from Doxygen/Examples.Durham/shell_create-edge rename to Documentation/Examples.Durham/shell_create-edge diff --git a/Doxygen/Examples.Durham/shell_index-drop-index b/Documentation/Examples.Durham/shell_index-drop-index similarity index 100% rename from Doxygen/Examples.Durham/shell_index-drop-index rename to Documentation/Examples.Durham/shell_index-drop-index diff --git a/Doxygen/Examples.Durham/shell_index-drop-index-db b/Documentation/Examples.Durham/shell_index-drop-index-db similarity index 100% rename from Doxygen/Examples.Durham/shell_index-drop-index-db rename to Documentation/Examples.Durham/shell_index-drop-index-db diff --git a/Doxygen/Examples.Durham/shell_index-read b/Documentation/Examples.Durham/shell_index-read similarity index 100% rename from Doxygen/Examples.Durham/shell_index-read rename to Documentation/Examples.Durham/shell_index-read diff --git a/Doxygen/Examples.Durham/shell_index-read-all b/Documentation/Examples.Durham/shell_index-read-all similarity index 100% rename from Doxygen/Examples.Durham/shell_index-read-all rename to Documentation/Examples.Durham/shell_index-read-all diff --git a/Doxygen/Examples.Durham/shell_index-read-db b/Documentation/Examples.Durham/shell_index-read-db similarity index 100% rename from Doxygen/Examples.Durham/shell_index-read-db rename to Documentation/Examples.Durham/shell_index-read-db diff --git a/Doxygen/Examples.Durham/shell_read-collection-all b/Documentation/Examples.Durham/shell_read-collection-all similarity index 100% rename from Doxygen/Examples.Durham/shell_read-collection-all rename to Documentation/Examples.Durham/shell_read-collection-all diff --git a/Doxygen/Examples.Durham/shell_read-collection-id b/Documentation/Examples.Durham/shell_read-collection-id similarity index 100% rename from Doxygen/Examples.Durham/shell_read-collection-id rename to Documentation/Examples.Durham/shell_read-collection-id diff --git a/Doxygen/Examples.Durham/shell_read-collection-name b/Documentation/Examples.Durham/shell_read-collection-name similarity index 100% rename from Doxygen/Examples.Durham/shell_read-collection-name rename to Documentation/Examples.Durham/shell_read-collection-name diff --git a/Doxygen/Examples.Durham/shell_read-collection-short-cut b/Documentation/Examples.Durham/shell_read-collection-short-cut similarity index 100% rename from Doxygen/Examples.Durham/shell_read-collection-short-cut rename to Documentation/Examples.Durham/shell_read-collection-short-cut diff --git a/Doxygen/Examples.Durham/shell_read-collection-unknown b/Documentation/Examples.Durham/shell_read-collection-unknown similarity index 100% rename from Doxygen/Examples.Durham/shell_read-collection-unknown rename to Documentation/Examples.Durham/shell_read-collection-unknown diff --git a/Doxygen/Examples.Durham/shell_read-document-db b/Documentation/Examples.Durham/shell_read-document-db similarity index 100% rename from Doxygen/Examples.Durham/shell_read-document-db rename to Documentation/Examples.Durham/shell_read-document-db diff --git a/Doxygen/Examples.Durham/shell_remove-document b/Documentation/Examples.Durham/shell_remove-document similarity index 100% rename from Doxygen/Examples.Durham/shell_remove-document rename to Documentation/Examples.Durham/shell_remove-document diff --git a/Doxygen/Examples.Durham/shell_remove-document-conflict b/Documentation/Examples.Durham/shell_remove-document-conflict similarity index 100% rename from Doxygen/Examples.Durham/shell_remove-document-conflict rename to Documentation/Examples.Durham/shell_remove-document-conflict diff --git a/Doxygen/Examples.Durham/shell_remove-document-conflict-db b/Documentation/Examples.Durham/shell_remove-document-conflict-db similarity index 100% rename from Doxygen/Examples.Durham/shell_remove-document-conflict-db rename to Documentation/Examples.Durham/shell_remove-document-conflict-db diff --git a/Doxygen/Examples.Durham/shell_remove-document-db b/Documentation/Examples.Durham/shell_remove-document-db similarity index 100% rename from Doxygen/Examples.Durham/shell_remove-document-db rename to Documentation/Examples.Durham/shell_remove-document-db diff --git a/Doxygen/Examples.Durham/shell_replace-document b/Documentation/Examples.Durham/shell_replace-document similarity index 100% rename from Doxygen/Examples.Durham/shell_replace-document rename to Documentation/Examples.Durham/shell_replace-document diff --git a/Doxygen/Examples.Durham/shell_replace-document-db b/Documentation/Examples.Durham/shell_replace-document-db similarity index 100% rename from Doxygen/Examples.Durham/shell_replace-document-db rename to Documentation/Examples.Durham/shell_replace-document-db diff --git a/Doxygen/Examples.Durham/shell_replace-document-handle b/Documentation/Examples.Durham/shell_replace-document-handle similarity index 100% rename from Doxygen/Examples.Durham/shell_replace-document-handle rename to Documentation/Examples.Durham/shell_replace-document-handle diff --git a/Doxygen/Examples.Durham/shell_update-document b/Documentation/Examples.Durham/shell_update-document similarity index 100% rename from Doxygen/Examples.Durham/shell_update-document rename to Documentation/Examples.Durham/shell_update-document diff --git a/Doxygen/Examples.Durham/shell_update-document-array b/Documentation/Examples.Durham/shell_update-document-array similarity index 100% rename from Doxygen/Examples.Durham/shell_update-document-array rename to Documentation/Examples.Durham/shell_update-document-array diff --git a/Doxygen/Examples.Durham/shell_update-document-db b/Documentation/Examples.Durham/shell_update-document-db similarity index 100% rename from Doxygen/Examples.Durham/shell_update-document-db rename to Documentation/Examples.Durham/shell_update-document-db diff --git a/Doxygen/Examples.Durham/shell_update-document-handle b/Documentation/Examples.Durham/shell_update-document-handle similarity index 100% rename from Doxygen/Examples.Durham/shell_update-document-handle rename to Documentation/Examples.Durham/shell_update-document-handle diff --git a/Doxygen/Examples.Durham/shell_update-document-keep-null b/Documentation/Examples.Durham/shell_update-document-keep-null similarity index 100% rename from Doxygen/Examples.Durham/shell_update-document-keep-null rename to Documentation/Examples.Durham/shell_update-document-keep-null diff --git a/Doxygen/Examples.Durham/simple-query-closed-range-to-array b/Documentation/Examples.Durham/simple-query-closed-range-to-array similarity index 100% rename from Doxygen/Examples.Durham/simple-query-closed-range-to-array rename to Documentation/Examples.Durham/simple-query-closed-range-to-array diff --git a/Doxygen/Examples.Durham/simple-query-geo b/Documentation/Examples.Durham/simple-query-geo similarity index 100% rename from Doxygen/Examples.Durham/simple-query-geo rename to Documentation/Examples.Durham/simple-query-geo diff --git a/Doxygen/Examples.Durham/simple-query-near b/Documentation/Examples.Durham/simple-query-near similarity index 100% rename from Doxygen/Examples.Durham/simple-query-near rename to Documentation/Examples.Durham/simple-query-near diff --git a/Doxygen/Examples.Durham/simple-query-near2 b/Documentation/Examples.Durham/simple-query-near2 similarity index 100% rename from Doxygen/Examples.Durham/simple-query-near2 rename to Documentation/Examples.Durham/simple-query-near2 diff --git a/Doxygen/Examples.Durham/simple-query-range-to-array b/Documentation/Examples.Durham/simple-query-range-to-array similarity index 100% rename from Doxygen/Examples.Durham/simple-query-range-to-array rename to Documentation/Examples.Durham/simple-query-range-to-array diff --git a/Doxygen/Examples.Durham/simple-query-within b/Documentation/Examples.Durham/simple-query-within similarity index 100% rename from Doxygen/Examples.Durham/simple-query-within rename to Documentation/Examples.Durham/simple-query-within diff --git a/Doxygen/Examples.Durham/simple10 b/Documentation/Examples.Durham/simple10 similarity index 100% rename from Doxygen/Examples.Durham/simple10 rename to Documentation/Examples.Durham/simple10 diff --git a/Doxygen/Examples.Durham/simple18 b/Documentation/Examples.Durham/simple18 similarity index 100% rename from Doxygen/Examples.Durham/simple18 rename to Documentation/Examples.Durham/simple18 diff --git a/Doxygen/Examples.Durham/simple19 b/Documentation/Examples.Durham/simple19 similarity index 100% rename from Doxygen/Examples.Durham/simple19 rename to Documentation/Examples.Durham/simple19 diff --git a/Doxygen/Examples.Durham/simple2 b/Documentation/Examples.Durham/simple2 similarity index 100% rename from Doxygen/Examples.Durham/simple2 rename to Documentation/Examples.Durham/simple2 diff --git a/Doxygen/Examples.Durham/simple3 b/Documentation/Examples.Durham/simple3 similarity index 100% rename from Doxygen/Examples.Durham/simple3 rename to Documentation/Examples.Durham/simple3 diff --git a/Doxygen/Examples.Durham/simple4 b/Documentation/Examples.Durham/simple4 similarity index 100% rename from Doxygen/Examples.Durham/simple4 rename to Documentation/Examples.Durham/simple4 diff --git a/Doxygen/Examples.Durham/simple5 b/Documentation/Examples.Durham/simple5 similarity index 100% rename from Doxygen/Examples.Durham/simple5 rename to Documentation/Examples.Durham/simple5 diff --git a/Doxygen/Examples.Durham/simple7 b/Documentation/Examples.Durham/simple7 similarity index 100% rename from Doxygen/Examples.Durham/simple7 rename to Documentation/Examples.Durham/simple7 diff --git a/Doxygen/Examples.Durham/simple8 b/Documentation/Examples.Durham/simple8 similarity index 100% rename from Doxygen/Examples.Durham/simple8 rename to Documentation/Examples.Durham/simple8 diff --git a/Doxygen/Examples.Durham/simple9 b/Documentation/Examples.Durham/simple9 similarity index 100% rename from Doxygen/Examples.Durham/simple9 rename to Documentation/Examples.Durham/simple9 diff --git a/Doxygen/Examples.Durham/system1 b/Documentation/Examples.Durham/system1 similarity index 100% rename from Doxygen/Examples.Durham/system1 rename to Documentation/Examples.Durham/system1 diff --git a/Doxygen/Examples.Fyn/conf1 b/Documentation/Examples.Fyn/conf1 similarity index 100% rename from Doxygen/Examples.Fyn/conf1 rename to Documentation/Examples.Fyn/conf1 diff --git a/Doxygen/Examples.Fyn/conf2 b/Documentation/Examples.Fyn/conf2 similarity index 100% rename from Doxygen/Examples.Fyn/conf2 rename to Documentation/Examples.Fyn/conf2 diff --git a/Doxygen/Examples.Fyn/conf3 b/Documentation/Examples.Fyn/conf3 similarity index 100% rename from Doxygen/Examples.Fyn/conf3 rename to Documentation/Examples.Fyn/conf3 diff --git a/Doxygen/Examples.Fyn/conf4 b/Documentation/Examples.Fyn/conf4 similarity index 100% rename from Doxygen/Examples.Fyn/conf4 rename to Documentation/Examples.Fyn/conf4 diff --git a/Doxygen/Examples.Fyn/conf5 b/Documentation/Examples.Fyn/conf5 similarity index 100% rename from Doxygen/Examples.Fyn/conf5 rename to Documentation/Examples.Fyn/conf5 diff --git a/Documentation/Makefile.doxygen b/Documentation/Makefile.doxygen new file mode 100644 index 0000000000..8a5149df99 --- /dev/null +++ b/Documentation/Makefile.doxygen @@ -0,0 +1,127 @@ +# -*- mode: Makefile; -*- + +################################################################################ +## --SECTION-- DOXYGEN +################################################################################ + +################################################################################ +### @brief directory setup +################################################################################ + +.PHONY: Documentation/js Documentation/js/system Documentation/js/modules + +BUILT_SOURCES += Documentation/.setup-directories + +Documentation/.setup-directories: + @test -d Documentation/js || mkdir Documentation/js + @test -d Documentation/js/actions || mkdir Documentation/js/actions + @test -d Documentation/js/actions/system || mkdir Documentation/js/actions/system + @test -d Documentation/js/common || mkdir Documentation/js/common + @test -d Documentation/js/common/bootstrap || mkdir Documentation/js/common/bootstrap + @test -d Documentation/js/common/modules || mkdir Documentation/js/common/modules + @test -d Documentation/js/server || mkdir Documentation/js/server + @test -d Documentation/js/server/modules || mkdir Documentation/js/server/modules + @test -d Documentation/js/client || mkdir Documentation/js/client + @test -d Documentation/web || mkdir Documentation/web + @touch $@ + +Documentation/js/actions/system/%.c: @srcdir@/js/actions/system/%.js Documentation/.setup-directories + @python @top_srcdir@/Documentation/Scripts/js2doxy.py $< > $@ + +Documentation/js/common/bootstrap/%.c: @srcdir@/js/common/bootstrap/%.js Documentation/.setup-directories + @python @top_srcdir@/Documentation/Scripts/js2doxy.py $< > $@ + +Documentation/js/common/modules/%.c: @srcdir@/js/common/modules/%.js Documentation/.setup-directories + @python @top_srcdir@/Documentation/Scripts/js2doxy.py $< > $@ + +Documentation/js/server/%.c: @srcdir@/js/server/%.js Documentation/.setup-directories + @python @top_srcdir@/Documentation/Scripts/js2doxy.py $< > $@ + +Documentation/js/server/modules/%.c: @srcdir@/js/server/modules/%.js Documentation/.setup-directories + @python @top_srcdir@/Documentation/Scripts/js2doxy.py $< > $@ + +Documentation/xml/%.md: Documentation/xml/%.xml + @python @top_srcdir@/Documentation/Scripts/xml2md.py $< > $@ + +################################################################################ +### @brief doxygen +################################################################################ + +.PHONY: doxygen + +Documentation/arango-html.doxy: Documentation/arango.template + sed -e 's:GENERATE_HTML *= *NO:GENERATE_HTML = YES:' -e 's:ENABLED_SECTIONS *=:ENABLED_SECTIONS = HTML:' < $< > $@ + $(MAKE) lib/BasicsC/voc-errors.h + +doxygen: Documentation/arango-html.doxy $(DOXYGEN) + doxygen Documentation/arango-html.doxy > /dev/null + @for w in $(WIKI); do @top_srcdir@/Documentation/Scripts/html2html.sh Documentation/html/$$w.html Documentation/web/$$w.html; done + +################################################################################ +### @brief wiki +################################################################################ + +.PHONY: wiki wiki2 + +Documentation/arango-xml.doxy: Documentation/arango.template + sed -e 's:GENERATE_XML *= *NO:GENERATE_XML = YES:' -e 's:ENABLED_SECTIONS *=:ENABLED_SECTIONS = XML:' < $< > $@ + $(MAKE) lib/BasicsC/voc-errors.h + +wiki: wiki2 + @test -d Documentation/wiki || mkdir Documentation/wiki + @for w in $(WIKI); do python @top_srcdir@/Documentation/Scripts/xml2md.py Documentation/xml/$$w.xml > Documentation/xml/$$w.md; done + @for w in $(WIKI); do @top_srcdir@/Documentation/Scripts/fixmd.sh Documentation/xml/$$w.md; done + +wiki2: Documentation/arango-xml.doxy $(DOXYGEN) + doxygen Documentation/arango-xml.doxy > /dev/null + +################################################################################ +### @brief latex +################################################################################ + +.PHONY: latex + +Documentation/arango-latex.doxy: Documentation/arango.template + sed -e 's:GENERATE_LATEX *= *NO:GENERATE_LATEX = YES:' -e 's:ENABLED_SECTIONS *=:ENABLED_SECTIONS = LATEX:' < $< > $@ + $(MAKE) lib/BasicsC/voc-errors.h + +latex: Documentation/arango-latex.doxy $(DOXYGEN) + doxygen Documentation/arango-latex.doxy > /dev/null + + echo "\def\arangodbversion{@PACKAGE_VERSION@}" > Documentation/latex/version.tex + + python @top_srcdir@/Documentation/Scripts/tex2tex.py Documentation/latex/InstallManual.tex > Documentation/latex/InstallManual.inc.tex + cd Documentation/latex && pdflatex -interaction batchmode install-manual.tex || true + + python @top_srcdir@/Documentation/Scripts/tex2tex.py Documentation/latex/UserManual.tex > Documentation/latex/UserManual.inc.tex + cd Documentation/latex && pdflatex -interaction batchmode user-manual.tex || true + + python @top_srcdir@/Documentation/Scripts/tex2tex.py Documentation/latex/ImplementorManual.tex > Documentation/latex/ImplementorManual.inc.tex + cd Documentation/latex && pdflatex -interaction batchmode implementor-manual.tex || true + + python @top_srcdir@/Documentation/Scripts/tex2tex.py Documentation/latex/RefManual.tex > Documentation/latex/RefManual.inc.tex + cd Documentation/latex && pdflatex -interaction batchmode ref-manual.tex || true + + python @top_srcdir@/Documentation/Scripts/tex2tex.py Documentation/latex/DbaManual.tex > Documentation/latex/DbaManual.inc.tex + cd Documentation/latex && pdflatex -interaction batchmode dba-manual.tex || true + + python @top_srcdir@/Documentation/Scripts/tex2tex.py Documentation/latex/ImpManual.tex > Documentation/latex/ImpManual.inc.tex + cd Documentation/latex && pdflatex -interaction batchmode imp-manual.tex || true + +################################################################################ +### @brief cleanup +################################################################################ + +CLEANUP += \ + $(DOXYGEN) \ + $(addsuffix .md,$(addprefix Documentation/xml/,$(WIKI))) \ + $(addsuffix .md,$(addprefix Documentation/wiki/,$(WIKI))) + +################################################################################ +## --SECTION-- END-OF-FILE +################################################################################ + +## Local Variables: +## mode: outline-minor +## outline-regexp: "^\\(### @brief\\|## --SECTION--\\|# -\\*- \\)" +## End: diff --git a/Doxygen/Scripts/arangodb.css b/Documentation/Scripts/arangodb.css similarity index 100% rename from Doxygen/Scripts/arangodb.css rename to Documentation/Scripts/arangodb.css diff --git a/Doxygen/Scripts/arangodb_footer.html b/Documentation/Scripts/arangodb_footer.html similarity index 100% rename from Doxygen/Scripts/arangodb_footer.html rename to Documentation/Scripts/arangodb_footer.html diff --git a/Doxygen/Scripts/arangodb_header.html b/Documentation/Scripts/arangodb_header.html similarity index 100% rename from Doxygen/Scripts/arangodb_header.html rename to Documentation/Scripts/arangodb_header.html diff --git a/Doxygen/Scripts/findverb.sh b/Documentation/Scripts/findverb.sh similarity index 100% rename from Doxygen/Scripts/findverb.sh rename to Documentation/Scripts/findverb.sh diff --git a/Doxygen/Scripts/fixmd.sh b/Documentation/Scripts/fixmd.sh similarity index 100% rename from Doxygen/Scripts/fixmd.sh rename to Documentation/Scripts/fixmd.sh diff --git a/Doxygen/Scripts/html2html.sh b/Documentation/Scripts/html2html.sh similarity index 100% rename from Doxygen/Scripts/html2html.sh rename to Documentation/Scripts/html2html.sh diff --git a/Doxygen/Scripts/js2doxy.py b/Documentation/Scripts/js2doxy.py similarity index 100% rename from Doxygen/Scripts/js2doxy.py rename to Documentation/Scripts/js2doxy.py diff --git a/Doxygen/Scripts/tex2tex.py b/Documentation/Scripts/tex2tex.py similarity index 100% rename from Doxygen/Scripts/tex2tex.py rename to Documentation/Scripts/tex2tex.py diff --git a/Doxygen/Scripts/xml2md.py b/Documentation/Scripts/xml2md.py similarity index 100% rename from Doxygen/Scripts/xml2md.py rename to Documentation/Scripts/xml2md.py diff --git a/Doxygen/arango-html.doxy b/Documentation/arango-html.doxy similarity index 100% rename from Doxygen/arango-html.doxy rename to Documentation/arango-html.doxy diff --git a/Doxygen/arango-latex.doxy b/Documentation/arango-latex.doxy similarity index 100% rename from Doxygen/arango-latex.doxy rename to Documentation/arango-latex.doxy diff --git a/Doxygen/arango-xml.doxy b/Documentation/arango-xml.doxy similarity index 100% rename from Doxygen/arango-xml.doxy rename to Documentation/arango-xml.doxy diff --git a/Doxygen/arango.template.in b/Documentation/arango.template.in similarity index 100% rename from Doxygen/arango.template.in rename to Documentation/arango.template.in diff --git a/Doxygen/latex/dba-manual.tex b/Documentation/latex/dba-manual.tex similarity index 100% rename from Doxygen/latex/dba-manual.tex rename to Documentation/latex/dba-manual.tex diff --git a/Doxygen/latex/header.tex b/Documentation/latex/header.tex similarity index 100% rename from Doxygen/latex/header.tex rename to Documentation/latex/header.tex diff --git a/Doxygen/latex/images/fe1.png b/Documentation/latex/images/fe1.png similarity index 100% rename from Doxygen/latex/images/fe1.png rename to Documentation/latex/images/fe1.png diff --git a/Doxygen/latex/imp-manual.tex b/Documentation/latex/imp-manual.tex similarity index 100% rename from Doxygen/latex/imp-manual.tex rename to Documentation/latex/imp-manual.tex diff --git a/Doxygen/latex/implementor-manual.tex b/Documentation/latex/implementor-manual.tex similarity index 100% rename from Doxygen/latex/implementor-manual.tex rename to Documentation/latex/implementor-manual.tex diff --git a/Doxygen/latex/install-manual.tex b/Documentation/latex/install-manual.tex similarity index 100% rename from Doxygen/latex/install-manual.tex rename to Documentation/latex/install-manual.tex diff --git a/Doxygen/latex/ref-manual.tex b/Documentation/latex/ref-manual.tex similarity index 100% rename from Doxygen/latex/ref-manual.tex rename to Documentation/latex/ref-manual.tex diff --git a/Doxygen/latex/user-manual.tex b/Documentation/latex/user-manual.tex similarity index 100% rename from Doxygen/latex/user-manual.tex rename to Documentation/latex/user-manual.tex diff --git a/Doxygen/web/images/fe1.png b/Documentation/web/images/fe1.png similarity index 100% rename from Doxygen/web/images/fe1.png rename to Documentation/web/images/fe1.png diff --git a/Doxygen/web/images/logo_arangodb.png b/Documentation/web/images/logo_arangodb.png similarity index 100% rename from Doxygen/web/images/logo_arangodb.png rename to Documentation/web/images/logo_arangodb.png diff --git a/Doxygen/Makefile.doxygen b/Doxygen/Makefile.doxygen deleted file mode 100644 index 196d86e25f..0000000000 --- a/Doxygen/Makefile.doxygen +++ /dev/null @@ -1,127 +0,0 @@ -# -*- mode: Makefile; -*- - -################################################################################ -## --SECTION-- DOXYGEN -################################################################################ - -################################################################################ -### @brief directory setup -################################################################################ - -.PHONY: Doxygen/js Doxygen/js/system Doxygen/js/modules - -BUILT_SOURCES += Doxygen/.setup-directories - -Doxygen/.setup-directories: - @test -d Doxygen/js || mkdir Doxygen/js - @test -d Doxygen/js/actions || mkdir Doxygen/js/actions - @test -d Doxygen/js/actions/system || mkdir Doxygen/js/actions/system - @test -d Doxygen/js/common || mkdir Doxygen/js/common - @test -d Doxygen/js/common/bootstrap || mkdir Doxygen/js/common/bootstrap - @test -d Doxygen/js/common/modules || mkdir Doxygen/js/common/modules - @test -d Doxygen/js/server || mkdir Doxygen/js/server - @test -d Doxygen/js/server/modules || mkdir Doxygen/js/server/modules - @test -d Doxygen/js/client || mkdir Doxygen/js/client - @test -d Doxygen/web || mkdir Doxygen/web - @touch $@ - -Doxygen/js/actions/system/%.c: @srcdir@/js/actions/system/%.js Doxygen/.setup-directories - @python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@ - -Doxygen/js/common/bootstrap/%.c: @srcdir@/js/common/bootstrap/%.js Doxygen/.setup-directories - @python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@ - -Doxygen/js/common/modules/%.c: @srcdir@/js/common/modules/%.js Doxygen/.setup-directories - @python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@ - -Doxygen/js/server/%.c: @srcdir@/js/server/%.js Doxygen/.setup-directories - @python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@ - -Doxygen/js/server/modules/%.c: @srcdir@/js/server/modules/%.js Doxygen/.setup-directories - @python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@ - -Doxygen/xml/%.md: Doxygen/xml/%.xml - @python @top_srcdir@/Doxygen/Scripts/xml2md.py $< > $@ - -################################################################################ -### @brief doxygen -################################################################################ - -.PHONY: doxygen - -Doxygen/arango-html.doxy: Doxygen/arango.template - sed -e 's:GENERATE_HTML *= *NO:GENERATE_HTML = YES:' -e 's:ENABLED_SECTIONS *=:ENABLED_SECTIONS = HTML:' < $< > $@ - $(MAKE) lib/BasicsC/voc-errors.h - -doxygen: Doxygen/arango-html.doxy $(DOXYGEN) - doxygen Doxygen/arango-html.doxy > /dev/null - @for w in $(WIKI); do @top_srcdir@/Doxygen/Scripts/html2html.sh Doxygen/html/$$w.html Doxygen/web/$$w.html; done - -################################################################################ -### @brief wiki -################################################################################ - -.PHONY: wiki wiki2 - -Doxygen/arango-xml.doxy: Doxygen/arango.template - sed -e 's:GENERATE_XML *= *NO:GENERATE_XML = YES:' -e 's:ENABLED_SECTIONS *=:ENABLED_SECTIONS = XML:' < $< > $@ - $(MAKE) lib/BasicsC/voc-errors.h - -wiki: wiki2 - @test -d Doxygen/wiki || mkdir Doxygen/wiki - @for w in $(WIKI); do python @top_srcdir@/Doxygen/Scripts/xml2md.py Doxygen/xml/$$w.xml > Doxygen/xml/$$w.md; done - @for w in $(WIKI); do @top_srcdir@/Doxygen/Scripts/fixmd.sh Doxygen/xml/$$w.md; done - -wiki2: Doxygen/arango-xml.doxy $(DOXYGEN) - doxygen Doxygen/arango-xml.doxy > /dev/null - -################################################################################ -### @brief latex -################################################################################ - -.PHONY: latex - -Doxygen/arango-latex.doxy: Doxygen/arango.template - sed -e 's:GENERATE_LATEX *= *NO:GENERATE_LATEX = YES:' -e 's:ENABLED_SECTIONS *=:ENABLED_SECTIONS = LATEX:' < $< > $@ - $(MAKE) lib/BasicsC/voc-errors.h - -latex: Doxygen/arango-latex.doxy $(DOXYGEN) - doxygen Doxygen/arango-latex.doxy > /dev/null - - echo "\def\arangodbversion{@PACKAGE_VERSION@}" > Doxygen/latex/version.tex - - python @top_srcdir@/Doxygen/Scripts/tex2tex.py Doxygen/latex/InstallManual.tex > Doxygen/latex/InstallManual.inc.tex - cd Doxygen/latex && pdflatex -interaction batchmode install-manual.tex || true - - python @top_srcdir@/Doxygen/Scripts/tex2tex.py Doxygen/latex/UserManual.tex > Doxygen/latex/UserManual.inc.tex - cd Doxygen/latex && pdflatex -interaction batchmode user-manual.tex || true - - python @top_srcdir@/Doxygen/Scripts/tex2tex.py Doxygen/latex/ImplementorManual.tex > Doxygen/latex/ImplementorManual.inc.tex - cd Doxygen/latex && pdflatex -interaction batchmode implementor-manual.tex || true - - python @top_srcdir@/Doxygen/Scripts/tex2tex.py Doxygen/latex/RefManual.tex > Doxygen/latex/RefManual.inc.tex - cd Doxygen/latex && pdflatex -interaction batchmode ref-manual.tex || true - - python @top_srcdir@/Doxygen/Scripts/tex2tex.py Doxygen/latex/DbaManual.tex > Doxygen/latex/DbaManual.inc.tex - cd Doxygen/latex && pdflatex -interaction batchmode dba-manual.tex || true - - python @top_srcdir@/Doxygen/Scripts/tex2tex.py Doxygen/latex/ImpManual.tex > Doxygen/latex/ImpManual.inc.tex - cd Doxygen/latex && pdflatex -interaction batchmode imp-manual.tex || true - -################################################################################ -### @brief cleanup -################################################################################ - -CLEANUP += \ - $(DOXYGEN) \ - $(addsuffix .md,$(addprefix Doxygen/xml/,$(WIKI))) \ - $(addsuffix .md,$(addprefix Doxygen/wiki/,$(WIKI))) - -################################################################################ -## --SECTION-- END-OF-FILE -################################################################################ - -## Local Variables: -## mode: outline-minor -## outline-regexp: "^\\(### @brief\\|## --SECTION--\\|# -\\*- \\)" -## End: diff --git a/Contribute/Makefile.ubuntu b/Installation/Contribute/Makefile.ubuntu similarity index 100% rename from Contribute/Makefile.ubuntu rename to Installation/Contribute/Makefile.ubuntu diff --git a/Installation/rc.arangodb.Centos b/Installation/Linux/rc.arangodb.Centos similarity index 100% rename from Installation/rc.arangodb.Centos rename to Installation/Linux/rc.arangodb.Centos diff --git a/Installation/rc.arangodb.Debian b/Installation/Linux/rc.arangodb.Debian similarity index 100% rename from Installation/rc.arangodb.Debian rename to Installation/Linux/rc.arangodb.Debian diff --git a/Installation/rc.arangodb.OpenSuSE b/Installation/Linux/rc.arangodb.OpenSuSE similarity index 100% rename from Installation/rc.arangodb.OpenSuSE rename to Installation/Linux/rc.arangodb.OpenSuSE diff --git a/Installation/rc.arangodb.Ubuntu b/Installation/Linux/rc.arangodb.Ubuntu similarity index 100% rename from Installation/rc.arangodb.Ubuntu rename to Installation/Linux/rc.arangodb.Ubuntu diff --git a/Installation/org.arangodb.plist b/Installation/MacOSX/org.arangodb.plist similarity index 100% rename from Installation/org.arangodb.plist rename to Installation/MacOSX/org.arangodb.plist diff --git a/Makefile.local b/Installation/Makefile.local similarity index 100% rename from Makefile.local rename to Installation/Makefile.local diff --git a/Installation/arangod-local.conf b/Installation/arangod-local.conf deleted file mode 100644 index e2b9b69cd8..0000000000 --- a/Installation/arangod-local.conf +++ /dev/null @@ -1,24 +0,0 @@ -[database] -directory= /tmp/ARANGO/var/arangodb -# maximal-journal-size=33554432 -# remove-on-drop=true - -[server] -http-port = localhost:8529 -http-auth = no -disable-admin-interface = no -# admin-port = localhost:8530 -admin-directory= ./html/admin -threads = 5 - -[scheduler] -threads = 3 - -[javascript] -action-directory= ./js/actions/system -modules-path = ./js/server/modules;./js/common/modules - -[log] -level = info -severity = human -# file = /tmp/arangod.log diff --git a/build.sh b/Installation/build.sh similarity index 100% rename from build.sh rename to Installation/build.sh diff --git a/coverage.sh b/Installation/coverage.sh old mode 100644 new mode 100755 similarity index 100% rename from coverage.sh rename to Installation/coverage.sh diff --git a/Installation/arangodb.list b/Installation/epm/arangodb.list similarity index 98% rename from Installation/arangodb.list rename to Installation/epm/arangodb.list index 0f1356a0eb..63210e10f5 100644 --- a/Installation/arangodb.list +++ b/Installation/epm/arangodb.list @@ -61,7 +61,7 @@ d 0755 ${susr} ${sgrp} /var/log/arangodb - %ifdef macosx d 0755 ${rusr} ${rgrp} /Library/LaunchDaemons/ - -f 0755 ${rusr} ${rgrp} /Library/LaunchDaemons/org.arangodb.plist.template ${project_dir}/Installation/org.arangodb.plist +f 0755 ${rusr} ${rgrp} /Library/LaunchDaemons/org.arangodb.plist.template ${project_dir}/Installation/MacOSX/org.arangodb.plist %postinstall < /Library/LaunchDaemons/org.arangodb.plist launchctl unload /Library/LaunchDaemons/org.arangodb.plist diff --git a/packetize.sh b/Installation/packetize.sh similarity index 98% rename from packetize.sh rename to Installation/packetize.sh index 731abc46ce..64058bef42 100755 --- a/packetize.sh +++ b/Installation/packetize.sh @@ -19,9 +19,9 @@ runlevels="035" curl_version="curl -s -o - http://localhost:8529/_api/version" # name of the epm configuration file -LIST="Installation/${project_name}.list" +LIST="Installation/epm/${project_name}.list" # name of a created epm include file -SUBLIST="Installation/${project_name}.sublist" +SUBLIST="Installation/epm/${project_name}.sublist" START_SCRIPT=""; @@ -39,8 +39,8 @@ initdir=/etc/init.d bindir=${exec_prefix}/bin data_dir=/var static_dir=${prefix}/share -vers_dir=arango-${arangodb_version} -docdir=${prefix}/share/doc/voc/${vers_dir} +vers_dir=arangodb-${arangodb_version} +docdir=${prefix}/share/doc/${vers_dir} echo echo "########################################################" @@ -60,7 +60,7 @@ case $TRI_OS_LONG in package_type="rpm" START_SCRIPT="rc.arangodb.OpenSuSE" runlevels="035" - docdir=${prefix}/share/doc/packages/voc/${vers_dir} + docdir=${prefix}/share/doc/packages/${vers_dir} # exports for the epm configuration file export insserv="true" diff --git a/release.sh b/Installation/release.sh similarity index 99% rename from release.sh rename to Installation/release.sh index 60ee0bea7e..84e5fab4aa 100755 --- a/release.sh +++ b/Installation/release.sh @@ -50,4 +50,3 @@ if [ "$TAG" == "1" ]; then git tag "v$VERSION" git push --tags fi - diff --git a/unittests.sh b/Installation/unittests.sh similarity index 100% rename from unittests.sh rename to Installation/unittests.sh diff --git a/Makefile.am b/Makefile.am index 84f9ac22ad..53b67e03b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,15 +1,9 @@ # -*- mode: Makefile; -*- ## ----------------------------------------------------------------------------- -## --SECTION-- FLAGS & VARIABLES +## --SECTION-- FILES ## ----------------------------------------------------------------------------- -################################################################################ -### @brief m4 directory -################################################################################ - -ACLOCAL_AMFLAGS = -I m4 - ################################################################################ ### @brief source to build before compile ################################################################################ @@ -52,6 +46,16 @@ BISONXX_FILES = PROTOBUF_FILES = +## ----------------------------------------------------------------------------- +## --SECTION-- FLAGS +## ----------------------------------------------------------------------------- + +################################################################################ +### @brief m4 directory +################################################################################ + +ACLOCAL_AMFLAGS = -I m4 + ################################################################################ ### @brief preprocessor flags ################################################################################ @@ -68,6 +72,7 @@ AM_CPPFLAGS = \ @PROTOBUF_CPPFLAGS@ \ @V8_CPPFLAGS@ + if ENABLE_ZEROMQ AM_CPPFLAGS += \ @@ -76,40 +81,18 @@ AM_CPPFLAGS += \ endif - -if ENABLE_RELATIVE_SYSTEM - -TRI_LOG_DIR=$(prefix)/var/log/$(PACKAGE_TARNAME) -TRI_PKGDATA_DIR=$(prefix)/share/$(PACKAGE_TARNAME) -TRI_SBIN_DIR=${prefix}/sbin -TRI_SYSCONF_DIR=${prefix}/etc/$(PACKAGE_TARNAME) - -else -if ENABLE_RELATIVE_DEVEL - -TRI_DATABASE_DIR=$(localstatedir)/$(PACKAGE_TARNAME) -TRI_LOG_DIR=/tmp -TRI_PKGDATA_DIR=. -TRI_SBIN_DIR=bin +if ENABLE_RELATIVE AM_CPPFLAGS += \ - -D_DATABASEDIR_='"${TRI_DATABASE_DIR}"' + -D_SYSCONFDIR_='"etc/relative"' + else -TRI_DATABASE_DIR=$(localstatedir)/$(PACKAGE_TARNAME) -TRI_LOG_DIR=$(localstatedir)/log/$(PACKAGE_TARNAME) -TRI_PKGDATA_DIR=${pkgdatadir} -TRI_SBIN_DIR=${sbindir} -TRI_SYSCONF_DIR=$(sysconfdir)/$(PACKAGE_TARNAME) - AM_CPPFLAGS += \ - -D_DATABASEDIR_='"${TRI_DATABASE_DIR}"' \ - -D_PKGDATADIR_='"${TRI_PKGDATA_DIR}"' \ - -D_SYSCONFDIR_='"${TRI_SYSCONF_DIR}"' + -D_SYSCONFDIR_='"${sysconfdir}/${PACKAGE_TARNAME}"' endif -endif ################################################################################ ### @brief linker flags @@ -280,7 +263,7 @@ build.h: configure.ac ### @brief local modifications ################################################################################ --include Makefile.local +-include Installation/Makefile.local ################################################################################ ### @brief source files @@ -342,22 +325,13 @@ built-sources: build.h errorfiles $(JAVASCRIPT_HEADER) # exclude arango skripts from sources list bin_arango_password_SOURCES = -bin/arango-password: bin/arango-password.in -if ENABLE_RELATIVE_DEVEL - sed \ - -e 's%@SBINDIR@%bin%g' \ - -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \ - -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \ - $< > $@ - chmod 755 $@ -else +bin/arango-password: utils/arango-password.in sed \ -e 's%@SBINDIR@%${TRI_SBIN_DIR}%g' \ -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \ -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \ $< > $@ chmod 755 $@ -endif CLEANUP += bin/arango-password @@ -394,22 +368,13 @@ CLEANUP += bin/arango-upgrade # exclude arango skrips from sources list bin_arango_dfdb_SOURCES = -bin/arango-dfdb: bin/arango-dfdb.in -if ENABLE_RELATIVE_DEVEL - sed \ - -e 's%@SBINDIR@%bin%g' \ - -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \ - -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \ - $< > $@ - chmod 755 $@ -else +bin/arango-dfdb: utils/arango-dfdb.in sed \ -e 's%@SBINDIR@%${TRI_SBIN_DIR}%g' \ -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \ -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \ $< > $@ chmod 755 $@ -endif CLEANUP += bin/arango-dfdb @@ -417,60 +382,78 @@ CLEANUP += bin/arango-dfdb ## --SECTION-- DEPENDENCIES ## ----------------------------------------------------------------------------- -################################################################################ -### @brief mruby -################################################################################ - -if ENABLE_MRUBY -include m4/Makefile.mruby -endif - ################################################################################ ### @brief documentation ################################################################################ -include Doxygen/Makefile.doxygen +include Documentation/Makefile.doxygen ################################################################################ ### @brief javascript ################################################################################ -include m4/Makefile.javascript +include js/Makefile.javascript ################################################################################ -### @brief flex +### @brief mruby +################################################################################ + +if ENABLE_MRUBY +include mr/Makefile.mruby +endif + +## ----------------------------------------------------------------------------- +## --SECTION-- GENERATED FILES +## ----------------------------------------------------------------------------- + +################################################################################ +### @brief generate all flex files ################################################################################ if ENABLE_FLEX -include m4/Makefile.flex +include lib/Makefile.flex endif ################################################################################ -### @brief bison +### @brief generate all bison files ################################################################################ if ENABLE_BISON -include m4/Makefile.bison +include lib/Makefile.bison endif ################################################################################ -### @brief protocol buffers +### @brief generate all protocol buffers ################################################################################ -include m4/Makefile.all-in-one-protobuf -include m4/Makefile.protobuf +include lib/Makefile.protobuf ## ----------------------------------------------------------------------------- ## --SECTION-- EXTERNAL LIBRARIES ## ----------------------------------------------------------------------------- ################################################################################ -### @brief libev and V8 +### @brief libev ################################################################################ -if ENABLE_ALL_IN_ONE -include m4/Makefile.all-in-one-libev -include m4/Makefile.all-in-one-v8 +if ENABLE_ALL_IN_ONE_LIBEV +include 3rdParty/Makefile.all-in-one-libev +endif + +################################################################################ +### @brief protcol buffers +################################################################################ + +if ENABLE_ALL_IN_ONE_PROTOBUF +include 3rdParty/Makefile.all-in-one-protobuf +endif + +################################################################################ +### @brief V8 +################################################################################ + +if ENABLE_ALL_IN_ONE_V8 +include 3rdParty/Makefile.all-in-one-v8 endif ################################################################################ @@ -478,7 +461,7 @@ endif ################################################################################ if ENABLE_MRUBY -include m4/Makefile.all-in-one-mruby +include 3rdParty/Makefile.all-in-one-mruby endif ################################################################################ @@ -486,7 +469,7 @@ endif ################################################################################ if ENABLE_ZEROMQ -include m4/Makefile.all-in-one-zeromq +include 3rdParty/Makefile.all-in-one-zeromq endif ## ----------------------------------------------------------------------------- diff --git a/Makefile.in b/Makefile.in index d8c58b42da..24d6e1803b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,7 @@ # -*- mode: Makefile; -*- ################################################################################ -### @brief m4 directory +### @brief source to build before compile ################################################################################ # -*- mode: Makefile; -*- @@ -82,15 +82,6 @@ ################################################################################ ################################################################################ -################################################################################ -### @brief sets up the directories -################################################################################ - -# -*- mode: Makefile; -*- - -################################################################################ -################################################################################ - ################################################################################ ### @brief directory setup ################################################################################ @@ -110,32 +101,17 @@ ################################################################################ ################################################################################ -### @brief built sources +### @brief sets up the directories ################################################################################ # -*- mode: Makefile; -*- -################################################################################ -################################################################################ - ################################################################################ ### @brief built sources ################################################################################ # -*- mode: Makefile; -*- -################################################################################ -################################################################################ - -################################################################################ -### @brief Protobuf -################################################################################ - -# -*- mode: Makefile; -*- - -################################################################################ -################################################################################ - ################################################################################ ### @brief built sources ################################################################################ @@ -143,8 +119,11 @@ # -*- mode: Makefile; -*- ################################################################################ +### @brief built sources ################################################################################ +# -*- mode: Makefile; -*- + ################################################################################ ### @brief libev ################################################################################ @@ -152,26 +131,23 @@ # -*- mode: Makefile; -*- ################################################################################ +### @brief Protobuf ################################################################################ +# -*- mode: Makefile; -*- + ################################################################################ ### @brief V8 ################################################################################ # -*- mode: Makefile; -*- -################################################################################ -################################################################################ - ################################################################################ ### @brief mruby ################################################################################ # -*- mode: Makefile; -*- -################################################################################ -################################################################################ - ################################################################################ ### @brief ZeroMQ ################################################################################ @@ -201,13 +177,11 @@ target_triplet = @target@ @ENABLE_ZEROMQ_TRUE@am__append_1 = \ @ENABLE_ZEROMQ_TRUE@ @ZEROMQ_CPPFLAGS@ -@ENABLE_RELATIVE_DEVEL_TRUE@@ENABLE_RELATIVE_SYSTEM_FALSE@am__append_2 = \ -@ENABLE_RELATIVE_DEVEL_TRUE@@ENABLE_RELATIVE_SYSTEM_FALSE@ -D_DATABASEDIR_='"${TRI_DATABASE_DIR}"' +@ENABLE_RELATIVE_TRUE@am__append_2 = \ +@ENABLE_RELATIVE_TRUE@ -D_SYSCONFDIR_='"etc/relative"' -@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@am__append_3 = \ -@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@ -D_DATABASEDIR_='"${TRI_DATABASE_DIR}"' \ -@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@ -D_PKGDATADIR_='"${TRI_PKGDATA_DIR}"' \ -@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@ -D_SYSCONFDIR_='"${TRI_SYSCONF_DIR}"' +@ENABLE_RELATIVE_FALSE@am__append_3 = \ +@ENABLE_RELATIVE_FALSE@ -D_SYSCONFDIR_='"${sysconfdir}/${PACKAGE_TARNAME}"' @ENABLE_ZEROMQ_TRUE@am__append_4 = \ @ENABLE_ZEROMQ_TRUE@ @ZEROMQ_LDFLAGS@ @@ -236,9 +210,15 @@ noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) @ENABLE_MRUBY_TRUE@am__append_10 = \ @ENABLE_MRUBY_TRUE@ $(shell find @srcdir@/mr/actions/system -name "*.rb" -print) -DIST_COMMON = $(am__configure_deps) $(srcdir)/Doxygen/Makefile.doxygen \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.files \ - $(srcdir)/Makefile.in $(srcdir)/PerfTests/Makefile.files \ +DIST_COMMON = $(am__configure_deps) \ + $(srcdir)/3rdParty/Makefile.all-in-one-libev \ + $(srcdir)/3rdParty/Makefile.all-in-one-mruby \ + $(srcdir)/3rdParty/Makefile.all-in-one-protobuf \ + $(srcdir)/3rdParty/Makefile.all-in-one-v8 \ + $(srcdir)/3rdParty/Makefile.all-in-one-zeromq \ + $(srcdir)/Documentation/Makefile.doxygen $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.files $(srcdir)/Makefile.in \ + $(srcdir)/PerfTests/Makefile.files \ $(srcdir)/UnitTests/Makefile.files \ $(srcdir)/arangod/Makefile.files \ $(srcdir)/arangoirb/Makefile.files \ @@ -298,9 +278,11 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Doxygen/Makefile.doxygen \ ### @brief CLEANUP ################################################################################ @ENABLE_BISON_TRUE@am__append_22 = $(BISON_FILES) $(BISONXX_FILES) -@ENABLE_ALL_IN_ONE_TRUE@am__append_23 = @LIBEV_LIBS@ @V8_LIBS@ -@ENABLE_MRUBY_TRUE@am__append_24 = @MRUBY_LIBS@ -@ENABLE_ZEROMQ_TRUE@am__append_25 = @ZEROMQ_LIBS@ +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@am__append_23 = @LIBEV_LIBS@ +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@am__append_24 = @PROTOBUF_LIBS@ +@ENABLE_ALL_IN_ONE_V8_TRUE@am__append_25 = @V8_LIBS@ +@ENABLE_MRUBY_TRUE@am__append_26 = @MRUBY_LIBS@ +@ENABLE_ZEROMQ_TRUE@am__append_27 = @ZEROMQ_LIBS@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ @@ -308,7 +290,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/ax_cxx_check_lib.m4 \ $(top_srcdir)/m4/configure.basics \ $(top_srcdir)/m4/configure.static \ - $(top_srcdir)/m4/configure.32bit \ $(top_srcdir)/m4/configure.memory \ $(top_srcdir)/m4/configure.logging \ $(top_srcdir)/m4/configure.largefile \ @@ -321,13 +302,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ $(top_srcdir)/m4/external.ncurses \ $(top_srcdir)/m4/external.readline \ $(top_srcdir)/m4/external.openssl \ - $(top_srcdir)/m4/all-in-one.libev \ - $(top_srcdir)/m4/external.libev $(top_srcdir)/m4/all-in-one.v8 \ - $(top_srcdir)/m4/external.v8 $(top_srcdir)/m4/all-in-one.mruby \ - $(top_srcdir)/m4/all-in-one.protobuf \ - $(top_srcdir)/m4/all-in-one.zeromq \ $(top_srcdir)/m4/all-in-one.boost \ $(top_srcdir)/m4/external.boost \ + $(top_srcdir)/m4/all-in-one.libev \ + $(top_srcdir)/m4/external.libev \ + $(top_srcdir)/m4/all-in-one.mruby \ + $(top_srcdir)/m4/all-in-one.protobuf \ + $(top_srcdir)/m4/external.protobuf \ + $(top_srcdir)/m4/all-in-one.v8 $(top_srcdir)/m4/external.v8 \ + $(top_srcdir)/m4/all-in-one.zeromq \ $(top_srcdir)/m4/configure.information \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -337,7 +320,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config/config.h \ $(top_builddir)/lib/BasicsC/local-configuration.h -CONFIG_CLEAN_FILES = Doxygen/arango.template +CONFIG_CLEAN_FILES = Documentation/arango.template CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) AR = ar @@ -755,6 +738,7 @@ bin_arangod_DEPENDENCIES = lib/libarango_fe.a lib/libarango_v8.a \ lib/libarango.a $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_1) am_bin_arangoimp_OBJECTS = \ + arangosh/ArangoShell/bin_arangoimp-ArangoClient.$(OBJEXT) \ arangosh/V8Client/bin_arangoimp-ImportHelper.$(OBJEXT) \ arangosh/V8Client/bin_arangoimp-V8ClientConnection.$(OBJEXT) \ arangosh/V8Client/bin_arangoimp-arangoimp.$(OBJEXT) @@ -771,6 +755,7 @@ bin_arangoirb_OBJECTS = $(am_bin_arangoirb_OBJECTS) @ENABLE_MRUBY_TRUE@ lib/libarango_client.a lib/libarango.a \ @ENABLE_MRUBY_TRUE@ $(am__DEPENDENCIES_2) am_bin_arangosh_OBJECTS = \ + arangosh/ArangoShell/bin_arangosh-ArangoClient.$(OBJEXT) \ arangosh/V8Client/bin_arangosh-ImportHelper.$(OBJEXT) \ arangosh/V8Client/bin_arangosh-V8ClientConnection.$(OBJEXT) \ arangosh/V8Client/bin_arangosh-arangosh.$(OBJEXT) @@ -956,6 +941,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PROTOBUF_CPPFLAGS = @PROTOBUF_CPPFLAGS@ PROTOBUF_LDFLAGS = @PROTOBUF_LDFLAGS@ PROTOBUF_LIBS = @PROTOBUF_LIBS@ +PROTOBUF_PROTOC = @PROTOBUF_PROTOC@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ @@ -1031,17 +1017,12 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I m4 - -################################################################################ -### @brief source to build before compile -################################################################################ BUILT_SOURCES = build.h Installation/arangod.conf $(JAVASCRIPT_HEADER) \ $(JAVASCRIPT_BROWSER) $(MRUBY_HEADER) $(am__append_16) \ - $(am__append_17) Doxygen/.setup-directories \ - .setup-js-directories $(am__append_19) $(am__append_21) \ - @PROTOBUF_LIBS@ $(PROTOBUF_FILES) $(am__append_23) \ - $(am__append_24) $(am__append_25) + Documentation/.setup-directories .setup-js-directories \ + $(am__append_17) $(am__append_19) $(am__append_21) \ + $(PROTOBUF_FILES) $(am__append_23) $(am__append_24) \ + $(am__append_25) $(am__append_26) $(am__append_27) ################################################################################ ### @brief files to cleanup @@ -1121,6 +1102,11 @@ BISONXX_FILES = lib/JsonParserX/JsonParserX.cpp ################################################################################ PROTOBUF_FILES = lib/ProtocolBuffers/arangodb.pb.cpp +################################################################################ +### @brief m4 directory +################################################################################ +ACLOCAL_AMFLAGS = -I m4 + ################################################################################ ### @brief preprocessor flags ################################################################################ @@ -1129,19 +1115,6 @@ AM_CPPFLAGS = -I@top_srcdir@/lib -I@top_builddir@/lib @BOOST_CPPFLAGS@ \ @OPENSSL_CPPFLAGS@ @READLINE_CPPFLAGS@ @PROTOBUF_CPPFLAGS@ \ @V8_CPPFLAGS@ $(am__append_1) $(am__append_2) $(am__append_3) \ $(am__append_5) -@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_LOG_DIR = $(localstatedir)/log/$(PACKAGE_TARNAME) -@ENABLE_RELATIVE_DEVEL_TRUE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_LOG_DIR = /tmp -@ENABLE_RELATIVE_SYSTEM_TRUE@TRI_LOG_DIR = $(prefix)/var/log/$(PACKAGE_TARNAME) -@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_PKGDATA_DIR = ${pkgdatadir} -@ENABLE_RELATIVE_DEVEL_TRUE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_PKGDATA_DIR = . -@ENABLE_RELATIVE_SYSTEM_TRUE@TRI_PKGDATA_DIR = $(prefix)/share/$(PACKAGE_TARNAME) -@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_SBIN_DIR = ${sbindir} -@ENABLE_RELATIVE_DEVEL_TRUE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_SBIN_DIR = bin -@ENABLE_RELATIVE_SYSTEM_TRUE@TRI_SBIN_DIR = ${prefix}/sbin -@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_SYSCONF_DIR = $(sysconfdir)/$(PACKAGE_TARNAME) -@ENABLE_RELATIVE_SYSTEM_TRUE@TRI_SYSCONF_DIR = ${prefix}/etc/$(PACKAGE_TARNAME) -@ENABLE_RELATIVE_DEVEL_FALSE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_DATABASE_DIR = $(localstatedir)/$(PACKAGE_TARNAME) -@ENABLE_RELATIVE_DEVEL_TRUE@@ENABLE_RELATIVE_SYSTEM_FALSE@TRI_DATABASE_DIR = $(localstatedir)/$(PACKAGE_TARNAME) ################################################################################ ### @brief linker flags @@ -1502,6 +1475,7 @@ bin_arangosh_LDADD = \ @V8_LIBS@ bin_arangosh_SOURCES = \ + arangosh/ArangoShell/ArangoClient.cpp \ arangosh/V8Client/ImportHelper.cpp \ arangosh/V8Client/V8ClientConnection.cpp \ arangosh/V8Client/arangosh.cpp @@ -1522,6 +1496,7 @@ bin_arangoimp_LDADD = \ @V8_LIBS@ bin_arangoimp_SOURCES = \ + arangosh/ArangoShell/ArangoClient.cpp \ arangosh/V8Client/ImportHelper.cpp \ arangosh/V8Client/V8ClientConnection.cpp \ arangosh/V8Client/arangoimp.cpp @@ -1583,13 +1558,31 @@ PIDFILE := /tmp/arango.$(PID).pid VOCDIR := /tmp/vocdir.$(PID) VOCPORT := $(shell printf "3%04d" `expr $(PID) % 10000`) VOCHOST := 127.0.0.1 -SERVER_START := -SERVER_OPT := --configuration none --javascript.startup-directory @top_srcdir@/js --javascript.modules-path @top_srcdir@/js/server/modules:@top_srcdir@/js/common/modules --javascript.action-directory @top_srcdir@/js/actions/system --database.maximal-journal-size 1048576 --javascript.gc-interval 1 --server.threads 4 $(SERVER_START) -CLIENT_OPT := --javascript.startup-directory @top_srcdir@/js --javascript.modules-path @top_srcdir@/js/client/modules:@top_srcdir@/js/common/modules --no-colors --quiet STARTFILE := $(VOCDIR)/startup CURL := curl CURL_OPT := --basic --user "$(USERNAME):$(PASSWORD)" -CERT_FILE := @srcdir@/UnitTests/server.pem +CERT_FILE := @top_srcdir@/UnitTests/server.pem +SERVER_START := +SERVER_OPT := \ + --configuration none \ + --database.maximal-journal-size 1048576 \ + --javascript.action-directory @top_srcdir@/js/actions/system \ + --javascript.gc-interval 1 \ + --javascript.modules-path @top_srcdir@/js/server/modules:@top_srcdir@/js/common/modules \ + --javascript.startup-directory @top_srcdir@/js \ + --ruby.action-directory @top_srcdir@/mr/actions/system \ + --ruby.modules-path @top_srcdir@/mr/server/modules:@top_srcdir@/mr/common/modules \ + --server.threads 4 \ + --server.admin-directory ./html/admin \ + $(SERVER_START) + +CLIENT_OPT := \ + --configuration none \ + --javascript.startup-directory @top_srcdir@/js \ + --javascript.modules-path @top_srcdir@/js/client/modules:@top_srcdir@/js/common/modules \ + --no-colors \ + --quiet + @ENABLE_BOOST_TEST_TRUE@UnitTests_basics_suite_LDADD = -L@top_builddir@/lib -larango -lboost_unit_test_framework @ENABLE_BOOST_TEST_TRUE@UnitTests_basics_suite_DEPENDENCIES = @top_builddir@/lib/libarango.a @ENABLE_BOOST_TEST_TRUE@UnitTests_basics_suite_SOURCES = \ @@ -1618,75 +1611,75 @@ CERT_FILE := @srcdir@/UnitTests/server.pem ################################################################################ ################################################################################ -SHELL_COMMON = @srcdir@/js/common/tests/shell-document.js \ - @srcdir@/js/common/tests/shell-edge.js \ - @srcdir@/js/common/tests/shell-compactor.js \ - @srcdir@/js/common/tests/shell-collection.js \ - @srcdir@/js/common/tests/shell-simple-query.js \ - @srcdir@/js/common/tests/shell-index.js \ - @srcdir@/js/common/tests/shell-index-geo.js \ - @srcdir@/js/common/tests/shell-cap-constraint.js \ - @srcdir@/js/common/tests/shell-unique-constraint.js \ - @srcdir@/js/common/tests/shell-hash-index.js +SHELL_COMMON = @top_srcdir@/js/common/tests/shell-document.js \ + @top_srcdir@/js/common/tests/shell-edge.js \ + @top_srcdir@/js/common/tests/shell-compactor.js \ + @top_srcdir@/js/common/tests/shell-collection.js \ + @top_srcdir@/js/common/tests/shell-simple-query.js \ + @top_srcdir@/js/common/tests/shell-index.js \ + @top_srcdir@/js/common/tests/shell-index-geo.js \ + @top_srcdir@/js/common/tests/shell-cap-constraint.js \ + @top_srcdir@/js/common/tests/shell-unique-constraint.js \ + @top_srcdir@/js/common/tests/shell-hash-index.js SHELL_SERVER = $(SHELL_COMMON) UNITTESTS_SERVER = $(addprefix --javascript.unit-tests ,$(SHELL_SERVER)) ################################################################################ ################################################################################ -SHELL_SERVER_AHUACATL = @srcdir@/js/server/tests/ahuacatl-ranges.js \ - @srcdir@/js/server/tests/ahuacatl-queries-optimiser.js \ - @srcdir@/js/server/tests/ahuacatl-escaping.js \ - @srcdir@/js/server/tests/ahuacatl-functions.js \ - @srcdir@/js/server/tests/ahuacatl-variables.js \ - @srcdir@/js/server/tests/ahuacatl-bind.js \ - @srcdir@/js/server/tests/ahuacatl-complex.js \ - @srcdir@/js/server/tests/ahuacatl-logical.js \ - @srcdir@/js/server/tests/ahuacatl-arithmetic.js \ - @srcdir@/js/server/tests/ahuacatl-relational.js \ - @srcdir@/js/server/tests/ahuacatl-ternary.js \ - @srcdir@/js/server/tests/ahuacatl-parse.js \ - @srcdir@/js/server/tests/ahuacatl-hash.js \ - @srcdir@/js/server/tests/ahuacatl-skiplist.js \ - @srcdir@/js/server/tests/ahuacatl-refaccess-variable.js \ - @srcdir@/js/server/tests/ahuacatl-refaccess-attribute.js \ - @srcdir@/js/server/tests/ahuacatl-skiplist.js \ - @srcdir@/js/server/tests/ahuacatl-queries-simple.js \ - @srcdir@/js/server/tests/ahuacatl-queries-variables.js \ - @srcdir@/js/server/tests/ahuacatl-queries-geo.js \ - @srcdir@/js/server/tests/ahuacatl-queries-collection.js \ - @srcdir@/js/server/tests/ahuacatl-queries-noncollection.js \ - @srcdir@/js/server/tests/ahuacatl-operators.js +SHELL_SERVER_AHUACATL = @top_srcdir@/js/server/tests/ahuacatl-ranges.js \ + @top_srcdir@/js/server/tests/ahuacatl-queries-optimiser.js \ + @top_srcdir@/js/server/tests/ahuacatl-escaping.js \ + @top_srcdir@/js/server/tests/ahuacatl-functions.js \ + @top_srcdir@/js/server/tests/ahuacatl-variables.js \ + @top_srcdir@/js/server/tests/ahuacatl-bind.js \ + @top_srcdir@/js/server/tests/ahuacatl-complex.js \ + @top_srcdir@/js/server/tests/ahuacatl-logical.js \ + @top_srcdir@/js/server/tests/ahuacatl-arithmetic.js \ + @top_srcdir@/js/server/tests/ahuacatl-relational.js \ + @top_srcdir@/js/server/tests/ahuacatl-ternary.js \ + @top_srcdir@/js/server/tests/ahuacatl-parse.js \ + @top_srcdir@/js/server/tests/ahuacatl-hash.js \ + @top_srcdir@/js/server/tests/ahuacatl-skiplist.js \ + @top_srcdir@/js/server/tests/ahuacatl-refaccess-variable.js \ + @top_srcdir@/js/server/tests/ahuacatl-refaccess-attribute.js \ + @top_srcdir@/js/server/tests/ahuacatl-skiplist.js \ + @top_srcdir@/js/server/tests/ahuacatl-queries-simple.js \ + @top_srcdir@/js/server/tests/ahuacatl-queries-variables.js \ + @top_srcdir@/js/server/tests/ahuacatl-queries-geo.js \ + @top_srcdir@/js/server/tests/ahuacatl-queries-collection.js \ + @top_srcdir@/js/server/tests/ahuacatl-queries-noncollection.js \ + @top_srcdir@/js/server/tests/ahuacatl-operators.js SHELL_SERVER_AHUACATL_EXTENDED = \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-1.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-2.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-3.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-4.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-5.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-6.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-7.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-8.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-9.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-10.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-11.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-12.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-13.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-14.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-15.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-16.js + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-1.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-2.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-3.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-4.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-5.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-6.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-7.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-8.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-9.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-10.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-11.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-12.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-13.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-14.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-15.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-16.js UNITTESTS_SERVER_AHUACATL = $(addprefix --javascript.unit-tests ,$(SHELL_SERVER_AHUACATL)) UNITTESTS_SERVER_AHUACATL_EXTENDED = $(addprefix --javascript.unit-tests ,$(SHELL_SERVER_AHUACATL_EXTENDED)) ################################################################################ ################################################################################ -SHELL_CLIENT = $(SHELL_COMMON) js/client/tests/client.js +SHELL_CLIENT = $(SHELL_COMMON) @top_srcdir@/js/client/tests/client.js UNITTESTS_CLIENT = $(addprefix --javascript.unit-tests ,$(SHELL_CLIENT)) ################################################################################ ################################################################################ -BITARRAY_COMMON = @srcdir@/js/common/tests/shell-bitarray-index.js +BITARRAY_COMMON = @top_srcdir@/js/common/tests/shell-bitarray-index.js UNITTESTS_SERVER_BITARRAY = $(addprefix --javascript.unit-tests ,$(BITARRAY_COMMON)) ################################################################################ @@ -1709,13 +1702,7 @@ bin_arango_upgrade_SOURCES = # exclude arango skrips from sources list bin_arango_dfdb_SOURCES = -PROTOBUFDIR = @abs_top_srcdir@/3rdParty/protobuf-2.4.1/BUILD -@ENABLE_32BIT_TRUE@@ENABLE_ALL_IN_ONE_TRUE@LIBEV_BUILD_VERSION = ARCH.ia32 -@ENABLE_64BIT_TRUE@@ENABLE_ALL_IN_ONE_TRUE@LIBEV_BUILD_VERSION = ARCH.x64 -@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_FORCE_32BIT_FALSE@LIBEV_BUILD_CFLAGS_X = -O2 -g -@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_FORCE_32BIT_TRUE@LIBEV_BUILD_CFLAGS_X = -m32 -O2 -g -@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_FORCE_32BIT_FALSE@LIBEV_BUILD_LDFLAGS_X = -@ENABLE_ALL_IN_ONE_TRUE@@ENABLE_FORCE_32BIT_TRUE@LIBEV_BUILD_LDFLAGS_X = -m32 +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@PROTOBUFDIR = @abs_top_srcdir@/3rdParty/protobuf-2.4.1/BUILD @ENABLE_ZEROMQ_TRUE@ZMQDIR = @abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1724,7 +1711,7 @@ all: $(BUILT_SOURCES) .SUFFIXES: .c .cpp .o .obj am--refresh: @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makefile.files $(srcdir)/lib/Makefile.files $(srcdir)/arangod/Makefile.files $(srcdir)/arangosh/Makefile.files $(srcdir)/arangoirb/Makefile.files $(srcdir)/PerfTests/Makefile.files $(srcdir)/UnitTests/Makefile.files $(srcdir)/m4/Makefile.mruby $(srcdir)/Doxygen/Makefile.doxygen $(srcdir)/m4/Makefile.javascript $(srcdir)/m4/Makefile.flex $(srcdir)/m4/Makefile.bison $(srcdir)/m4/Makefile.all-in-one-protobuf $(srcdir)/m4/Makefile.protobuf $(srcdir)/m4/Makefile.all-in-one-libev $(srcdir)/m4/Makefile.all-in-one-v8 $(srcdir)/m4/Makefile.all-in-one-mruby $(srcdir)/m4/Makefile.all-in-one-zeromq $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makefile.files $(srcdir)/lib/Makefile.files $(srcdir)/arangod/Makefile.files $(srcdir)/arangosh/Makefile.files $(srcdir)/arangoirb/Makefile.files $(srcdir)/PerfTests/Makefile.files $(srcdir)/UnitTests/Makefile.files $(srcdir)/Documentation/Makefile.doxygen $(srcdir)/js/Makefile.javascript $(srcdir)/mr/Makefile.mruby $(srcdir)/lib/Makefile.flex $(srcdir)/lib/Makefile.bison $(srcdir)/lib/Makefile.protobuf $(srcdir)/3rdParty/Makefile.all-in-one-libev $(srcdir)/3rdParty/Makefile.all-in-one-protobuf $(srcdir)/3rdParty/Makefile.all-in-one-v8 $(srcdir)/3rdParty/Makefile.all-in-one-mruby $(srcdir)/3rdParty/Makefile.all-in-one-zeromq $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1783,7 +1770,7 @@ lib/BasicsC/stamp-h2: $(top_srcdir)/lib/BasicsC/local-configuration.h.in $(top_b distclean-hdr: -rm -f config/config.h config/stamp-h1 lib/BasicsC/local-configuration.h lib/BasicsC/stamp-h2 -Doxygen/arango.template: $(top_builddir)/config.status $(top_srcdir)/Doxygen/arango.template.in +Documentation/arango.template: $(top_builddir)/config.status $(top_srcdir)/Documentation/arango.template.in cd $(top_builddir) && $(SHELL) ./config.status $@ clean-noinstLIBRARIES: @@ -2762,6 +2749,15 @@ arangod/MRServer/bin_arangod-mr-actions.$(OBJEXT): \ bin/arangod$(EXEEXT): $(bin_arangod_OBJECTS) $(bin_arangod_DEPENDENCIES) bin/$(am__dirstamp) @rm -f bin/arangod$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(bin_arangod_OBJECTS) $(bin_arangod_LDADD) $(LIBS) +arangosh/ArangoShell/$(am__dirstamp): + @$(MKDIR_P) arangosh/ArangoShell + @: > arangosh/ArangoShell/$(am__dirstamp) +arangosh/ArangoShell/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) arangosh/ArangoShell/$(DEPDIR) + @: > arangosh/ArangoShell/$(DEPDIR)/$(am__dirstamp) +arangosh/ArangoShell/bin_arangoimp-ArangoClient.$(OBJEXT): \ + arangosh/ArangoShell/$(am__dirstamp) \ + arangosh/ArangoShell/$(DEPDIR)/$(am__dirstamp) arangosh/V8Client/$(am__dirstamp): @$(MKDIR_P) arangosh/V8Client @: > arangosh/V8Client/$(am__dirstamp) @@ -2795,6 +2791,9 @@ arangoirb/MRClient/bin_arangoirb-arangoirb.$(OBJEXT): \ bin/arangoirb$(EXEEXT): $(bin_arangoirb_OBJECTS) $(bin_arangoirb_DEPENDENCIES) bin/$(am__dirstamp) @rm -f bin/arangoirb$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(bin_arangoirb_OBJECTS) $(bin_arangoirb_LDADD) $(LIBS) +arangosh/ArangoShell/bin_arangosh-ArangoClient.$(OBJEXT): \ + arangosh/ArangoShell/$(am__dirstamp) \ + arangosh/ArangoShell/$(DEPDIR)/$(am__dirstamp) arangosh/V8Client/bin_arangosh-ImportHelper.$(OBJEXT): \ arangosh/V8Client/$(am__dirstamp) \ arangosh/V8Client/$(DEPDIR)/$(am__dirstamp) @@ -2918,6 +2917,8 @@ mostlyclean-compile: -rm -f arangod/VocBase/bin_arangod-vocbase.$(OBJEXT) -rm -f arangoirb/MRClient/bin_arangoirb-MRubyClientConnection.$(OBJEXT) -rm -f arangoirb/MRClient/bin_arangoirb-arangoirb.$(OBJEXT) + -rm -f arangosh/ArangoShell/bin_arangoimp-ArangoClient.$(OBJEXT) + -rm -f arangosh/ArangoShell/bin_arangosh-ArangoClient.$(OBJEXT) -rm -f arangosh/V8Client/bin_arangoimp-ImportHelper.$(OBJEXT) -rm -f arangosh/V8Client/bin_arangoimp-V8ClientConnection.$(OBJEXT) -rm -f arangosh/V8Client/bin_arangoimp-arangoimp.$(OBJEXT) @@ -3180,6 +3181,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@arangod/VocBase/$(DEPDIR)/bin_arangod-vocbase.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@arangoirb/MRClient/$(DEPDIR)/bin_arangoirb-MRubyClientConnection.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@arangoirb/MRClient/$(DEPDIR)/bin_arangoirb-arangoirb.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@arangosh/ArangoShell/$(DEPDIR)/bin_arangoimp-ArangoClient.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@arangosh/ArangoShell/$(DEPDIR)/bin_arangosh-ArangoClient.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@arangosh/V8Client/$(DEPDIR)/bin_arangoimp-ImportHelper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@arangosh/V8Client/$(DEPDIR)/bin_arangoimp-V8ClientConnection.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@arangosh/V8Client/$(DEPDIR)/bin_arangoimp-arangoimp.Po@am__quote@ @@ -4537,9 +4540,6 @@ arangod/MRServer/bin_arangod-mr-actions.obj: arangod/MRServer/mr-actions.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='arangod/MRServer/mr-actions.cpp' object='arangod/MRServer/bin_arangod-mr-actions.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangod_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o arangod/MRServer/bin_arangod-mr-actions.obj `if test -f 'arangod/MRServer/mr-actions.cpp'; then $(CYGPATH_W) 'arangod/MRServer/mr-actions.cpp'; else $(CYGPATH_W) '$(srcdir)/arangod/MRServer/mr-actions.cpp'; fi` - -arangosh/V8Client/bin_arangoimp-ImportHelper.o: arangosh/V8Client/ImportHelper.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangoimp_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT arangosh/V8Client/bin_arangoimp-ImportHelper.o -MD -MP -MF arangosh/V8Client/$(DEPDIR)/bin_arangoimp-ImportHelper.Tpo -c -o arangosh/V8Client/bin_arangoimp-ImportHelper.o `test -f 'arangosh/V8Client/ImportHelper.cpp' || echo '$(srcdir)/'`arangosh/V8Client/ImportHelper.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) arangosh/V8Client/$(DEPDIR)/bin_arangoimp-ImportHelper.Tpo arangosh/V8Client/$(DEPDIR)/bin_arangoimp-ImportHelper.Po @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='arangosh/V8Client/ImportHelper.cpp' object='arangosh/V8Client/bin_arangoimp-ImportHelper.o' libtool=no @AMDEPBACKSLASH@ @@ -4615,8 +4615,6 @@ arangoirb/MRClient/bin_arangoirb-arangoirb.obj: arangoirb/MRClient/arangoirb.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) arangoirb/MRClient/$(DEPDIR)/bin_arangoirb-arangoirb.Tpo arangoirb/MRClient/$(DEPDIR)/bin_arangoirb-arangoirb.Po @am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='arangoirb/MRClient/arangoirb.cpp' object='arangoirb/MRClient/bin_arangoirb-arangoirb.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangoirb_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o arangoirb/MRClient/bin_arangoirb-arangoirb.obj `if test -f 'arangoirb/MRClient/arangoirb.cpp'; then $(CYGPATH_W) 'arangoirb/MRClient/arangoirb.cpp'; else $(CYGPATH_W) '$(srcdir)/arangoirb/MRClient/arangoirb.cpp'; fi` arangosh/V8Client/bin_arangosh-ImportHelper.o: arangosh/V8Client/ImportHelper.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bin_arangosh_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT arangosh/V8Client/bin_arangosh-ImportHelper.o -MD -MP -MF arangosh/V8Client/$(DEPDIR)/bin_arangosh-ImportHelper.Tpo -c -o arangosh/V8Client/bin_arangosh-ImportHelper.o `test -f 'arangosh/V8Client/ImportHelper.cpp' || echo '$(srcdir)/'`arangosh/V8Client/ImportHelper.cpp @@ -5026,6 +5024,8 @@ distclean-generic: -rm -f arangod/VocBase/$(am__dirstamp) -rm -f arangoirb/MRClient/$(DEPDIR)/$(am__dirstamp) -rm -f arangoirb/MRClient/$(am__dirstamp) + -rm -f arangosh/ArangoShell/$(DEPDIR)/$(am__dirstamp) + -rm -f arangosh/ArangoShell/$(am__dirstamp) -rm -f arangosh/V8Client/$(DEPDIR)/$(am__dirstamp) -rm -f arangosh/V8Client/$(am__dirstamp) -rm -f bin/$(am__dirstamp) @@ -5090,7 +5090,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-local \ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf PerfTests/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/V8Client/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/JsonParserX/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/ProtocolBuffers/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/UserManager/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR) lib/ZeroMQ/$(DEPDIR) + -rm -rf PerfTests/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/ArangoShell/$(DEPDIR) arangosh/V8Client/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/JsonParserX/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/ProtocolBuffers/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/UserManager/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR) lib/ZeroMQ/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-tags @@ -5139,7 +5139,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf PerfTests/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/V8Client/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/JsonParserX/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/ProtocolBuffers/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/UserManager/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR) lib/ZeroMQ/$(DEPDIR) + -rm -rf PerfTests/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Cambridge/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) arangod/Actions/$(DEPDIR) arangod/Ahuacatl/$(DEPDIR) arangod/BitIndexes/$(DEPDIR) arangod/GeoIndex/$(DEPDIR) arangod/HashIndex/$(DEPDIR) arangod/IndexIterators/$(DEPDIR) arangod/IndexOperators/$(DEPDIR) arangod/MRServer/$(DEPDIR) arangod/PriorityQueue/$(DEPDIR) arangod/RestHandler/$(DEPDIR) arangod/RestServer/$(DEPDIR) arangod/SkipLists/$(DEPDIR) arangod/V8Server/$(DEPDIR) arangod/VocBase/$(DEPDIR) arangoirb/MRClient/$(DEPDIR) arangosh/ArangoShell/$(DEPDIR) arangosh/V8Client/$(DEPDIR) lib/Admin/$(DEPDIR) lib/ApplicationServer/$(DEPDIR) lib/Basics/$(DEPDIR) lib/BasicsC/$(DEPDIR) lib/Dispatcher/$(DEPDIR) lib/HttpServer/$(DEPDIR) lib/JsonParser/$(DEPDIR) lib/JsonParserX/$(DEPDIR) lib/Logger/$(DEPDIR) lib/MRuby/$(DEPDIR) lib/ProgramOptions/$(DEPDIR) lib/ProtocolBuffers/$(DEPDIR) lib/Rest/$(DEPDIR) lib/ResultGenerator/$(DEPDIR) lib/Scheduler/$(DEPDIR) lib/ShapedJson/$(DEPDIR) lib/SimpleHttpClient/$(DEPDIR) lib/Statistics/$(DEPDIR) lib/UserManager/$(DEPDIR) lib/Utilities/$(DEPDIR) lib/V8/$(DEPDIR) lib/Variant/$(DEPDIR) lib/ZeroMQ/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -5207,7 +5207,7 @@ build.h: configure.ac ### @brief local modifications ################################################################################ --include Makefile.local +-include Installation/Makefile.local ################################################################################ ################################################################################ @@ -5395,7 +5395,7 @@ unittests-http-server: @echo "================================================================================" @echo - cd @srcdir@/UnitTests/HttpInterface && ARANGO_SERVER="$(VOCHOST):$(VOCPORT)" ARANGO_SSL=0 ARANGO_USER="$(USERNAME)" ARANGO_PASSWORD="$(PASSWORD)" ./run-tests || test "x$(FORCE)" == "x1" + cd @top_srcdir@/UnitTests/HttpInterface && ARANGO_SERVER="$(VOCHOST):$(VOCPORT)" ARANGO_SSL=0 ARANGO_USER="$(USERNAME)" ARANGO_PASSWORD="$(PASSWORD)" ./run-tests || test "x$(FORCE)" == "x1" kill `cat $(PIDFILE)` @@ -5419,7 +5419,7 @@ unittests-ssl-server: @echo "================================================================================" @echo - cd @srcdir@/UnitTests/HttpInterface && ARANGO_SERVER="$(VOCHOST):$(VOCPORT)" ARANGO_SSL=1 ARANGO_USER="$(USERNAME)" ARANGO_PASSWORD="$(PASSWORD)" ./run-tests || test "x$(FORCE)" == "x1" + cd @top_srcdir@/UnitTests/HttpInterface && ARANGO_SERVER="$(VOCHOST):$(VOCPORT)" ARANGO_SSL=1 ARANGO_USER="$(USERNAME)" ARANGO_PASSWORD="$(PASSWORD)" ./run-tests || test "x$(FORCE)" == "x1" kill `cat $(PIDFILE)` @@ -5479,94 +5479,38 @@ clean-local: built-sources: build.h errorfiles $(JAVASCRIPT_HEADER) -bin/arango-password: bin/arango-password.in -@ENABLE_RELATIVE_DEVEL_TRUE@ sed \ -@ENABLE_RELATIVE_DEVEL_TRUE@ -e 's%@SBINDIR@%bin%g' \ -@ENABLE_RELATIVE_DEVEL_TRUE@ -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_TRUE@ -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_TRUE@ $< > $@ -@ENABLE_RELATIVE_DEVEL_TRUE@ chmod 755 $@ -@ENABLE_RELATIVE_DEVEL_FALSE@ sed \ -@ENABLE_RELATIVE_DEVEL_FALSE@ -e 's%@SBINDIR@%${TRI_SBIN_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_FALSE@ -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_FALSE@ -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_FALSE@ $< > $@ -@ENABLE_RELATIVE_DEVEL_FALSE@ chmod 755 $@ +.PHONY: Documentation/js Documentation/js/system Documentation/js/modules -bin/arango-upgrade: bin/arango-upgrade.in -@ENABLE_RELATIVE_DEVEL_TRUE@ sed \ -@ENABLE_RELATIVE_DEVEL_TRUE@ -e 's%@SBINDIR@%bin%g' \ -@ENABLE_RELATIVE_DEVEL_TRUE@ -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_TRUE@ -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_TRUE@ $< > $@ -@ENABLE_RELATIVE_DEVEL_TRUE@ chmod 755 $@ -@ENABLE_RELATIVE_DEVEL_FALSE@ sed \ -@ENABLE_RELATIVE_DEVEL_FALSE@ -e 's%@SBINDIR@%${TRI_SBIN_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_FALSE@ -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_FALSE@ -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_FALSE@ $< > $@ -@ENABLE_RELATIVE_DEVEL_FALSE@ chmod 755 $@ - -bin/arango-dfdb: bin/arango-dfdb.in -@ENABLE_RELATIVE_DEVEL_TRUE@ sed \ -@ENABLE_RELATIVE_DEVEL_TRUE@ -e 's%@SBINDIR@%bin%g' \ -@ENABLE_RELATIVE_DEVEL_TRUE@ -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_TRUE@ -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_TRUE@ $< > $@ -@ENABLE_RELATIVE_DEVEL_TRUE@ chmod 755 $@ -@ENABLE_RELATIVE_DEVEL_FALSE@ sed \ -@ENABLE_RELATIVE_DEVEL_FALSE@ -e 's%@SBINDIR@%${TRI_SBIN_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_FALSE@ -e 's%@DATABASE@%${TRI_DATABASE_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_FALSE@ -e 's%@STATICFILES@%${TRI_PKGDATA_DIR}%g' \ -@ENABLE_RELATIVE_DEVEL_FALSE@ $< > $@ -@ENABLE_RELATIVE_DEVEL_FALSE@ chmod 755 $@ - -@ENABLE_MRUBY_TRUE@.setup-mr-directories: -@ENABLE_MRUBY_TRUE@ @test -d mr || mkdir mr -@ENABLE_MRUBY_TRUE@ @test -d mr/common/bootstrap || mkdir mr/common/bootstrap -@ENABLE_MRUBY_TRUE@ @touch $@ - -@ENABLE_MRUBY_TRUE@mr/common/bootstrap/mr-%.h: @srcdir@/mr/common/bootstrap/%.rb .setup-mr-directories -@ENABLE_MRUBY_TRUE@ @top_srcdir@/config/mr2c.sh $< > $@ - -@ENABLE_MRUBY_TRUE@mr/server/mr-%.h: @srcdir@/mr/server/%.rb .setup-mr-directories -@ENABLE_MRUBY_TRUE@ @top_srcdir@/config/mr2c.sh $< > $@ - -################################################################################ -################################################################################ - -.PHONY: Doxygen/js Doxygen/js/system Doxygen/js/modules - -Doxygen/.setup-directories: - @test -d Doxygen/js || mkdir Doxygen/js - @test -d Doxygen/js/actions || mkdir Doxygen/js/actions - @test -d Doxygen/js/actions/system || mkdir Doxygen/js/actions/system - @test -d Doxygen/js/common || mkdir Doxygen/js/common - @test -d Doxygen/js/common/bootstrap || mkdir Doxygen/js/common/bootstrap - @test -d Doxygen/js/common/modules || mkdir Doxygen/js/common/modules - @test -d Doxygen/js/server || mkdir Doxygen/js/server - @test -d Doxygen/js/server/modules || mkdir Doxygen/js/server/modules - @test -d Doxygen/js/client || mkdir Doxygen/js/client - @test -d Doxygen/web || mkdir Doxygen/web +Documentation/.setup-directories: + @test -d Documentation/js || mkdir Documentation/js + @test -d Documentation/js/actions || mkdir Documentation/js/actions + @test -d Documentation/js/actions/system || mkdir Documentation/js/actions/system + @test -d Documentation/js/common || mkdir Documentation/js/common + @test -d Documentation/js/common/bootstrap || mkdir Documentation/js/common/bootstrap + @test -d Documentation/js/common/modules || mkdir Documentation/js/common/modules + @test -d Documentation/js/server || mkdir Documentation/js/server + @test -d Documentation/js/server/modules || mkdir Documentation/js/server/modules + @test -d Documentation/js/client || mkdir Documentation/js/client + @test -d Documentation/web || mkdir Documentation/web @touch $@ -Doxygen/js/actions/system/%.c: @srcdir@/js/actions/system/%.js Doxygen/.setup-directories - @python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@ +Documentation/js/actions/system/%.c: @srcdir@/js/actions/system/%.js Documentation/.setup-directories + @python @top_srcdir@/Documentation/Scripts/js2doxy.py $< > $@ -Doxygen/js/common/bootstrap/%.c: @srcdir@/js/common/bootstrap/%.js Doxygen/.setup-directories - @python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@ +Documentation/js/common/bootstrap/%.c: @srcdir@/js/common/bootstrap/%.js Documentation/.setup-directories + @python @top_srcdir@/Documentation/Scripts/js2doxy.py $< > $@ -Doxygen/js/common/modules/%.c: @srcdir@/js/common/modules/%.js Doxygen/.setup-directories - @python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@ +Documentation/js/common/modules/%.c: @srcdir@/js/common/modules/%.js Documentation/.setup-directories + @python @top_srcdir@/Documentation/Scripts/js2doxy.py $< > $@ -Doxygen/js/server/%.c: @srcdir@/js/server/%.js Doxygen/.setup-directories - @python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@ +Documentation/js/server/%.c: @srcdir@/js/server/%.js Documentation/.setup-directories + @python @top_srcdir@/Documentation/Scripts/js2doxy.py $< > $@ -Doxygen/js/server/modules/%.c: @srcdir@/js/server/modules/%.js Doxygen/.setup-directories - @python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@ +Documentation/js/server/modules/%.c: @srcdir@/js/server/modules/%.js Documentation/.setup-directories + @python @top_srcdir@/Documentation/Scripts/js2doxy.py $< > $@ -Doxygen/xml/%.md: Doxygen/xml/%.xml - @python @top_srcdir@/Doxygen/Scripts/xml2md.py $< > $@ +Documentation/xml/%.md: Documentation/xml/%.xml + @python @top_srcdir@/Documentation/Scripts/xml2md.py $< > $@ ################################################################################ ### @brief doxygen @@ -5574,13 +5518,13 @@ Doxygen/xml/%.md: Doxygen/xml/%.xml .PHONY: doxygen -Doxygen/arango-html.doxy: Doxygen/arango.template +Documentation/arango-html.doxy: Documentation/arango.template sed -e 's:GENERATE_HTML *= *NO:GENERATE_HTML = YES:' -e 's:ENABLED_SECTIONS *=:ENABLED_SECTIONS = HTML:' < $< > $@ $(MAKE) lib/BasicsC/voc-errors.h -doxygen: Doxygen/arango-html.doxy $(DOXYGEN) - doxygen Doxygen/arango-html.doxy > /dev/null - @for w in $(WIKI); do @top_srcdir@/Doxygen/Scripts/html2html.sh Doxygen/html/$$w.html Doxygen/web/$$w.html; done +doxygen: Documentation/arango-html.doxy $(DOXYGEN) + doxygen Documentation/arango-html.doxy > /dev/null + @for w in $(WIKI); do @top_srcdir@/Documentation/Scripts/html2html.sh Documentation/html/$$w.html Documentation/web/$$w.html; done ################################################################################ ### @brief wiki @@ -5588,17 +5532,17 @@ doxygen: Doxygen/arango-html.doxy $(DOXYGEN) .PHONY: wiki wiki2 -Doxygen/arango-xml.doxy: Doxygen/arango.template +Documentation/arango-xml.doxy: Documentation/arango.template sed -e 's:GENERATE_XML *= *NO:GENERATE_XML = YES:' -e 's:ENABLED_SECTIONS *=:ENABLED_SECTIONS = XML:' < $< > $@ $(MAKE) lib/BasicsC/voc-errors.h wiki: wiki2 - @test -d Doxygen/wiki || mkdir Doxygen/wiki - @for w in $(WIKI); do python @top_srcdir@/Doxygen/Scripts/xml2md.py Doxygen/xml/$$w.xml > Doxygen/xml/$$w.md; done - @for w in $(WIKI); do @top_srcdir@/Doxygen/Scripts/fixmd.sh Doxygen/xml/$$w.md; done + @test -d Documentation/wiki || mkdir Documentation/wiki + @for w in $(WIKI); do python @top_srcdir@/Documentation/Scripts/xml2md.py Documentation/xml/$$w.xml > Documentation/xml/$$w.md; done + @for w in $(WIKI); do @top_srcdir@/Documentation/Scripts/fixmd.sh Documentation/xml/$$w.md; done -wiki2: Doxygen/arango-xml.doxy $(DOXYGEN) - doxygen Doxygen/arango-xml.doxy > /dev/null +wiki2: Documentation/arango-xml.doxy $(DOXYGEN) + doxygen Documentation/arango-xml.doxy > /dev/null ################################################################################ ### @brief latex @@ -5606,32 +5550,32 @@ wiki2: Doxygen/arango-xml.doxy $(DOXYGEN) .PHONY: latex -Doxygen/arango-latex.doxy: Doxygen/arango.template +Documentation/arango-latex.doxy: Documentation/arango.template sed -e 's:GENERATE_LATEX *= *NO:GENERATE_LATEX = YES:' -e 's:ENABLED_SECTIONS *=:ENABLED_SECTIONS = LATEX:' < $< > $@ $(MAKE) lib/BasicsC/voc-errors.h -latex: Doxygen/arango-latex.doxy $(DOXYGEN) - doxygen Doxygen/arango-latex.doxy > /dev/null +latex: Documentation/arango-latex.doxy $(DOXYGEN) + doxygen Documentation/arango-latex.doxy > /dev/null - echo "\def\arangodbversion{@PACKAGE_VERSION@}" > Doxygen/latex/version.tex + echo "\def\arangodbversion{@PACKAGE_VERSION@}" > Documentation/latex/version.tex - python @top_srcdir@/Doxygen/Scripts/tex2tex.py Doxygen/latex/InstallManual.tex > Doxygen/latex/InstallManual.inc.tex - cd Doxygen/latex && pdflatex -interaction batchmode install-manual.tex || true + python @top_srcdir@/Documentation/Scripts/tex2tex.py Documentation/latex/InstallManual.tex > Documentation/latex/InstallManual.inc.tex + cd Documentation/latex && pdflatex -interaction batchmode install-manual.tex || true - python @top_srcdir@/Doxygen/Scripts/tex2tex.py Doxygen/latex/UserManual.tex > Doxygen/latex/UserManual.inc.tex - cd Doxygen/latex && pdflatex -interaction batchmode user-manual.tex || true + python @top_srcdir@/Documentation/Scripts/tex2tex.py Documentation/latex/UserManual.tex > Documentation/latex/UserManual.inc.tex + cd Documentation/latex && pdflatex -interaction batchmode user-manual.tex || true - python @top_srcdir@/Doxygen/Scripts/tex2tex.py Doxygen/latex/ImplementorManual.tex > Doxygen/latex/ImplementorManual.inc.tex - cd Doxygen/latex && pdflatex -interaction batchmode implementor-manual.tex || true + python @top_srcdir@/Documentation/Scripts/tex2tex.py Documentation/latex/ImplementorManual.tex > Documentation/latex/ImplementorManual.inc.tex + cd Documentation/latex && pdflatex -interaction batchmode implementor-manual.tex || true - python @top_srcdir@/Doxygen/Scripts/tex2tex.py Doxygen/latex/RefManual.tex > Doxygen/latex/RefManual.inc.tex - cd Doxygen/latex && pdflatex -interaction batchmode ref-manual.tex || true + python @top_srcdir@/Documentation/Scripts/tex2tex.py Documentation/latex/RefManual.tex > Documentation/latex/RefManual.inc.tex + cd Documentation/latex && pdflatex -interaction batchmode ref-manual.tex || true - python @top_srcdir@/Doxygen/Scripts/tex2tex.py Doxygen/latex/DbaManual.tex > Doxygen/latex/DbaManual.inc.tex - cd Doxygen/latex && pdflatex -interaction batchmode dba-manual.tex || true + python @top_srcdir@/Documentation/Scripts/tex2tex.py Documentation/latex/DbaManual.tex > Documentation/latex/DbaManual.inc.tex + cd Documentation/latex && pdflatex -interaction batchmode dba-manual.tex || true - python @top_srcdir@/Doxygen/Scripts/tex2tex.py Doxygen/latex/ImpManual.tex > Doxygen/latex/ImpManual.inc.tex - cd Doxygen/latex && pdflatex -interaction batchmode imp-manual.tex || true + python @top_srcdir@/Documentation/Scripts/tex2tex.py Documentation/latex/ImpManual.tex > Documentation/latex/ImpManual.inc.tex + cd Documentation/latex && pdflatex -interaction batchmode imp-manual.tex || true ################################################################################ ################################################################################ @@ -5669,6 +5613,20 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories ################################################################################ ################################################################################ +@ENABLE_MRUBY_TRUE@.setup-mr-directories: +@ENABLE_MRUBY_TRUE@ @test -d mr || mkdir mr +@ENABLE_MRUBY_TRUE@ @test -d mr/common/bootstrap || mkdir mr/common/bootstrap +@ENABLE_MRUBY_TRUE@ @touch $@ + +@ENABLE_MRUBY_TRUE@mr/common/bootstrap/mr-%.h: @srcdir@/mr/common/bootstrap/%.rb .setup-mr-directories +@ENABLE_MRUBY_TRUE@ @top_srcdir@/config/mr2c.sh $< > $@ + +@ENABLE_MRUBY_TRUE@mr/server/mr-%.h: @srcdir@/mr/server/%.rb .setup-mr-directories +@ENABLE_MRUBY_TRUE@ @top_srcdir@/config/mr2c.sh $< > $@ + +################################################################################ +################################################################################ + ################################################################################ ### @brief flex ################################################################################ @@ -5683,9 +5641,6 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories @ENABLE_FLEX_TRUE@%.cpp: %.ll @ENABLE_FLEX_TRUE@ @top_srcdir@/config/flex-c++.sh $(LEX) $@ $< -################################################################################ -################################################################################ - ################################################################################ ### @brief BISON ################################################################################ @@ -5700,93 +5655,78 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories @ENABLE_BISON_TRUE@%.cpp: %.yy @ENABLE_BISON_TRUE@ @top_srcdir@/config/bison-c++.sh $(BISON) $@ $< -################################################################################ -################################################################################ - -@PROTOBUF_LIBS@: .protobuf-build-@TRI_BITS@ - -.protobuf-build-@TRI_BITS@: - @echo - @echo "--------------------------------------------------------------------------------" - @echo "BUILDING Protocol Buffers" - @echo "--------------------------------------------------------------------------------" - @echo - - cd @top_srcdir@/3rdParty/protobuf-2.4.1 \ - && ./configure \ - --disable-dependency-tracking \ - --disable-shared \ - --prefix=$(PROTOBUFDIR) \ - --libdir=$(PROTOBUFDIR)/lib@TRI_BITS@ - cd @top_srcdir@/3rdParty/protobuf-2.4.1 && $(MAKE) install - - touch .protobuf-build-@TRI_BITS@ - - @echo - @echo "--------------------------------------------------------------------------------" - @echo "BUILD Protocol Buffers FINISHED" - @echo "--------------------------------------------------------------------------------" - @echo - -################################################################################ -################################################################################ - ################################################################################ ### @brief protocol buffers ################################################################################ %.pb.cpp: %.proto - @top_srcdir@/3rdParty/protobuf-2.4.1/BUILD/bin/protoc --cpp_out . $< + @PROTOBUF_PROTOC@ --cpp_out . $< mv $(addsuffix .cc,$(basename $@)) $@ -################################################################################ -################################################################################ +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@@LIBEV_LIBS@: .libev-build-@TRI_BITS@ -@ENABLE_ALL_IN_ONE_TRUE@@LIBEV_LIBS@: .libev-build-@TRI_BITS@ +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@.libev-build-@TRI_BITS@: +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo "--------------------------------------------------------------------------------" +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo "BUILDING LIBEV" +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo "--------------------------------------------------------------------------------" +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo -@ENABLE_ALL_IN_ONE_TRUE@.libev-build-@TRI_BITS@: -@ENABLE_ALL_IN_ONE_TRUE@ @echo -@ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------" -@ENABLE_ALL_IN_ONE_TRUE@ @echo "BUILDING LIBEV" -@ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------" -@ENABLE_ALL_IN_ONE_TRUE@ @echo +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ mkdir @top_srcdir@/3rdParty/libev/BUILD || true +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ cd @top_srcdir@/3rdParty/libev/BUILD && ../configure --disable-shared +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ cd @top_srcdir@/3rdParty/libev/BUILD && $(MAKE) -@ENABLE_ALL_IN_ONE_TRUE@ mkdir @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) || true -@ENABLE_ALL_IN_ONE_TRUE@ cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && CFLAGS="$(LIBEV_BUILD_CFLAGS_X)" orig_CFLAGS="$(LIBEV_BUILD_CFLAGS_X)" LDFLAGS="$(LIBEV_BUILD_LDFLAGS_X)" ../configure --disable-shared -@ENABLE_ALL_IN_ONE_TRUE@ cd @top_srcdir@/3rdParty/libev/$(LIBEV_BUILD_VERSION) && $(MAKE) +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ touch .libev-build-@TRI_BITS@ -@ENABLE_ALL_IN_ONE_TRUE@ touch .libev-build-@TRI_BITS@ +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo "--------------------------------------------------------------------------------" +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo "BUILD LIBEV FINISHED" +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo "--------------------------------------------------------------------------------" +@ENABLE_ALL_IN_ONE_LIBEV_TRUE@ @echo -@ENABLE_ALL_IN_ONE_TRUE@ @echo -@ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------" -@ENABLE_ALL_IN_ONE_TRUE@ @echo "BUILD LIBEV FINISHED" -@ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------" -@ENABLE_ALL_IN_ONE_TRUE@ @echo +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@@PROTOBUF_LIBS@: .protobuf-build-@TRI_BITS@ -################################################################################ -################################################################################ +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@.protobuf-build-@TRI_BITS@: +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo "--------------------------------------------------------------------------------" +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo "BUILDING Protocol Buffers" +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo "--------------------------------------------------------------------------------" +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo -@ENABLE_ALL_IN_ONE_TRUE@@V8_LIBS@: .v8-build-@TRI_BITS@ +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ cd @top_srcdir@/3rdParty/protobuf-2.4.1 \ +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ && ./configure \ +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ --disable-dependency-tracking \ +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ --disable-shared \ +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ --prefix=$(PROTOBUFDIR) \ +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ --libdir=$(PROTOBUFDIR)/lib@TRI_BITS@ +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ cd @top_srcdir@/3rdParty/protobuf-2.4.1 && $(MAKE) install -@ENABLE_ALL_IN_ONE_TRUE@.v8-build-@TRI_BITS@: -@ENABLE_ALL_IN_ONE_TRUE@ @echo -@ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------" -@ENABLE_ALL_IN_ONE_TRUE@ @echo "BUILDING V8" -@ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------" -@ENABLE_ALL_IN_ONE_TRUE@ @echo +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ touch .protobuf-build-@TRI_BITS@ -@ENABLE_ALL_IN_ONE_TRUE@ cd @top_srcdir@/3rdParty/V8 && $(MAKE) library=static snapshot=off @V8_TARGET@ +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo "--------------------------------------------------------------------------------" +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo "BUILD Protocol Buffers FINISHED" +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo "--------------------------------------------------------------------------------" +@ENABLE_ALL_IN_ONE_PROTOBUF_TRUE@ @echo -@ENABLE_ALL_IN_ONE_TRUE@ touch .v8-build-@TRI_BITS@ +@ENABLE_ALL_IN_ONE_V8_TRUE@@V8_LIBS@: .v8-build-@TRI_BITS@ -@ENABLE_ALL_IN_ONE_TRUE@ @echo -@ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------" -@ENABLE_ALL_IN_ONE_TRUE@ @echo "BUILD V8 FINISHED" -@ENABLE_ALL_IN_ONE_TRUE@ @echo "--------------------------------------------------------------------------------" -@ENABLE_ALL_IN_ONE_TRUE@ @echo +@ENABLE_ALL_IN_ONE_V8_TRUE@.v8-build-@TRI_BITS@: +@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo +@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo "--------------------------------------------------------------------------------" +@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo "BUILDING V8" +@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo "--------------------------------------------------------------------------------" +@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo -################################################################################ -################################################################################ +@ENABLE_ALL_IN_ONE_V8_TRUE@ cd @top_srcdir@/3rdParty/V8 && $(MAKE) library=static snapshot=off @V8_TARGET@ + +@ENABLE_ALL_IN_ONE_V8_TRUE@ touch .v8-build-@TRI_BITS@ + +@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo +@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo "--------------------------------------------------------------------------------" +@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo "BUILD V8 FINISHED" +@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo "--------------------------------------------------------------------------------" +@ENABLE_ALL_IN_ONE_V8_TRUE@ @echo @ENABLE_MRUBY_TRUE@@MRUBY_LIBS@: .mruby-build-@TRI_BITS@ @@ -5807,9 +5747,6 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories @ENABLE_MRUBY_TRUE@ @echo "--------------------------------------------------------------------------------" @ENABLE_MRUBY_TRUE@ @echo -################################################################################ -################################################################################ - @ENABLE_ZEROMQ_TRUE@@ZEROMQ_LIBS@: .zeromq-build-@TRI_BITS@ .czmq-build-@TRI_BITS@ @ENABLE_ZEROMQ_TRUE@.zeromq-build-@TRI_BITS@: @@ -5861,13 +5798,6 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories @ENABLE_ZEROMQ_TRUE@ @echo "--------------------------------------------------------------------------------" @ENABLE_ZEROMQ_TRUE@ @echo -################################################################################ -################################################################################ - -################################################################################ -### @brief mruby -################################################################################ - ################################################################################ ### @brief documentation ################################################################################ @@ -5877,19 +5807,31 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories ################################################################################ ################################################################################ -### @brief flex +### @brief mruby ################################################################################ ################################################################################ -### @brief bison +### @brief generate all flex files ################################################################################ ################################################################################ -### @brief protocol buffers +### @brief generate all bison files ################################################################################ ################################################################################ -### @brief libev and V8 +### @brief generate all protocol buffers +################################################################################ + +################################################################################ +### @brief libev +################################################################################ + +################################################################################ +### @brief protcol buffers +################################################################################ + +################################################################################ +### @brief V8 ################################################################################ ################################################################################ diff --git a/README.md b/README.md index 190b454c5f..f5daadb51d 100644 --- a/README.md +++ b/README.md @@ -2,23 +2,22 @@ [![Build Status](https://secure.travis-ci.org/triAGENS/ArangoDB.png)](http://travis-ci.org/triAGENS/ArangoDB) We recently started a new open source project - a nosql database -called AvocadoDB which became ArangoDB in May 2012. ArangoDB is -currently available as a beta version. -We want to have a stable version 1 ready soon. A multi server version is planned +called AvocadoDB which became ArangoDB in May 2012. The current +stable version of ArangoDB is 1.0. A multi server version is planned for the end of 2012. For details see the roadmap. Key features include: -* Schema-free schemata let you combine the space efficiency of MySQL with the performance power of NoSQL -* Use ArangoDB as an application server and fuse your application and database together for maximal throughput -* JavaScript for all: no language zoo, you can use one language from your browser to your back-end -* ArangoDB is multi-threaded - exploit the power of all your cores -* Flexible data modeling: model your data as combination of key-value pairs, documents or graphs - perfect for social relations -* Free index choice: use the correct index for your problem, be it a skip list or a n-gram search -* Configurable durability: let the application decide if it needs more durability or more performance -* No-nonsense storage: ArangoDB uses all of the power of modern storage hardware, like SSD and large caches -* Powerful query language (AQL) to retrieve data -* It is open source (Apache Licence 2.0) +* **Schema-free schemata** let you combine the space efficiency of MySQL with the performance power of NoSQL +* Use ArangoDB as an **application server** and fuse your application and database together for maximal throughput +* JavaScript for all: **no language zoo**, you can use one language from your browser to your back-end +* ArangoDB is **multi-threaded** - exploit the power of all your cores +* **Flexible data modeling**: model your data as combination of key-value pairs, documents or graphs - perfect for social relations +* Free **index choice**: use the correct index for your problem, be it a skip list or a n-gram search +* Configurable **durability**: let the application decide if it needs more durability or more performance +* No-nonsense storage: ArangoDB uses all of the power of **modern storage hardware**, like SSD and large caches +* **Powerful query language** (AQL) to retrieve data +* It is **open source** (Apache Licence 2.0) For more in-depth information @@ -28,8 +27,9 @@ For more in-depth information ## Compilation -Please check the wiki -for installation and compilation instructions: +Please check the +[Installation Manual](http://www.arangodb.org/manuals/1.0.0/InstallManual.html) +for installation and compilation instructions. ### Mac OS X Hints @@ -82,7 +82,7 @@ Start the shell in another windows: ## Caveat Please note that this is a very early version of ArangoDB. There will be -bugs and we'd really appreciate it if you -report them: +bugs and we'd really appreciate it if you [report](https://github.com/triAGENS/ArangoDB/issues") +them: https://github.com/triAGENS/ArangoDB/issues diff --git a/UnitTests/Makefile.files b/UnitTests/Makefile.files index ae4a9f04cb..e9269f062b 100755 --- a/UnitTests/Makefile.files +++ b/UnitTests/Makefile.files @@ -1,5 +1,9 @@ # -*- mode: Makefile; -*- +## ----------------------------------------------------------------------------- +## --SECTION-- CONFIGURATION +## ----------------------------------------------------------------------------- + FORCE = 0 SKIP_BOOST = 0 SKIP_GEO = 0 @@ -10,6 +14,9 @@ USERNAME = root PASSWORD = PROTO = http +## ----------------------------------------------------------------------------- +## --SECTION-- UNITTESTS +## ----------------------------------------------------------------------------- ################################################################################ ## unittests target @@ -28,7 +35,6 @@ unittests-brief: \ unittests-ssl-server \ unittests-shell-client - unittests-verbose: @echo "################################################################################" @echo "## ##" @@ -56,14 +62,32 @@ PIDFILE := /tmp/arango.$(PID).pid VOCDIR := /tmp/vocdir.$(PID) VOCPORT := $(shell printf "3%04d" `expr $(PID) % 10000`) VOCHOST := 127.0.0.1 -SERVER_START := -SERVER_OPT := --configuration none --javascript.startup-directory @top_srcdir@/js --javascript.modules-path @top_srcdir@/js/server/modules:@top_srcdir@/js/common/modules --javascript.action-directory @top_srcdir@/js/actions/system --database.maximal-journal-size 1048576 --javascript.gc-interval 1 --server.threads 4 $(SERVER_START) -CLIENT_OPT := --javascript.startup-directory @top_srcdir@/js --javascript.modules-path @top_srcdir@/js/client/modules:@top_srcdir@/js/common/modules --no-colors --quiet STARTFILE := $(VOCDIR)/startup CURL := curl CURL_OPT := --basic --user "$(USERNAME):$(PASSWORD)" -CERT_FILE := @srcdir@/UnitTests/server.pem +CERT_FILE := @top_srcdir@/UnitTests/server.pem +SERVER_START := + +SERVER_OPT := \ + --configuration none \ + --database.maximal-journal-size 1048576 \ + --javascript.action-directory @top_srcdir@/js/actions/system \ + --javascript.gc-interval 1 \ + --javascript.modules-path @top_srcdir@/js/server/modules:@top_srcdir@/js/common/modules \ + --javascript.startup-directory @top_srcdir@/js \ + --ruby.action-directory @top_srcdir@/mr/actions/system \ + --ruby.modules-path @top_srcdir@/mr/server/modules:@top_srcdir@/mr/common/modules \ + --server.threads 4 \ + --server.admin-directory ./html/admin \ + $(SERVER_START) + +CLIENT_OPT := \ + --configuration none \ + --javascript.startup-directory @top_srcdir@/js \ + --javascript.modules-path @top_srcdir@/js/client/modules:@top_srcdir@/js/common/modules \ + --no-colors \ + --quiet .PHONY: start-server @@ -169,16 +193,16 @@ endif ## SHELL SERVER TESTS (BASICS) ################################################################################ -SHELL_COMMON = @srcdir@/js/common/tests/shell-document.js \ - @srcdir@/js/common/tests/shell-edge.js \ - @srcdir@/js/common/tests/shell-compactor.js \ - @srcdir@/js/common/tests/shell-collection.js \ - @srcdir@/js/common/tests/shell-simple-query.js \ - @srcdir@/js/common/tests/shell-index.js \ - @srcdir@/js/common/tests/shell-index-geo.js \ - @srcdir@/js/common/tests/shell-cap-constraint.js \ - @srcdir@/js/common/tests/shell-unique-constraint.js \ - @srcdir@/js/common/tests/shell-hash-index.js +SHELL_COMMON = @top_srcdir@/js/common/tests/shell-document.js \ + @top_srcdir@/js/common/tests/shell-edge.js \ + @top_srcdir@/js/common/tests/shell-compactor.js \ + @top_srcdir@/js/common/tests/shell-collection.js \ + @top_srcdir@/js/common/tests/shell-simple-query.js \ + @top_srcdir@/js/common/tests/shell-index.js \ + @top_srcdir@/js/common/tests/shell-index-geo.js \ + @top_srcdir@/js/common/tests/shell-cap-constraint.js \ + @top_srcdir@/js/common/tests/shell-unique-constraint.js \ + @top_srcdir@/js/common/tests/shell-hash-index.js SHELL_SERVER = $(SHELL_COMMON) @@ -206,47 +230,47 @@ unittests-shell-server: ## SHELL SERVER TESTS (AHUACATL) ################################################################################ -SHELL_SERVER_AHUACATL = @srcdir@/js/server/tests/ahuacatl-ranges.js \ - @srcdir@/js/server/tests/ahuacatl-queries-optimiser.js \ - @srcdir@/js/server/tests/ahuacatl-escaping.js \ - @srcdir@/js/server/tests/ahuacatl-functions.js \ - @srcdir@/js/server/tests/ahuacatl-variables.js \ - @srcdir@/js/server/tests/ahuacatl-bind.js \ - @srcdir@/js/server/tests/ahuacatl-complex.js \ - @srcdir@/js/server/tests/ahuacatl-logical.js \ - @srcdir@/js/server/tests/ahuacatl-arithmetic.js \ - @srcdir@/js/server/tests/ahuacatl-relational.js \ - @srcdir@/js/server/tests/ahuacatl-ternary.js \ - @srcdir@/js/server/tests/ahuacatl-parse.js \ - @srcdir@/js/server/tests/ahuacatl-hash.js \ - @srcdir@/js/server/tests/ahuacatl-skiplist.js \ - @srcdir@/js/server/tests/ahuacatl-refaccess-variable.js \ - @srcdir@/js/server/tests/ahuacatl-refaccess-attribute.js \ - @srcdir@/js/server/tests/ahuacatl-skiplist.js \ - @srcdir@/js/server/tests/ahuacatl-queries-simple.js \ - @srcdir@/js/server/tests/ahuacatl-queries-variables.js \ - @srcdir@/js/server/tests/ahuacatl-queries-geo.js \ - @srcdir@/js/server/tests/ahuacatl-queries-collection.js \ - @srcdir@/js/server/tests/ahuacatl-queries-noncollection.js \ - @srcdir@/js/server/tests/ahuacatl-operators.js +SHELL_SERVER_AHUACATL = @top_srcdir@/js/server/tests/ahuacatl-ranges.js \ + @top_srcdir@/js/server/tests/ahuacatl-queries-optimiser.js \ + @top_srcdir@/js/server/tests/ahuacatl-escaping.js \ + @top_srcdir@/js/server/tests/ahuacatl-functions.js \ + @top_srcdir@/js/server/tests/ahuacatl-variables.js \ + @top_srcdir@/js/server/tests/ahuacatl-bind.js \ + @top_srcdir@/js/server/tests/ahuacatl-complex.js \ + @top_srcdir@/js/server/tests/ahuacatl-logical.js \ + @top_srcdir@/js/server/tests/ahuacatl-arithmetic.js \ + @top_srcdir@/js/server/tests/ahuacatl-relational.js \ + @top_srcdir@/js/server/tests/ahuacatl-ternary.js \ + @top_srcdir@/js/server/tests/ahuacatl-parse.js \ + @top_srcdir@/js/server/tests/ahuacatl-hash.js \ + @top_srcdir@/js/server/tests/ahuacatl-skiplist.js \ + @top_srcdir@/js/server/tests/ahuacatl-refaccess-variable.js \ + @top_srcdir@/js/server/tests/ahuacatl-refaccess-attribute.js \ + @top_srcdir@/js/server/tests/ahuacatl-skiplist.js \ + @top_srcdir@/js/server/tests/ahuacatl-queries-simple.js \ + @top_srcdir@/js/server/tests/ahuacatl-queries-variables.js \ + @top_srcdir@/js/server/tests/ahuacatl-queries-geo.js \ + @top_srcdir@/js/server/tests/ahuacatl-queries-collection.js \ + @top_srcdir@/js/server/tests/ahuacatl-queries-noncollection.js \ + @top_srcdir@/js/server/tests/ahuacatl-operators.js SHELL_SERVER_AHUACATL_EXTENDED = \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-1.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-2.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-3.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-4.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-5.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-6.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-7.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-8.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-9.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-10.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-11.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-12.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-13.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-14.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-15.js \ - @srcdir@/js/server/tests/ahuacatl-ranges-combined-16.js + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-1.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-2.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-3.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-4.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-5.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-6.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-7.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-8.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-9.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-10.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-11.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-12.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-13.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-14.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-15.js \ + @top_srcdir@/js/server/tests/ahuacatl-ranges-combined-16.js .PHONY: unittests-shell-server-ahuacatl @@ -273,7 +297,7 @@ unittests-shell-server-ahuacatl: ## SHELL CLIENT TESTS ################################################################################ -SHELL_CLIENT = $(SHELL_COMMON) js/client/tests/client.js +SHELL_CLIENT = $(SHELL_COMMON) @top_srcdir@/js/client/tests/client.js .PHONY: unittests-shell-client @@ -313,7 +337,7 @@ unittests-http-server: @echo "================================================================================" @echo - cd @srcdir@/UnitTests/HttpInterface && ARANGO_SERVER="$(VOCHOST):$(VOCPORT)" ARANGO_SSL=0 ARANGO_USER="$(USERNAME)" ARANGO_PASSWORD="$(PASSWORD)" ./run-tests || test "x$(FORCE)" == "x1" + cd @top_srcdir@/UnitTests/HttpInterface && ARANGO_SERVER="$(VOCHOST):$(VOCPORT)" ARANGO_SSL=0 ARANGO_USER="$(USERNAME)" ARANGO_PASSWORD="$(PASSWORD)" ./run-tests || test "x$(FORCE)" == "x1" kill `cat $(PIDFILE)` @@ -339,7 +363,7 @@ unittests-ssl-server: @echo "================================================================================" @echo - cd @srcdir@/UnitTests/HttpInterface && ARANGO_SERVER="$(VOCHOST):$(VOCPORT)" ARANGO_SSL=1 ARANGO_USER="$(USERNAME)" ARANGO_PASSWORD="$(PASSWORD)" ./run-tests || test "x$(FORCE)" == "x1" + cd @top_srcdir@/UnitTests/HttpInterface && ARANGO_SERVER="$(VOCHOST):$(VOCPORT)" ARANGO_SSL=1 ARANGO_USER="$(USERNAME)" ARANGO_PASSWORD="$(PASSWORD)" ./run-tests || test "x$(FORCE)" == "x1" kill `cat $(PIDFILE)` @@ -354,7 +378,7 @@ unittests-ssl-server: ## BITARRAY INDEXES TESTS ################################################################################ -BITARRAY_COMMON = @srcdir@/js/common/tests/shell-bitarray-index.js +BITARRAY_COMMON = @top_srcdir@/js/common/tests/shell-bitarray-index.js .PHONY: unittests-bitarray-index diff --git a/aclocal.m4 b/aclocal.m4 index b8e7ed70b9..b52b848197 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.12 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,30 +13,28 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically 'autoreconf'.])]) +To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.12' +[am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -53,24 +50,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to -# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -89,7 +84,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is '.', but things will broke when you +# harmless because $srcdir is `.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -115,21 +110,22 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 9 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ([2.52])dnl - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -148,15 +144,16 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 +# serial 10 -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -179,12 +176,12 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], - [$1], [CXX], [depcc="$CXX" am_compiler_list=], - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], [UPC], [depcc="$UPC" am_compiler_list=], - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -192,9 +189,8 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -233,16 +229,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with '-c' and '-o' for the sake of the "dashmstdout" + # We check with `-c' and `-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -251,16 +247,16 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -308,7 +304,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -318,34 +314,28 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE([dependency-tracking], [dnl -AS_HELP_STRING( - [--enable-dependency-tracking], - [do not reject slow dependency extractors]) -AS_HELP_STRING( - [--disable-dependency-tracking], - [speeds up one-time build])]) +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' - am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 +#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -364,7 +354,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but + # We used to match only the files named `Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -376,19 +366,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. + # from the Makefile without running `make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -406,7 +398,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will +# is enabled. FIXME. This creates each `.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -416,13 +408,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 18 +# serial 16 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -473,25 +466,23 @@ m4_ifval([$2], AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), - [ok:ok],, +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) -AM_MISSING_PROG([AUTOCONF], [autoconf]) -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) -AM_MISSING_PROG([AUTOHEADER], [autoheader]) -AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl @@ -505,28 +496,28 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES([CC])], + [_AM_DEPENDENCIES(CC)], [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES([CXX])], + [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES([OBJC])], + [_AM_DEPENDENCIES(OBJC)], [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], @@ -554,14 +545,12 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -575,9 +564,9 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST([install_sh])]) +AC_SUBST(install_sh)]) -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -600,13 +589,13 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 4 # AM_MAKE_INCLUDE() # ----------------- @@ -625,7 +614,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. +# Ignore all kinds of additional output from `make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -650,7 +639,8 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -686,13 +676,14 @@ m4_define([AC_PROG_CC], # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -722,21 +713,19 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - AC_MSG_WARN(['missing' script is too old or missing]) + AC_MSG_WARN([`missing' script is too old or missing]) fi ]) -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_PROG_MKDIR_P # --------------- -# Check for 'mkdir -p'. +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl @@ -756,13 +745,13 @@ esac # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -770,13 +759,13 @@ AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# -------------------- +# ------------------------------ # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ------------------------ +# ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -789,18 +778,22 @@ AC_DEFUN([_AM_IF_OPTION], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 5 # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -811,40 +804,32 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; esac -# Do 'set' in a subshell so we don't clobber the current shell's +# Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken - alias in your environment]) - fi - if test "$[2]" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done test "$[2]" = conftest.file ) then @@ -854,123 +839,70 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT([yes]) -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! -fi -AC_CONFIG_COMMANDS_PRE( - [AC_MSG_CHECKING([that generated files are newer than configure]) - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - AC_MSG_RESULT([done])]) -rm -f conftest.file -]) +AC_MSG_RESULT(yes)]) -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 1 # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# ("yes" being less verbose, "no" or empty being verbose). +# (`yes' being less verbose, `no' or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], [dnl -AS_HELP_STRING( - [--enable-silent-rules], - [less verbose build output (undo: "make V=1")]) -AS_HELP_STRING( - [--disable-silent-rules], - [verbose build output (undo: "make V=0")])dnl -]) -case $enable_silent_rules in @%:@ ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac -dnl -dnl A few 'make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using '$V' instead of '$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor 'install' (even GNU) is that you can't +# One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in "make install-strip", and initialize +# always use install-sh in `make install-strip', and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -979,24 +911,24 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# FORMAT should be one of `v7', `ustar', or `pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1007,11 +939,10 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) @@ -1019,7 +950,7 @@ AC_MSG_CHECKING([how to create a $1 tar archive]) _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' _am_tools=${am_cv_prog_tar_$1-$_am_tools} # Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. +# Solaris sh will not grok spaces in the rhs of `-'. for _am_tool in $_am_tools do case $_am_tool in diff --git a/arangod/Documentation/install-manual.dox b/arangod/Documentation/install-manual.dox index 5b4ae2a4dc..c2f3dd5091 100644 --- a/arangod/Documentation/install-manual.dox +++ b/arangod/Documentation/install-manual.dox @@ -43,6 +43,10 @@ /// @endif //////////////////////////////////////////////////////////////////////////////// +// ----------------------------------------------------------------------------- +// --SECTION-- INSTALLING +// ----------------------------------------------------------------------------- + //////////////////////////////////////////////////////////////////////////////// /// @page InstallingTOC /// @@ -80,7 +84,6 @@ /// /// @LIT{http://www.arangodb.org/repositories/} /// -/// /// @subsection InstallingLinuxPackageManager Using a Package Manager to install ArangoDB ///////////////////////////////////////////////////////////////////////////////////////// /// @@ -95,6 +98,7 @@ /// @endcode /// /// Add a repository file @LIT{/etc/yum.repos.d/arangodb.repo} +/// /// @code /// [ArangoDB] /// name=ArangoDB Repository for CentOS @@ -105,7 +109,7 @@ /// gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-www.arangodb.org /// @endcode /// -/// Update repository data: +/// Update the repository data: /// /// @code /// yum clean metadata @@ -181,7 +185,7 @@ /// zypper addrepo -f -t YUM http://www.arangodb.org/repositories/openSUSE-12.1 ArangoDB /// @endcode /// -/// Update repository data: +/// Update the repository data: /// /// @code /// zypper refresh @@ -236,7 +240,8 @@ ///