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

Fix V8 build for windows 

- use <(PYTHON_EXECUTABLE) its a gyp variable not an environment variable.
  - disable fetching of platform json for visual studio.
This commit is contained in:
Wilfried Goesgens 2016-03-31 14:35:32 +02:00
parent 1c0492ff8a
commit 75450a3fae
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdParty/V8/V8-4.9.391/build/standalone.gypi vendored
View File

@ -66,7 +66,7 @@
}, },
'host_arch%': '<(host_arch)', 'host_arch%': '<(host_arch)',
'target_arch%': '<(host_arch)', 'target_arch%': '<(host_arch)',
'base_dir%': '<!(cd <(DEPTH) && ${PYTHON_EXECUTABLE} -c "import os; print os.getcwd()")', 'base_dir%': '<!(cd <(DEPTH) && <(PYTHON_EXECUTABLE) -c "import os; print os.getcwd()")',
# Instrument for code coverage with gcov. # Instrument for code coverage with gcov.
'coverage%': 0, 'coverage%': 0,
@ -421,7 +421,7 @@
# (defines are passed via the command line, and build systems rebuild # (defines are passed via the command line, and build systems rebuild
# things when their commandline changes). Nothing should ever read this # things when their commandline changes). Nothing should ever read this
# define. # define.
'defines': ['CR_CLANG_REVISION=<!(${PYTHON_EXECUTABLE} <(DEPTH)/tools/clang/scripts/update.py --print-revision)'], 'defines': ['CR_CLANG_REVISION=<!(<(PYTHON_EXECUTABLE) <(DEPTH)/tools/clang/scripts/update.py --print-revision)'],
'conditions': [ 'conditions': [
['host_clang==1', { ['host_clang==1', {
'target_conditions': [ 'target_conditions': [

8
3rdParty/V8/V8-4.9.391/build/vs_toolchain.py vendored
View File

@ -30,8 +30,8 @@ def SetEnvironmentAndGetRuntimeDllDirs():
the output directory after gyp generation. the output directory after gyp generation.
""" """
vs2013_runtime_dll_dirs = None vs2013_runtime_dll_dirs = None
depot_tools_win_toolchain = \ depot_tools_win_toolchain = 0
bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1'))) # bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1')))
# When running on a non-Windows host, only do this if the SDK has explicitly # When running on a non-Windows host, only do this if the SDK has explicitly
# been downloaded before (in which case json_data_file will exist). # been downloaded before (in which case json_data_file will exist).
if ((sys.platform in ('win32', 'cygwin') or os.path.exists(json_data_file)) if ((sys.platform in ('win32', 'cygwin') or os.path.exists(json_data_file))
@ -208,8 +208,8 @@ def Update(force=False):
if force == '--force' or os.path.exists(json_data_file): if force == '--force' or os.path.exists(json_data_file):
force = True force = True
depot_tools_win_toolchain = \ depot_tools_win_toolchain = 0
bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1'))) # bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1')))
if ((sys.platform in ('win32', 'cygwin') or force) and if ((sys.platform in ('win32', 'cygwin') or force) and
depot_tools_win_toolchain): depot_tools_win_toolchain):
import find_depot_tools import find_depot_tools

24
3rdParty/V8/V8-4.9.391/tools/gyp/v8.gyp vendored
View File

@ -1840,14 +1840,14 @@
'<(PRODUCT_DIR)/natives_blob_host.bin', '<(PRODUCT_DIR)/natives_blob_host.bin',
], ],
'action': [ 'action': [
'$(PYTHON_EXECUTABLE)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin' '<(PYTHON_EXECUTABLE)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
], ],
}, { }, {
'outputs': [ 'outputs': [
'<(PRODUCT_DIR)/natives_blob.bin', '<(PRODUCT_DIR)/natives_blob.bin',
], ],
'action': [ 'action': [
'$(PYTHON_EXECUTABLE)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin' '<(PYTHON_EXECUTABLE)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
], ],
}], }],
], ],
@ -1856,7 +1856,7 @@
'<(PRODUCT_DIR)/natives_blob.bin', '<(PRODUCT_DIR)/natives_blob.bin',
], ],
'action': [ 'action': [
'$(PYTHON_EXECUTABLE)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin' '<(PYTHON_EXECUTABLE)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
], ],
}], }],
], ],
@ -1954,7 +1954,7 @@
], ],
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/libraries.cc'], 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/libraries.cc'],
'action': [ 'action': [
'$(PYTHON_EXECUTABLE)', '<(PYTHON_EXECUTABLE)',
'../../tools/js2c.py', '../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc', '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
'CORE', 'CORE',
@ -1972,7 +1972,7 @@
], ],
'outputs': ['<@(libraries_bin_file)'], 'outputs': ['<@(libraries_bin_file)'],
'action': [ 'action': [
'$(PYTHON_EXECUTABLE)', '<(PYTHON_EXECUTABLE)',
'../../tools/js2c.py', '../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc', '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
'CORE', 'CORE',
@ -1990,7 +1990,7 @@
], ],
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc'], 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc'],
'action': [ 'action': [
'$(PYTHON_EXECUTABLE)', '<(PYTHON_EXECUTABLE)',
'../../tools/js2c.py', '../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc', '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
'EXPERIMENTAL', 'EXPERIMENTAL',
@ -2005,7 +2005,7 @@
], ],
'outputs': ['<@(libraries_experimental_bin_file)'], 'outputs': ['<@(libraries_experimental_bin_file)'],
'action': [ 'action': [
'$(PYTHON_EXECUTABLE)', '<(PYTHON_EXECUTABLE)',
'../../tools/js2c.py', '../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc', '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
'EXPERIMENTAL', 'EXPERIMENTAL',
@ -2022,7 +2022,7 @@
], ],
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc'], 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc'],
'action': [ 'action': [
'$(PYTHON_EXECUTABLE)', '<(PYTHON_EXECUTABLE)',
'../../tools/js2c.py', '../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc', '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
'EXTRAS', 'EXTRAS',
@ -2037,7 +2037,7 @@
], ],
'outputs': ['<@(libraries_extras_bin_file)'], 'outputs': ['<@(libraries_extras_bin_file)'],
'action': [ 'action': [
'$(PYTHON_EXECUTABLE)', '<(PYTHON_EXECUTABLE)',
'../../tools/js2c.py', '../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc', '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
'EXTRAS', 'EXTRAS',
@ -2056,7 +2056,7 @@
'<(SHARED_INTERMEDIATE_DIR)/experimental-extras-libraries.cc', '<(SHARED_INTERMEDIATE_DIR)/experimental-extras-libraries.cc',
], ],
'action': [ 'action': [
'$(PYTHON_EXECUTABLE)', '<(PYTHON_EXECUTABLE)',
'../../tools/js2c.py', '../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/experimental-extras-libraries.cc', '<(SHARED_INTERMEDIATE_DIR)/experimental-extras-libraries.cc',
'EXPERIMENTAL_EXTRAS', 'EXPERIMENTAL_EXTRAS',
@ -2071,7 +2071,7 @@
], ],
'outputs': ['<@(libraries_experimental_extras_bin_file)'], 'outputs': ['<@(libraries_experimental_extras_bin_file)'],
'action': [ 'action': [
'$(PYTHON_EXECUTABLE)', '<(PYTHON_EXECUTABLE)',
'../../tools/js2c.py', '../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/experimental-extras-libraries.cc', '<(SHARED_INTERMEDIATE_DIR)/experimental-extras-libraries.cc',
'EXPERIMENTAL_EXTRAS', 'EXPERIMENTAL_EXTRAS',
@ -2102,7 +2102,7 @@
'<(SHARED_INTERMEDIATE_DIR)/debug-support.cc', '<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
], ],
'action': [ 'action': [
'$(PYTHON_EXECUTABLE)', '<(PYTHON_EXECUTABLE)',
'../../tools/gen-postmortem-metadata.py', '../../tools/gen-postmortem-metadata.py',
'<@(_outputs)', '<@(_outputs)',
'<@(heapobject_files)' '<@(heapobject_files)'