1
0
Fork 0

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
commit ecd2d97b36
4 changed files with 6 additions and 6 deletions

View File

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

View File

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

View File

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

View File

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