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

Merge branch 'solaris' of https://github.com/arangodb/arangodb into solaris

This commit is contained in:
Frank Celler 2016-02-26 14:57:42 +00:00
parent 1b5bd2ec87 3dda9b7ba2
commit ecd2d97b36
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdParty/V8/V8-4.3.61/build/gyp_v8 vendored
View File

@ -37,7 +37,7 @@ import platform
import shlex import shlex
import subprocess import subprocess
import sys import sys
print "iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii\n"
script_dir = os.path.dirname(os.path.realpath(__file__)) script_dir = os.path.dirname(os.path.realpath(__file__))
v8_root = os.path.abspath(os.path.join(script_dir, os.pardir)) v8_root = os.path.abspath(os.path.join(script_dir, os.pardir))

2
3rdParty/V8/V8-4.3.61/src/d8.gyp vendored
View File

@ -128,7 +128,7 @@
'<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
], ],
'action': [ 'action': [
'<(PYTHON_EXECUTABLE)>', '<(PYTHON_EXECUTABLE)',
'../tools/js2c.py', '../tools/js2c.py',
'<@(_outputs)', '<@(_outputs)',
'D8', 'D8',

2
3rdParty/V8/V8-4.3.61/test/cctest/cctest.gyp vendored
View File

@ -320,7 +320,7 @@
'<(generated_file)', '<(generated_file)',
], ],
'action': [ 'action': [
'<(PYTHON_EXECUTABLE)>', '<(PYTHON_EXECUTABLE)',
'../../tools/js2c.py', '../../tools/js2c.py',
'<@(_outputs)', '<@(_outputs)',
'TEST', # type 'TEST', # type

6
3rdParty/V8/V8-4.3.61/tools/gyp/v8.gyp vendored
View File

@ -1738,7 +1738,7 @@
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc', '<(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',
@ -1757,7 +1757,7 @@
{ {
'action_name': 'js2c_experimental', 'action_name': 'js2c_experimental',
'inputs': [ 'inputs': [
'<(PYTHON_EXECUTABLE)>', '<(PYTHON_EXECUTABLE)',
'../../tools/js2c.py', '../../tools/js2c.py',
'<@(experimental_library_files)', '<@(experimental_library_files)',
], ],
@ -1765,7 +1765,7 @@
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc', '<(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',