mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'solaris' of https://github.com/arangodb/arangodb into solaris
This commit is contained in:
commit
ecd2d97b36
|
@ -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))
|
||||||
|
|
||||||
|
|
|
@ -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',
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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',
|
||||||
|
|
Loading…
Reference in New Issue