1
0
Fork 0
Commit Graph

650 Commits

Author SHA1 Message Date
Wilfried Goesgens 7b7a852dcc Fix quotes, thanks to Simran for digging this out. 2016-03-15 21:29:21 +01:00
jsteemann 236aa3ab5f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-15 20:09:51 +01:00
Frank Celler ae8430589f new linenoise-ng 2016-03-15 16:54:53 +01:00
Kaveh Vahedipour 8bf2264e88 null result for non-existent key in agency dbs 2016-03-15 16:28:27 +01:00
Wilfried Goesgens 7c18cbdd51 Implement configuring for 32 bit arm 2016-03-15 15:16:55 +01:00
Wilfried Goesgens e2bf40a78a better insulate the flags where forcing 64 bits for solaris. 2016-03-15 15:12:19 +01:00
Max Neunhoeffer 646367f955 Move change in VelocyPack Builder ValuePair String API here. 2016-03-14 21:24:29 +01:00
Max Neunhoeffer c074f47f4e Port a velocypack fix. 2016-03-14 12:12:54 +01:00
Jan Steemann 4074ba47ee fixed invalid member name 2016-03-11 09:12:02 +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
Jan Steemann 9a26fe0960 attribute accessor not using json 2016-03-08 09:59:57 +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 6782a5e39d fixed typo, removed example build 2016-03-05 14:33:57 +01:00
Jan Steemann 4e0328d46f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 17:59:27 +01:00
Wilfried Goesgens 14b0e72efe Simplify the windows msbuild path - it still barfs objects into the source tree, but at least some is in the build directory and we only need to build the sub-target "v8". 2016-03-03 17:46:30 +01:00
Wilfried Goesgens 73748b8cc7 Merge branch 'devel' of github.com:arangodb/ArangoDB into solaris
Choose -Wno-all
2016-03-03 16:55:51 +01:00
Wilfried Goesgens fd72a032d3 Add support for compiling V8 via Ninja Build 2016-03-03 16:07:14 +01:00
Wilfried Goesgens 59d7aa435d don't override the provided output directory. 2016-03-03 16:07:03 +01:00
jsteemann b35f44a5d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 22:09:44 +01:00
Andreas Streichardt 3524ee829f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-02 18:58:57 +01:00
Frank Celler df4df0d17f no -Wall for libev 2016-03-02 17:55:41 +01:00
Andreas Streichardt c4847dd8a8 Do not install zlib 2016-03-02 17:15:49 +01:00
Wilfried Goesgens f1a2f5e393 Styleguide cleanups as cmakelinter hints 2016-03-02 11:45:55 +01:00
Jan Steemann 92493f2807 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:04:58 +01:00
Wilfried Goesgens 78d3bd28b5 Merge branch 'devel' of github.com:arangodb/ArangoDB into solaris 2016-03-02 10:50:28 +01:00
Wilfried Goesgens ae428829fc Merge branch 'solaris' of github.com:arangodb/ArangoDB into solaris 2016-03-02 10:50:15 +01:00
Wilfried Goesgens 318cdb8365 Merge branch 'solaris' of github.com:arangodb/ArangoDB into devel 2016-03-02 10:31:03 +01:00
Wilfried Goesgens e39871ae10 We need to specify use_snapshot=true for gyp. 2016-03-02 09:59:23 +01:00
Frank Celler 8d7734b2bc removed no-old-style 2016-03-01 23:56:42 +01:00
Frank Celler c88a68358d CMAKE changes for Windows and Solaris 2016-03-01 17:31:30 +01:00
Frank Celler a6acf900bf added v8_build 2016-03-01 16:45:38 +01:00
Frank Celler ba74fa6f7a Merge branch 'solaris' of github.com:arangodb/arangodb into solaris 2016-03-01 16:41:40 +01:00
Frank Celler e70068ee94 compile both targets 2016-03-01 16:41:29 +01:00
Frank Celler 5f4e3b8f6f Merge branch 'solaris' of github.com:arangodb/arangodb into solaris 2016-03-01 16:32:06 +01:00
Frank Celler 772802a481 use -Wno-old-style-declaration 2016-03-01 16:31:58 +01:00
Frank Celler b20452d2e4 use 2.8 2016-03-01 16:31:40 +01:00
Frank Celler 3c9c6ef2c1 targets for debug and optimized 2016-03-01 16:27:11 +01:00
Frank Celler 137a6d5ea4 fixed lib dir 2016-03-01 15:46:20 +01:00
Frank Celler 07cfb20e18 fixed lib dir 2016-03-01 15:43:37 +01:00
Frank Celler 680adfdc21 cleanup 2016-03-01 15:13:54 +01:00
Frank Celler 8d9ffbb42f Merge branch 'solaris' of github.com:arangodb/arangodb into solaris 2016-03-01 15:13:19 +01:00
Frank Celler 715da04bb9 cleanup 2016-03-01 15:11:39 +01:00
Wilfried Goesgens 9f732f68ef Fix typo. 2016-03-01 14:50:49 +01:00
Wilfried Goesgens 4cd664f061 - force libev windows backend to select & winsock
- fix generation of paths, case matters in variablenames.
2016-03-01 13:42:57 +01:00
Wilfried Goesgens 0d402e0d2c If configure doesn't find a valid backend #error out. 2016-03-01 13:42:57 +01:00
Frank Celler c202efa80e cleanup 2016-03-01 12:33:27 +01:00
Frank Celler 995bffc39e Merge branch 'solaris' of github.com:arangodb/arangodb into solaris 2016-03-01 10:20:27 +01:00
Frank Celler 9eda75c34a cleanup 2016-03-01 10:20:22 +01:00
Frank Celler a8f9ed82a7 use only one test 2016-03-01 10:15:13 +01:00
Wilfried Goesgens b70e38f794 Also work with the linker include directories here. 2016-02-29 19:28:13 +01:00
Frank Celler 6ff9a7610e shutup message about VS15 2016-02-29 19:13:21 +01:00
Wilfried Goesgens 39e180c4da Work on cmake library directories. 2016-02-29 19:04:10 +01:00
Frank Celler b1de079b04 added OPENSSL LIBS directly 2016-02-29 17:59:55 +00:00
Frank Celler a430a0e07f added path 2016-02-29 17:14:41 +00:00
Frank Celler 87ba797adc added patch file 2016-02-29 17:27:07 +01:00
Frank Celler 795e158070 added patch file 2016-02-29 17:24:46 +01:00
Frank Celler a6dd56df95 fixed libs 2016-02-29 11:49:31 +00:00
Frank Celler 11d4310247 export lib 2016-02-29 08:55:01 +00:00
Frank Celler 215d269611 fixes for Windows VS 2016-02-29 08:54:26 +00:00
Frank Celler b5aa806c7d added regex 2016-02-28 13:47:03 +01:00
Frank Celler 533ec096e1 added GETOPT_INCLUDE_DIR 2016-02-28 12:53:38 +01:00
Wilfried Goesgens 0eae9cfeda try to export the include directory 2016-02-26 17:57:25 +01:00
Wilfried Goesgens 260d053cb8 Calculate where windows puts the V8 & ICU libs 2016-02-26 17:57:01 +01:00
Wilfried Goesgens 4178f3f756 Add getopt for windows portability. 2016-02-26 17:20:45 +01:00
Wilfried Goesgens 3dda9b7ba2 Fix Variable, no trailing > needed. 2016-02-26 15:54:56 +01:00
Wilfried Goesgens 39809a1f0d Remove debug output. 2016-02-26 15:54:45 +01:00
Wilfried Goesgens 0f2174ada5 Add python as a parameter to gyp. 2016-02-26 15:12:28 +01:00
Wilfried Goesgens 62ba465c1f don't use the environment for the python executable. 2016-02-26 15:12:04 +01:00
Wilfried Goesgens 9e091d6374 make gyp builds their own custom target steps 2016-02-26 14:47:26 +01:00
Wilfried Goesgens 9b0938d9ae Work on the windows compile of V8 to properly find python. 2016-02-26 13:08:37 +01:00
Jan Steemann 68461e6f74 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 11:00:25 +01:00
Kaveh Vahedipour 56210b8886 Must be (MAKE) INSTEAD OF {MAKE} in V8 BUILD_COMMAND 2016-02-26 09:56:12 +00:00
Frank Celler e2f5a8a8c3 added USE_OPENSSL_NO_SSL2 2016-02-26 10:50:03 +01:00
Achim Brandt 3761effafc fixed variable tests 2016-02-26 10:30:00 +01:00
Jan Steemann c0fd3b13ca Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 10:19:17 +01:00
Max Neunhoeffer de745abce9 Silence a compiler warning. 2016-02-26 10:11:59 +01:00
Max Neunhoeffer 5688e05f1c Fix capitalisation of openssl subdir in CMakeLists.txt. 2016-02-26 09:24:39 +01:00
Frank Celler e57a077c1b added dependencies 2016-02-25 20:21:04 +01:00
Frank Celler 06256947fa splitted into 3rd libs 2016-02-25 18:51:17 +01:00
Frank Celler b1a56dd59c moved BOOST to its own CMakeLists.txt 2016-02-25 18:51:17 +01:00
Jan Steemann 22e89f56ca Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 16:50:34 +01:00
Frank Celler 0c511e2b49 readded USE_PRECOMPILED_V8 2016-02-25 16:36:24 +01:00
Jan Steemann 3e82064770 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:59:08 +01:00
Jan Steemann f0ed218ae9 do not compile v8 with -Werror 2016-02-25 14:25:22 +01:00
Jan Steemann 51eb138c94 reduce build verbosity 2016-02-25 13:38:35 +01:00
Frank Celler 38cb961a33 removed superfluous Makefile 2016-02-25 13:19:50 +01:00
Frank Celler 42dbf45264 fixed libs 2016-02-24 22:40:31 +01:00
Frank Celler 0a88fb3dfa removed superfluous file 2016-02-24 19:20:36 +01:00
Frank Celler 2f3fe0feea added LDFLAGS for APPLE 2016-02-24 18:57:15 +01:00
Wilfried Goesgens bf7b3a86f7 Remove the libevent compatibility wrapper from the build targets, we don't need it and its broken on windows. 2016-02-24 16:10:15 +01:00
Wilfried Goesgens aa6e229a3d Add triagens force header for windows, as we did before. 2016-02-24 16:08:59 +01:00
Wilfried Goesgens 3833d9e462 Swap sequence for visual studio. 2016-02-24 16:08:43 +01:00
Wilfried Goesgens 0bf90a712a Add version, and way to detect local boost. 2016-02-24 14:04:19 +01:00
Max Neunhoeffer cff2624e4a Add operator!= for Slice. 2016-02-24 12:45:00 +01:00
Max Neunhoeffer 7b8309bf7c New VPack hash method for Slice. 2016-02-24 11:43:10 +01:00
Frank Celler 43be85e72b more cleanup 2016-02-24 10:30:30 +01:00
Frank Celler fed3dee2fa more cleanup 2016-02-23 20:36:33 +01:00
Wilfried Goesgens 2968cc81da Finalize work on solaris with static library linking. 2016-02-23 14:28:27 +01:00
Max Neunhoeffer 7c890dce03 Add set method for Slice in velocypack. 2016-02-23 13:42:57 +01:00
Wilfried Goesgens 983c582bb8 its CHECK_INCLUDE_FILE -S 2016-02-23 11:38:40 +01:00
Wilfried Goesgens 8632080bdc - remove rasbian stuff
- make solaris link stattic using the csw linker
 - cleanup V8 & ICU include & libraries.
2016-02-23 11:23:51 +01:00
Wilfried Goesgens 8d7b55416e Cleanup variable collecting for V8 and start out with windows. 2016-02-23 09:56:27 +01:00
Wilfried Goesgens e27bdf7a01 Merge branch 'solaris' of github.com:arangodb/ArangoDB into solaris 2016-02-22 16:42:47 +01:00
Wilfried Goesgens cffad306d0 More fixes to the libev cmake 2016-02-22 16:42:28 +01:00
Frank Celler a9afad6257 checkout tarball 2016-02-22 16:29:04 +01:00
Frank Celler 1c7e2acfb1 added include directories 2016-02-22 16:17:16 +01:00
Wilfried Goesgens c194235963 solaris also trips on -wl,--version 2016-02-22 15:01:04 +01:00
Wilfried Goesgens 137b82409c swap sequence, so the exception gets thrown later. 2016-02-22 14:06:40 +01:00
Wilfried Goesgens a98b3946f9 - Remove default config.h - it doesn't contain the wanted values in most cases.
- add checks to generate config.h from cmake.
2016-02-22 13:29:21 +01:00
Wilfried Goesgens 03f402d842 Move apple specific cflag modifications into a proper if clause. 2016-02-22 13:28:46 +01:00
Max Neunhoeffer 3900cc33eb Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-22 11:42:13 +01:00
Max Neunhoeffer 9e0c04dda4 Add new velocypack version for custom type handling. 2016-02-22 11:41:51 +01:00
Frank Celler bf8cd67a64 added 1.2.8 2016-02-22 10:31:29 +01:00
Frank Celler ab02faf75b added version 2016-02-22 09:57:16 +01:00
Frank Celler 670413c85c added version 2016-02-22 09:57:10 +01:00
Jan Steemann 4277f7a131 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 09:41:44 +01:00
Frank Celler 2ef2687c59 upgraded to 1.2.8 2016-02-20 18:01:09 +01:00
Frank Celler f001b3c535 changed name to libev_ICLUDE_DIR 2016-02-20 17:16:18 +01:00
Frank Celler 0643923f4a Merge branch 'solaris' of github.com:arangodb/arangodb into solaris 2016-02-20 13:06:44 +01:00
Frank Celler ddd7b29ade Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-20 12:57:14 +01:00
Frank Celler 3ed64c8e53 moved to CMAKE 2016-02-20 12:54:58 +01:00
Frank Celler 347903f393 moved to subdirectory 2016-02-20 12:54:36 +01:00
Frank Celler a7502d8bd1 disabled shared 2016-02-20 12:54:13 +01:00
Frank Celler c9b973915d fixed name of etcd 2016-02-19 22:04:35 +01:00
Frank Celler bb57f0e75f added install step 2016-02-19 21:15:26 +01:00
Wilfried Goesgens 9a5cf6dfb4 Export directories with the icu & v8 libraries into the calling scope 2016-02-19 18:35:15 +01:00
Wilfried Goesgens 8608fae2d1 Move stuff around
- properly calculate ICU
 - propagate PYTHON_EXECUTABLE into the make file for V8
2016-02-19 17:57:45 +01:00
Wilfried Goesgens 4a9dc3cbd4 More solaris compatibility 2016-02-19 15:52:32 +01:00
Wilfried Goesgens e1e707ff34 Use absolute path so the script can riddle out where to set include paths. 2016-02-19 15:30:41 +01:00
Wilfried Goesgens b8f01f93bd Detect and set environments. 2016-02-19 15:30:15 +01:00
Wilfried Goesgens 9907c4e4a6 More forcing of the compiler on solaris; fix V8 location for arangodb build. 2016-02-19 14:47:27 +01:00
Jan Steemann 5ac4af689b updated vpack library 2016-02-19 13:27:05 +01:00
Jan Steemann e4fb8b184b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 12:51:52 +01:00
Wilfried Goesgens 0700ccc847 start to use gyp directly from cmake; add 64 bits detection; remove old arm stuff. 2016-02-19 12:46:28 +01:00
Wilfried Goesgens 22a361f484 better host os detection with the possibility to force 64 bits. 2016-02-19 12:42:27 +01:00
Wilfried Goesgens b440ed74f1 Force V8 solaris builds to 64 bits 2016-02-19 12:38:48 +01:00
Frank Celler baa0999ee6 fixed path for libev 2016-02-19 12:35:19 +01:00
Frank Celler 417db335ab removed old files 2016-02-19 12:26:26 +01:00
Jan Steemann 8b8101fc59 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 11:44:06 +01:00
Frank Celler c5be313670 -stdlib=libc++ is also required in CXXFLAGS 2016-02-19 11:15:54 +01:00
Frank Celler 972acd6ae8 trying to fix Darwin 2016-02-19 00:01:05 +01:00
Kaveh Vahedipour db9d23b7ef Adapting to intel compiler 15.0 2016-02-18 23:26:45 +01:00
Kaveh Vahedipour 2dcb98b5e9 Adapting to intel compiler 15.0 2016-02-18 23:26:30 +01:00
Jan Steemann 84984d0cfb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 16:40:27 +01:00
Frank Celler cca627318a fixed quotes 2016-02-18 16:35:04 +01:00
Jan Steemann c3eba02f68 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 16:34:55 +01:00
Jan Steemann 5b3b7e673b Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 16:17:07 +01:00
Frank Celler 67c150d53b added LDFLAGS 2016-02-18 16:06:16 +01:00
Jan Steemann 433cd14d7e Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 14:44:05 +01:00