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

Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2017-02-07 21:23:15 +01:00
parent 0a9c235530 9386a1b2d5
commit db9c244266
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdParty/V8/CMakeLists.txt vendored
View File

@ -287,6 +287,7 @@ elseif (WIN32)
list(APPEND V8_GYP_ARGS "-GGYP_GENERATORS=msvs")
list(APPEND V8_GYP_ARGS "-Dmsvs_cygwin_shell=0")
list(APPEND V8_GYP_ARGS "-Dv8_use_snapshot=false")
if ("${BITS}" STREQUAL "64")
set(MS_TARGET_PLATFORM x64)
@ -330,7 +331,7 @@ elseif (WIN32)
SOURCE_DIR
"${V8_DIR}"
CONFIGURE_COMMAND
${PYTHON_EXECUTABLE} ${GYP_MAIN} ${V8_GYP_ARGS} -Dmode=${MS_TARGET_CONF_LOWER}
${CMAKE_COMMAND} -E env GYP_GENERATORS=msvs GYP_MSVS_VERSION=2015 DEPOT_TOOLS_WIN_TOOLCHAIN=0 ${PYTHON_EXECUTABLE} ${GYP_MAIN} ${V8_GYP_ARGS} -Dmode=${MS_TARGET_CONF_LOWER}
BUILD_COMMAND
""
INSTALL_COMMAND

2
3rdParty/V8/v8 vendored

@ -1 +1 @@
Subproject commit 4a172b49052246d46477b3a39c5fb3b3868e93d1
Subproject commit d12a9da7103c17bf14fe2fb42749a2ab1e5dd33f

4
Documentation/Books/Manual/GettingStarted/Installing/Compiling.mdpp
View File

@ -12,6 +12,7 @@ By default, cloning the github repository will checkout **devel**. This version
contains the development version of the ArangoDB. Use this branch if you want
to make changes to the ArangoDB source.
On windows you first [need to allow and enable symlinks for your user](https://github.com/git-for-windows/git/wiki/Symbolic-Links#allowing-non-administrators-to-create-symbolic-links).
We now use [git submodules](https://git-scm.com/docs/git-submodule) for V8 and Rocksdb.
Since the V8 git repository also requires external addons to be present, we end
up with recursive submodules. Thus a clone command now has to look like:
@ -21,5 +22,8 @@ up with recursive submodules. Thus a clone command now has to look like:
git submodule update --recursive
git submodule update --init --recursive
Please checkout the [cookbook](https://docs.arangodb.com/cookbook) on how to
compile ArangoDB.