1
0
Fork 0
Commit Graph

383 Commits

Author SHA1 Message Date
Jan Christoph Uhde 1b35ae4f79 enable: compile_commands.json 2016-07-26 20:56:25 +02:00
Wilfried Goesgens c6a1bcc226 Cleanup buildsystem
- add RPM support
  - move macros in own file
  - cleanup sequence
  - add CMAKE switch "-DPACKAGING=[DEB|RPM|DARWIN]" that prepares package building
2016-07-26 16:13:34 +02:00
Andreas Streichardt 980579bc8e fix openssl installation 2016-07-07 18:48:24 +02:00
jsteemann b788babcc8 added arangovpack binary 2016-07-05 13:53:22 +02:00
Andreas Streichardt ecf6885286 Re-add NO_SSL2 2016-06-27 20:50:37 +02:00
Andreas Streichardt e4d42a10da Remove special openssl logic 2016-06-27 20:21:57 +02:00
Frank Celler 4d0f98a43e added FORCE_JEMALLOC_LIB 2016-06-17 15:54:32 +00:00
Frank Celler 03079b2b67 3.0 fixes for paths 2016-06-14 16:51:48 +02:00
Wilfried Goesgens 83df22eb34 Rename variable to substitute into NSIS, for some reason CPACK_NSIS_DEFINES is substituted empty. 2016-06-14 12:46:44 +02:00
Frank Celler 99e991087d added homebrew 2016-06-13 15:26:58 +02:00
Frank Celler f9298c2b43 3.0 2016-06-07 17:39:32 +02:00
jsteemann 325aa13795 merge with velocypack 2016-06-06 16:59:36 +02:00
Mark 69f622d5af Compiler-Option /MP (multiple processes) added 2016-06-01 17:22:42 +02:00
jsteemann 6294c88304 experimental increase of FD_SETSIZE for Windows 2016-05-25 12:54:04 +02:00
Frank Celler d4291b36e5 added sanity check for CMAKE_BUILD_TYPE 2016-05-19 16:10:36 +02:00
Andreas Streichardt 29ea27e698 Fix broken variable 2016-05-17 17:43:34 +02:00
Frank Celler 2d9f384043 use Release as default 2016-05-13 14:50:28 +02:00
Andreas Streichardt 16aa5c08c8 require debian target 2016-05-12 17:20:23 +02:00
Frank Celler 1c9d99d8ec removed SNAPPY_STATIC_LIB 2016-05-11 17:34:39 +02:00
Frank Celler ec95d48ec3 use static lib 2016-05-11 17:23:59 +02:00
Andreas Streichardt 64a567a5a0 ROCKSDB uses static snappy from 3rdparty 2016-05-11 16:30:24 +02:00
Andreas Streichardt b3f0a4956e jemalloc is not REQUIRED if explicitly requested 2016-05-11 13:33:41 +02:00
Max Neunhoeffer 56cfb576d3 Switch rocksdb on by default. 2016-05-11 11:18:32 +02:00
Wilfried Goesgens 5c15717357 Add snappy libs if we need it. 2016-05-10 16:45:15 +02:00
Wilfried Goesgens 1763c5dc36 Revert #366d771b5247c271f9dbf22905e7f3d49e0d974c and set the policies for ubuntu. 2016-05-10 11:06:40 +02:00
Andreas Streichardt 3773b0e66c Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-06 17:04:04 +02:00
ArangoDB a51f795b82 Merge branch 'devel' into json_agency_comm 2016-05-04 19:49:22 +00:00
Frank Celler 59aef959ac changed to static 2016-05-04 19:45:55 +02:00
Kaveh Vahedipour 35d604e9e0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 18:17:00 +02:00
Kaveh Vahedipour e623198d6c Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 17:06:23 +02:00
Wilfried Goesgens b163692df7 fix python detection. This line got lost. 2016-05-04 15:20:56 +02:00
jsteemann 7ad08738af Merge branch 'devel' of https://github.com/arangodb/arangodb into dox-cox-pix-ex-rox-box 2016-05-04 14:54:45 +02:00
Andreas Streichardt a80d208590 Use core2 as the absolute minimum architecture 2016-05-04 14:33:32 +02:00
Frank Celler d5fd6ac0e7 fixed order of pthread, fixed cmake 2.8 2016-05-04 13:51:16 +02:00
Kaveh Vahedipour 5d911bceb4 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 15:48:36 +02:00
jsteemann 495b266c8a initial commit 2016-05-03 15:42:24 +02:00
Frank Celler 27454a1281 added USE_OPTIMIZE_FOR_ARCHITECTURE flag 2016-05-03 14:18:58 +02:00
Wilfried Goesgens d19cef695e Unify the way we locate and initialize icu on windows in the unittests. 2016-05-03 11:43:14 +02:00
Kaveh Vahedipour 00ce93b8d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 16:14:37 +02:00
Frank Celler 6974f881a3 fixed statistics 2016-05-01 19:14:10 +02:00
Kaveh Vahedipour 86959d83a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-29 16:29:05 +02:00
Andreas Streichardt 241dd2ff15 link against libatomic on clang 2016-04-29 12:49:36 +02:00
Kaveh Vahedipour 583a77792f sometimes elseif(NOT CMAKE_SIZEOF_VOID_P) 2016-04-29 10:00:47 +02:00
Frank Celler daae5917ad added icu copy 2016-04-28 08:57:31 +02:00
Frank Celler 10cea5553f no ASM under Windows 2016-04-27 17:26:07 +02:00
jsteemann 5ec9cff904 renamed arangob to arangobench 2016-04-27 12:15:19 +02:00
Frank Celler d5476d37b1 remove USE_SYSTEM_BOOST 2016-04-27 11:04:57 +02:00
Frank Celler 0d8de0612c remove USE_SYSTEM_BOOST 2016-04-27 10:51:12 +02:00
Frank Celler 1976f2f5b6 fixed wrong usage of error 2016-04-23 22:17:36 -07:00
Frank Celler 2cb73ce625 cosmetics 2016-04-23 22:14:57 -07:00
Frank Celler 3091b17ab9 do not use v8_build in precompiled mode 2016-04-23 19:30:42 -07:00
jsteemann 07a0e0156d add fix vor Visual Studio 2015 update 2 2016-04-23 21:30:29 +02:00
jsteemann f9b872e77e remove unnecessary libraries 2016-04-22 16:13:53 +02:00
Frank Celler 7bc8669bbf ignore #warning 2016-04-21 23:15:47 -07:00
Wilfried Goesgens 51bca63463 Add detection for jemalloc, default to using jemalloc on linux. 2016-04-21 18:22:52 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
Alan Plum 98423f451e
Don't generate mimetypes.js 2016-04-18 18:19:24 +02:00
Frank Celler 999cf52996 fixed order of flags 2016-04-17 17:27:30 -07:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Andreas Streichardt c2cf4be4e0 Remove etcd 2016-04-05 18:41:37 +02:00
Frank Celler ae45b7cd67 MSVC fixes 2016-03-31 17:16:37 +02:00
Frank Celler 119c1bd44b Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 09:31:32 +02:00
Andreas Streichardt d0f58ffac3 Fix python executable 2016-03-30 14:19:48 +02:00
Frank Celler 9095e57fb3 fixed tcmalloc test 2016-03-28 22:08:28 +02:00
Jan Steemann eddc92a228 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 19:35:23 +01:00
Andreas Streichardt 11e7808641 Hopefully fix unittest boost fun 2016-03-24 19:01:34 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Andreas Streichardt fb76cc4529 fix python 2016-03-23 18:25:41 +01:00
Kaveh Vahedipour 7746fbfe82 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-23 17:19:56 +01:00
Jan Steemann 7ae7b18d25 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 17:09:49 +01:00
Frank Celler 212a1e7813 fixed buffer overflow 2016-03-23 16:41:22 +01:00
Jan Steemann 9ac39b7ad6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:30 +01:00
Kaveh Vahedipour 7254ad4c9e Fixing issues 2016-03-23 15:16:47 +01:00
Kaveh Vahedipour 4a86d26f19 need to find out how to define the headers properly 2016-03-21 18:23:14 +01:00
Kaveh Vahedipour 2583c00859 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-21 10:41:15 +01:00
Jan Steemann f17d17841f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 09:28:35 +01:00
Frank Celler 2dd1f1ce1f cache deployment target 2016-03-20 13:59:47 +01:00
Frank Celler 949ec7074b set deployment target 2016-03-20 13:51:45 +01:00
Frank Celler 9a8678f712 no rt on darwin 2016-03-20 13:01:03 +01:00
Frank Celler 019c95a777 added rt 2016-03-20 08:45:49 +00:00
jsteemann 3759c19886 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 16:52:59 +01:00
Frank Celler f1aabef0fe removed /LTCG 2016-03-18 16:29:51 +01:00
Kaveh Vahedipour 7355cde795 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-16 16:27:53 +01:00
jsteemann d6709de403 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 12:12:19 +01:00
Frank Celler 174b0d661c changed to 3.0.x-devel 2016-03-16 10:50:52 +01:00
jsteemann 0361c2e72b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 00:13:58 +01:00
jsteemann 6204de9ed9 always link against libresolv 2016-03-16 00:13:30 +01:00
jsteemann 2ceecda5f7 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-15 23:44:42 +01:00
Frank Celler d64bf2dc95 added srv:// endpoint 2016-03-15 23:25:07 +01:00
Kaveh Vahedipour 61a55d61db Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-10 17:37:43 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Kaveh Vahedipour df56885c09 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-07 17:38:38 +01:00
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
Frank Celler b1899e9b31 made BASE flags cachable 2016-03-05 17:13:48 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Jan Steemann b965cb5e6e Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-04 20:58:06 +01:00
Andreas Streichardt 68277a734b Python is required for V8 2016-03-04 18:10:38 +01:00
Kaveh Vahedipour 89ce4ac10a Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-03 18:50:40 +01:00
Jan Steemann 4e0328d46f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 17:59:27 +01:00