diff --git a/BUILD.gn b/BUILD.gn index cb45a8925d45fe6ff07513ef81c318895742c2c6..013df9515e9536f406a17c7fa682e12a0662cfe8 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -29,13 +29,25 @@ if (defined(ohos_lite)) { # is on lite Os for ipcamera import("//third_party/jerryscript/engine.gni") config("jerryscript_config") { defines = [ - "JERRY_SNAPSHOT_SAVE=1", "JERRY_COMMIT_HASH=\"ignored\"", "JERRY_NDEBUG", "JERRY_HEAPDUMP", "JERRY_REF_TRACKER", ] - defines += es6_support_defines + defines += [ + "JERRY_SNAPSHOT_SAVE=${jerryscript_jerry_snapshot_save}", + "JERRY_ES2015=${jerryscript_jerry_es2015}", + "JERRY_ES2015_BUILTIN_TYPEDARRAY=${jerryscript_jerry_es2015_builtin_typedarray}", + "JERRY_ES2015_BUILTIN_SET=${jerryscript_jerry_es2015_builtin_set}", + "JERRY_ES2015_BUILTIN_PROMISE=${jerryscript_jerry_es2015_builtin_promise}", + "JERRY_ES2015_BUILTIN_PROXY=${jerryscript_jerry_es2015_builtin_proxy}", + "JERRY_ES2015_MODULE_SYSTEM=${jerryscript_jerry_es2015_module_system}", + "JERRY_ES2015_BUILTIN_MAP=${jerryscript_jerry_es2015_builtin_map}", + "JERRY_ES2015_BUILTIN_WEAKMAP=${jerryscript_jerry_es2015_builtin_weakmap}", + "JERRY_ES2015_BUILTIN_WEAKSET=${jerryscript_jerry_es2015_builtin_weakset}", + "JERRY_ES2015_BUILTIN_DATAVIEW=${jerryscript_jerry_es2015_builtin_dataview}", + "JERRY_ES2015_BUILTIN_REFLECT=${jerryscript_jerry_es2015_builtin_reflect}", + ] cflags = [ "-Wno-unused-function", "-Wno-sign-compare", @@ -46,38 +58,45 @@ if (defined(ohos_lite)) { # is on lite Os for ipcamera config("jerryscript_simulator") { defines = [ - "JERRY_CPOINTER_32_BIT=0", - "JERRY_DEBUGGER=1", "JERRY_FUNCTION_BACKTRACE", "JERRY_FUNCTION_NAME", - "JERRY_GC_LIMIT=(0)", "JERRY_HEAPDUMP", - "JERRY_LINE_INFO=1", - "JERRY_MEM_GC_BEFORE_EACH_ALLOC=0", "JERRY_NDEBUG", - "JERRY_PARSER=1", - "JERRY_PARSER_DUMP_BYTE_CODE=0", "JERRY_REF_TRACKER", - "JERRY_REGEXP_DUMP_BYTE_CODE=0", - "JERRY_REGEXP_STRICT_MODE=0", - "JERRY_STACK_LIMIT=(0)", - "JERRY_SYSTEM_ALLOCATOR=0", - "JERRY_VALGRIND=0", - "JERRY_VM_EXEC_STOP=0", ] - defines += es6_support_defines - if (thirdparty_jerryscript_enable_external_context == true) { - defines += [ "JERRY_EXTERNAL_CONTEXT=1" ] - } - defines += - [ "INPUTJS_BUFFER_SIZE=${thirdparty_jerryscript_inputjs_buffer_size}" ] defines += [ - "SNAPSHOT_BUFFER_SIZE=${thirdparty_jerryscript_snapshot_buffer_size}", + "JERRY_CPOINTER_32_BIT=${jerryscript_jerry_cpointer_32_bit}", + "JERRY_DEBUGGER=${jerryscript_jerry_debugger}", + "JERRY_GC_LIMIT=${jerryscript_jerry_gc_limit}", + "JERRY_LINE_INFO=${jerryscript_jerry_line_info}", + "JERRY_MEM_GC_BEFORE_EACH_ALLOC=${jerryscript_jerry_mem_gc_before_each_alloc}", + "JERRY_PARSER=${jerryscript_jerry_parser}", + "JERRY_PARSER_DUMP_BYTE_CODE=${jerryscript_jerry_parser_dump_byte_code}", + "JERRY_REGEXP_DUMP_BYTE_CODE=${jerryscript_jerry_regexp_dump_byte_code}", + "JERRY_REGEXP_STRICT_MODE=${jerryscript_jerry_regexp_strict_mode}", + "JERRY_STACK_LIMIT=${jerryscript_jerry_stack_limit}", + "JERRY_SYSTEM_ALLOCATOR=${jerryscript_jerry_system_allocator}", + "JERRY_VALGRIND=${jerryscript_jerry_valgrind}", + "JERRY_VM_EXEC_STOP=${jerryscript_jerry_vm_exec_stop}", + "JERRY_ES2015=${jerryscript_jerry_es2015}", + "JERRY_ES2015_BUILTIN_TYPEDARRAY=${jerryscript_jerry_es2015_builtin_typedarray}", + "JERRY_ES2015_BUILTIN_SET=${jerryscript_jerry_es2015_builtin_set}", + "JERRY_ES2015_BUILTIN_PROMISE=${jerryscript_jerry_es2015_builtin_promise}", + "JERRY_ES2015_BUILTIN_PROXY=${jerryscript_jerry_es2015_builtin_proxy}", + "JERRY_ES2015_MODULE_SYSTEM=${jerryscript_jerry_es2015_module_system}", + "JERRY_ES2015_BUILTIN_MAP=${jerryscript_jerry_es2015_builtin_map}", + "JERRY_ES2015_BUILTIN_WEAKMAP=${jerryscript_jerry_es2015_builtin_weakmap}", + "JERRY_ES2015_BUILTIN_WEAKSET=${jerryscript_jerry_es2015_builtin_weakset}", + "JERRY_ES2015_BUILTIN_DATAVIEW=${jerryscript_jerry_es2015_builtin_dataview}", + "JERRY_ES2015_BUILTIN_REFLECT=${jerryscript_jerry_es2015_builtin_reflect}", ] - defines += - [ "BMS_TASK_HEAP_SIZE=${thirdparty_jerryscript_bms_task_heap_size}" ] - defines += - [ "JS_TASK_HEAP_SIZE=${thirdparty_jerryscript_js_task_heap_size}" ] + if (jerryscript_enable_external_context == true) { + defines += [ "JERRY_EXTERNAL_CONTEXT=1" ] + } + defines += [ "INPUTJS_BUFFER_SIZE=${jerryscript_inputjs_buffer_size}" ] + defines += [ "SNAPSHOT_BUFFER_SIZE=${jerryscript_snapshot_buffer_size}" ] + defines += [ "BMS_TASK_HEAP_SIZE=${jerryscript_bms_task_heap_size}" ] + defines += [ "JS_TASK_HEAP_SIZE=${jerryscript_js_task_heap_size}" ] cflags = [ "-Wno-unused-function", diff --git a/bundle.json b/bundle.json index 80dff9f91537521f01584e5715fc7ce2fc9206ec..d25665faf5dfe21c3734f7de32c07f476972c174 100644 --- a/bundle.json +++ b/bundle.json @@ -10,15 +10,43 @@ "dirs": {}, "scripts": {}, "component": { - "name": "thirdparty_jerryscript", + "name": "jerryscript", "subsystem": "thirdparty", "syscap": [], "features": [ - "thirdparty_jerryscript_enable_external_context", - "thirdparty_jerryscript_inputjs_buffer_size", - "thirdparty_jerryscript_snapshot_buffer_size", - "thirdparty_jerryscript_bms_task_heap_size", - "thirdparty_jerryscript_js_task_heap_size" + "jerryscript_enable_external_context", + "jerryscript_inputjs_buffer_size", + "jerryscript_snapshot_buffer_size", + "jerryscript_bms_task_heap_size", + "jerryscript_js_task_heap_size", + "jerryscript_jerry_cpointer_32_bit", + "jerryscript_jerry_debugger", + "jerryscript_jerry_gc_limit", + "jerryscript_jerry_line_info", + "jerryscript_jerry_mem_gc_before_each_alloc", + "jerryscript_jerry_parser", + "jerryscript_jerry_parser_dump_byte_code", + "jerryscript_jerry_regexp_dump_byte_code", + "jerryscript_jerry_regexp_strict_mode", + "jerryscript_jerry_stack_limit", + "jerryscript_jerry_system_allocator", + "jerryscript_jerry_valgrind", + "jerryscript_jerry_vm_exec_stop", + "jerryscript_jerry_es2015", + "jerryscript_jerry_es2015_builtin_typedarray", + "jerryscript_jerry_es2015_builtin_set", + "jerryscript_jerry_es2015_builtin_promise", + "jerryscript_jerry_es2015_builtin_proxy", + "jerryscript_jerry_es2015_module_system", + "jerryscript_jerry_es2015_builtin_map", + "jerryscript_jerry_es2015_builtin_weakmap", + "jerryscript_jerry_es2015_builtin_weakset", + "jerryscript_jerry_es2015_builtin_dataview", + "jerryscript_jerry_es2015_builtin_reflect", + "jerryscript_jerry_error_messages", + "jerryscript_jerry_logging", + "jerryscript_jerry_snapshot_exec", + "jerryscript_jerry_snapshot_save" ], "adapted_system_type": [], "rom": "", diff --git a/engine.gni b/engine.gni index 7ee69a24b01136479f8c703e4da94d4009071c3c..c845a1d1f5d4133a6898b3d2959b26829ea1c18d 100644 --- a/engine.gni +++ b/engine.gni @@ -12,11 +12,42 @@ # limitations under the License. declare_args() { - thirdparty_jerryscript_enable_external_context = true - thirdparty_jerryscript_inputjs_buffer_size = 32768 - thirdparty_jerryscript_snapshot_buffer_size = 24576 - thirdparty_jerryscript_bms_task_heap_size = 64 - thirdparty_jerryscript_js_task_heap_size = 64 + jerryscript_enable_external_context = true + jerryscript_inputjs_buffer_size = 32768 + jerryscript_snapshot_buffer_size = 24576 + jerryscript_bms_task_heap_size = 64 + jerryscript_js_task_heap_size = 64 + jerryscript_jerry_cpointer_32_bit = 0 + jerryscript_jerry_debugger = 1 + jerryscript_jerry_gc_limit = 0 + jerryscript_jerry_line_info = 1 + jerryscript_jerry_mem_gc_before_each_alloc = 0 + jerryscript_jerry_parser = 1 + jerryscript_jerry_parser_dump_byte_code = 0 + jerryscript_jerry_regexp_dump_byte_code = 0 + jerryscript_jerry_regexp_strict_mode = 0 + jerryscript_jerry_stack_limit = 0 + jerryscript_jerry_system_allocator = 0 + jerryscript_jerry_valgrind = 0 + jerryscript_jerry_vm_exec_stop = 0 + + # support es6 with limitation + jerryscript_jerry_es2015 = 1 + jerryscript_jerry_es2015_builtin_typedarray = 1 + jerryscript_jerry_es2015_builtin_set = 1 + jerryscript_jerry_es2015_builtin_promise = 1 + jerryscript_jerry_es2015_builtin_proxy = 1 + jerryscript_jerry_es2015_module_system = 1 + jerryscript_jerry_es2015_builtin_map = 1 + jerryscript_jerry_es2015_builtin_weakmap = 0 + jerryscript_jerry_es2015_builtin_weakset = 0 + jerryscript_jerry_es2015_builtin_dataview = 0 + jerryscript_jerry_es2015_builtin_reflect = 0 + + jerryscript_jerry_error_messages = 1 + jerryscript_jerry_logging = 0 + jerryscript_jerry_snapshot_exec = 1 + jerryscript_jerry_snapshot_save = 1 } engine_path = "//third_party/jerryscript" @@ -30,18 +61,3 @@ ext_path = "${engine_path}/jerry-ext" libm_path = "${engine_path}/jerry-libm" port_path = "${engine_path}/jerry-port" - -# support es6 with limitation -es6_support_defines = [ - "JERRY_ES2015=1", - "JERRY_ES2015_BUILTIN_TYPEDARRAY=1", - "JERRY_ES2015_BUILTIN_SET=1", - "JERRY_ES2015_BUILTIN_PROMISE=1", - "JERRY_ES2015_BUILTIN_PROXY=1", - "JERRY_ES2015_MODULE_SYSTEM=1", - "JERRY_ES2015_BUILTIN_MAP=1", - "JERRY_ES2015_BUILTIN_WEAKMAP=0", - "JERRY_ES2015_BUILTIN_WEAKSET=0", - "JERRY_ES2015_BUILTIN_DATAVIEW=0", - "JERRY_ES2015_BUILTIN_REFLECT=0", -] diff --git a/jerry-core/BUILD.gn b/jerry-core/BUILD.gn index 53283ccf339dbfca27a5eed37a1c2e6fafc9bd02..c0d610a0561d19498259f5a5498edafda5be2690 100644 --- a/jerry-core/BUILD.gn +++ b/jerry-core/BUILD.gn @@ -217,13 +217,25 @@ jerry_core_includes = [ if (board_toolchain_type != "iccarm") { jerry_core_defines = [ "JERRY_GLOBAL_HEAP_SIZE=(128)", - "JERRY_ERROR_MESSAGES=1", - "JERRY_LINE_INFO=1", "JERRY_FUNCTION_NAME", "JERRY_FUNCTION_BACKTRACE", "JERRY_STACK_LIMIT=0", ] - jerry_core_defines += es6_support_defines + jerry_core_defines += [ + "JERRY_ERROR_MESSAGES=${jerryscript_jerry_error_messages}", + "JERRY_LINE_INFO=${jerryscript_jerry_line_info}", + "JERRY_ES2015=${jerryscript_jerry_es2015}", + "JERRY_ES2015_BUILTIN_TYPEDARRAY=${jerryscript_jerry_es2015_builtin_typedarray}", + "JERRY_ES2015_BUILTIN_SET=${jerryscript_jerry_es2015_builtin_set}", + "JERRY_ES2015_BUILTIN_PROMISE=${jerryscript_jerry_es2015_builtin_promise}", + "JERRY_ES2015_BUILTIN_PROXY=${jerryscript_jerry_es2015_builtin_proxy}", + "JERRY_ES2015_MODULE_SYSTEM=${jerryscript_jerry_es2015_module_system}", + "JERRY_ES2015_BUILTIN_MAP=${jerryscript_jerry_es2015_builtin_map}", + "JERRY_ES2015_BUILTIN_WEAKMAP=${jerryscript_jerry_es2015_builtin_weakmap}", + "JERRY_ES2015_BUILTIN_WEAKSET=${jerryscript_jerry_es2015_builtin_weakset}", + "JERRY_ES2015_BUILTIN_DATAVIEW=${jerryscript_jerry_es2015_builtin_dataview}", + "JERRY_ES2015_BUILTIN_REFLECT=${jerryscript_jerry_es2015_builtin_reflect}", + ] } else { jerry_core_sources += [ "api/external-context-helpers.c", @@ -237,41 +249,48 @@ if (board_toolchain_type != "iccarm") { ] defines = [ "JERRY_FOR_IAR_CONFIG", - "JERRY_GC_LIMIT=(0)", - "JERRY_CPOINTER_32_BIT=0", - "JERRY_ERROR_MESSAGES=1", - "JERRY_PARSER=1", - "JERRY_LINE_INFO=1", - "JERRY_LOGGING=0", "JERRY_DEBUGGER=0", - "JERRY_MEM_GC_BEFORE_EACH_ALLOC=0", - "JERRY_PARSER_DUMP_BYTE_CODE=0", - "JERRY_REGEXP_STRICT_MODE=0", - "JERRY_REGEXP_DUMP_BYTE_CODE=0", - "JERRY_SNAPSHOT_EXEC=1", - "JERRY_SNAPSHOT_SAVE=1", - "JERRY_SYSTEM_ALLOCATOR=0", - "JERRY_VALGRIND=0", - "JERRY_VM_EXEC_STOP=0", "JERRY_STACK_LIMIT=(8)", "JERRY_IAR_JUPITER", "INPUTJS_BUFFER_SIZE=64*1024", "SNAPSHOT_BUFFER_SIZE=48*1024", "_BSD_SOURCE", ] - defines += es6_support_defines - if (thirdparty_jerryscript_enable_external_context == true) { - defines += [ "JERRY_EXTERNAL_CONTEXT=1" ] - } - defines += - [ "INPUTJS_BUFFER_SIZE=${thirdparty_jerryscript_inputjs_buffer_size}" ] defines += [ - "SNAPSHOT_BUFFER_SIZE=${thirdparty_jerryscript_snapshot_buffer_size}", + "JERRY_GC_LIMIT=${jerryscript_jerry_gc_limit}", + "JERRY_CPOINTER_32_BIT=${jerryscript_jerry_cpointer_32_bit}", + "JERRY_ERROR_MESSAGES=${jerryscript_jerry_error_messages}", + "JERRY_PARSER=${jerryscript_jerry_parser}", + "JERRY_LINE_INFO=${jerryscript_jerry_line_info}", + "JERRY_LOGGING=${jerryscript_jerry_logging}", + "JERRY_MEM_GC_BEFORE_EACH_ALLOC=${jerryscript_jerry_mem_gc_before_each_alloc}", + "JERRY_PARSER_DUMP_BYTE_CODE=${jerryscript_jerry_parser_dump_byte_code}", + "JERRY_REGEXP_STRICT_MODE=${jerryscript_jerry_regexp_strict_mode}", + "JERRY_REGEXP_DUMP_BYTE_CODE=${jerryscript_jerry_regexp_dump_byte_code}", + "JERRY_SNAPSHOT_EXEC=${jerryscript_jerry_snapshot_exec}", + "JERRY_SNAPSHOT_SAVE=${jerryscript_jerry_snapshot_save}", + "JERRY_SYSTEM_ALLOCATOR=${jerryscript_jerry_system_allocator}", + "JERRY_VALGRIND=${jerryscript_jerry_valgrind}", + "JERRY_VM_EXEC_STOP=${jerryscript_jerry_vm_exec_stop}", + "JERRY_ES2015=${jerryscript_jerry_es2015}", + "JERRY_ES2015_BUILTIN_TYPEDARRAY=${jerryscript_jerry_es2015_builtin_typedarray}", + "JERRY_ES2015_BUILTIN_SET=${jerryscript_jerry_es2015_builtin_set}", + "JERRY_ES2015_BUILTIN_PROMISE=${jerryscript_jerry_es2015_builtin_promise}", + "JERRY_ES2015_BUILTIN_PROXY=${jerryscript_jerry_es2015_builtin_proxy}", + "JERRY_ES2015_MODULE_SYSTEM=${jerryscript_jerry_es2015_module_system}", + "JERRY_ES2015_BUILTIN_MAP=${jerryscript_jerry_es2015_builtin_map}", + "JERRY_ES2015_BUILTIN_WEAKMAP=${jerryscript_jerry_es2015_builtin_weakmap}", + "JERRY_ES2015_BUILTIN_WEAKSET=${jerryscript_jerry_es2015_builtin_weakset}", + "JERRY_ES2015_BUILTIN_DATAVIEW=${jerryscript_jerry_es2015_builtin_dataview}", + "JERRY_ES2015_BUILTIN_REFLECT=${jerryscript_jerry_es2015_builtin_reflect}", ] - defines += - [ "BMS_TASK_HEAP_SIZE=${thirdparty_jerryscript_bms_task_heap_size}" ] - defines += - [ "JS_TASK_HEAP_SIZE=${thirdparty_jerryscript_js_task_heap_size}" ] + if (jerryscript_enable_external_context == true) { + defines += [ "JERRY_EXTERNAL_CONTEXT=1" ] + } + defines += [ "INPUTJS_BUFFER_SIZE=${jerryscript_inputjs_buffer_size}" ] + defines += [ "SNAPSHOT_BUFFER_SIZE=${jerryscript_snapshot_buffer_size}" ] + defines += [ "BMS_TASK_HEAP_SIZE=${jerryscript_bms_task_heap_size}" ] + defines += [ "JS_TASK_HEAP_SIZE=${jerryscript_js_task_heap_size}" ] include_dirs = jerry_core_includes include_dirs += [ diff --git a/jerry-ext/BUILD.gn b/jerry-ext/BUILD.gn index 8afc631f2f26c6db1b88ff7dce6ef48f4d5a554b..6f899d45a137f138b60eb5983776f6093dad1fe4 100644 --- a/jerry-ext/BUILD.gn +++ b/jerry-ext/BUILD.gn @@ -59,40 +59,47 @@ if (board_toolchain_type == "iccarm") { ] defines = [ "JERRY_FOR_IAR_CONFIG", - "JERRY_GC_LIMIT=(0)", - "JERRY_CPOINTER_32_BIT=0", - "JERRY_ERROR_MESSAGES=1", - "JERRY_PARSER=1", - "JERRY_LINE_INFO=1", - "JERRY_LOGGING=0", "JERRY_DEBUGGER=0", - "JERRY_MEM_GC_BEFORE_EACH_ALLOC=0", - "JERRY_PARSER_DUMP_BYTE_CODE=0", - "JERRY_REGEXP_STRICT_MODE=0", - "JERRY_REGEXP_DUMP_BYTE_CODE=0", - "JERRY_SNAPSHOT_EXEC=1", - "JERRY_SNAPSHOT_SAVE=1", - "JERRY_SYSTEM_ALLOCATOR=0", - "JERRY_VALGRIND=0", - "JERRY_VM_EXEC_STOP=0", "JERRY_STACK_LIMIT=(8)", "JERRY_IAR_JUPITER", "INPUTJS_BUFFER_SIZE=64*1024", "SNAPSHOT_BUFFER_SIZE=48*1024", ] - defines += es6_support_defines - if (thirdparty_jerryscript_enable_external_context == true) { - defines += [ "JERRY_EXTERNAL_CONTEXT=1" ] - } - defines += - [ "INPUTJS_BUFFER_SIZE=${thirdparty_jerryscript_inputjs_buffer_size}" ] defines += [ - "SNAPSHOT_BUFFER_SIZE=${thirdparty_jerryscript_snapshot_buffer_size}", + "JERRY_GC_LIMIT=${jerryscript_jerry_gc_limit}", + "JERRY_CPOINTER_32_BIT=${jerryscript_jerry_cpointer_32_bit}", + "JERRY_ERROR_MESSAGES=${jerryscript_jerry_error_messages}", + "JERRY_PARSER=${jerryscript_jerry_parser}", + "JERRY_LINE_INFO=${jerryscript_jerry_line_info}", + "JERRY_LOGGING=${jerryscript_jerry_logging}", + "JERRY_MEM_GC_BEFORE_EACH_ALLOC=${jerryscript_jerry_mem_gc_before_each_alloc}", + "JERRY_PARSER_DUMP_BYTE_CODE=${jerryscript_jerry_parser_dump_byte_code}", + "JERRY_REGEXP_STRICT_MODE=${jerryscript_jerry_regexp_strict_mode}", + "JERRY_REGEXP_DUMP_BYTE_CODE=${jerryscript_jerry_regexp_dump_byte_code}", + "JERRY_SNAPSHOT_EXEC=${jerryscript_jerry_snapshot_exec}", + "JERRY_SNAPSHOT_SAVE=${jerryscript_jerry_snapshot_save}", + "JERRY_SYSTEM_ALLOCATOR=${jerryscript_jerry_system_allocator}", + "JERRY_VALGRIND=${jerryscript_jerry_valgrind}", + "JERRY_VM_EXEC_STOP=${jerryscript_jerry_vm_exec_stop}", + "JERRY_ES2015=${jerryscript_jerry_es2015}", + "JERRY_ES2015_BUILTIN_TYPEDARRAY=${jerryscript_jerry_es2015_builtin_typedarray}", + "JERRY_ES2015_BUILTIN_SET=${jerryscript_jerry_es2015_builtin_set}", + "JERRY_ES2015_BUILTIN_PROMISE=${jerryscript_jerry_es2015_builtin_promise}", + "JERRY_ES2015_BUILTIN_PROXY=${jerryscript_jerry_es2015_builtin_proxy}", + "JERRY_ES2015_MODULE_SYSTEM=${jerryscript_jerry_es2015_module_system}", + "JERRY_ES2015_BUILTIN_MAP=${jerryscript_jerry_es2015_builtin_map}", + "JERRY_ES2015_BUILTIN_WEAKMAP=${jerryscript_jerry_es2015_builtin_weakmap}", + "JERRY_ES2015_BUILTIN_WEAKSET=${jerryscript_jerry_es2015_builtin_weakset}", + "JERRY_ES2015_BUILTIN_DATAVIEW=${jerryscript_jerry_es2015_builtin_dataview}", + "JERRY_ES2015_BUILTIN_REFLECT=${jerryscript_jerry_es2015_builtin_reflect}", ] - defines += - [ "BMS_TASK_HEAP_SIZE=${thirdparty_jerryscript_bms_task_heap_size}" ] - defines += - [ "JS_TASK_HEAP_SIZE=${thirdparty_jerryscript_js_task_heap_size}" ] + if (jerryscript_enable_external_context == true) { + defines += [ "JERRY_EXTERNAL_CONTEXT=1" ] + } + defines += [ "INPUTJS_BUFFER_SIZE=${jerryscript_inputjs_buffer_size}" ] + defines += [ "SNAPSHOT_BUFFER_SIZE=${jerryscript_snapshot_buffer_size}" ] + defines += [ "BMS_TASK_HEAP_SIZE=${jerryscript_bms_task_heap_size}" ] + defines += [ "JS_TASK_HEAP_SIZE=${jerryscript_js_task_heap_size}" ] include_dirs = jerry_ext_include_dirs include_dirs += [ diff --git a/jerry-port/default/BUILD.gn b/jerry-port/default/BUILD.gn index e3f58f53f90fb16de2e21cc79b94e526b88cb287..5d233553a33df5ca3b0cb2075f818ae7c467f7a1 100644 --- a/jerry-port/default/BUILD.gn +++ b/jerry-port/default/BUILD.gn @@ -44,40 +44,47 @@ if (board_toolchain_type == "iccarm") { ] defines = [ "JERRY_FOR_IAR_CONFIG", - "JERRY_GC_LIMIT=(0)", - "JERRY_CPOINTER_32_BIT=0", - "JERRY_ERROR_MESSAGES=1", - "JERRY_PARSER=1", - "JERRY_LINE_INFO=1", - "JERRY_LOGGING=0", "JERRY_DEBUGGER=0", - "JERRY_MEM_GC_BEFORE_EACH_ALLOC=0", - "JERRY_PARSER_DUMP_BYTE_CODE=0", - "JERRY_REGEXP_STRICT_MODE=0", - "JERRY_REGEXP_DUMP_BYTE_CODE=0", - "JERRY_SNAPSHOT_EXEC=1", - "JERRY_SNAPSHOT_SAVE=1", - "JERRY_SYSTEM_ALLOCATOR=0", - "JERRY_VALGRIND=0", - "JERRY_VM_EXEC_STOP=0", "JERRY_STACK_LIMIT=(8)", "JERRY_IAR_JUPITER", "INPUTJS_BUFFER_SIZE=64*1024", "SNAPSHOT_BUFFER_SIZE=48*1024", ] - defines += es6_support_defines - if (thirdparty_jerryscript_enable_external_context == true) { - defines += [ "JERRY_EXTERNAL_CONTEXT=1" ] - } - defines += - [ "INPUTJS_BUFFER_SIZE=${thirdparty_jerryscript_inputjs_buffer_size}" ] defines += [ - "SNAPSHOT_BUFFER_SIZE=${thirdparty_jerryscript_snapshot_buffer_size}", + "JERRY_GC_LIMIT=${jerryscript_jerry_gc_limit}", + "JERRY_CPOINTER_32_BIT=${jerryscript_jerry_cpointer_32_bit}", + "JERRY_ERROR_MESSAGES=${jerryscript_jerry_error_messages}", + "JERRY_PARSER=${jerryscript_jerry_parser}", + "JERRY_LINE_INFO=${jerryscript_jerry_line_info}", + "JERRY_LOGGING=${jerryscript_jerry_logging}", + "JERRY_MEM_GC_BEFORE_EACH_ALLOC=${jerryscript_jerry_mem_gc_before_each_alloc}", + "JERRY_PARSER_DUMP_BYTE_CODE=${jerryscript_jerry_parser_dump_byte_code}", + "JERRY_REGEXP_STRICT_MODE=${jerryscript_jerry_regexp_strict_mode}", + "JERRY_REGEXP_DUMP_BYTE_CODE=${jerryscript_jerry_regexp_dump_byte_code}", + "JERRY_SNAPSHOT_EXEC=${jerryscript_jerry_snapshot_exec}", + "JERRY_SNAPSHOT_SAVE=${jerryscript_jerry_snapshot_save}", + "JERRY_SYSTEM_ALLOCATOR=${jerryscript_jerry_system_allocator}", + "JERRY_VALGRIND=${jerryscript_jerry_valgrind}", + "JERRY_VM_EXEC_STOP=${jerryscript_jerry_vm_exec_stop}", + "JERRY_ES2015=${jerryscript_jerry_es2015}", + "JERRY_ES2015_BUILTIN_TYPEDARRAY=${jerryscript_jerry_es2015_builtin_typedarray}", + "JERRY_ES2015_BUILTIN_SET=${jerryscript_jerry_es2015_builtin_set}", + "JERRY_ES2015_BUILTIN_PROMISE=${jerryscript_jerry_es2015_builtin_promise}", + "JERRY_ES2015_BUILTIN_PROXY=${jerryscript_jerry_es2015_builtin_proxy}", + "JERRY_ES2015_MODULE_SYSTEM=${jerryscript_jerry_es2015_module_system}", + "JERRY_ES2015_BUILTIN_MAP=${jerryscript_jerry_es2015_builtin_map}", + "JERRY_ES2015_BUILTIN_WEAKMAP=${jerryscript_jerry_es2015_builtin_weakmap}", + "JERRY_ES2015_BUILTIN_WEAKSET=${jerryscript_jerry_es2015_builtin_weakset}", + "JERRY_ES2015_BUILTIN_DATAVIEW=${jerryscript_jerry_es2015_builtin_dataview}", + "JERRY_ES2015_BUILTIN_REFLECT=${jerryscript_jerry_es2015_builtin_reflect}", ] - defines += - [ "BMS_TASK_HEAP_SIZE=${thirdparty_jerryscript_bms_task_heap_size}" ] - defines += - [ "JS_TASK_HEAP_SIZE=${thirdparty_jerryscript_js_task_heap_size}" ] + if (jerryscript_enable_external_context == true) { + defines += [ "JERRY_EXTERNAL_CONTEXT=1" ] + } + defines += [ "INPUTJS_BUFFER_SIZE=${jerryscript_inputjs_buffer_size}" ] + defines += [ "SNAPSHOT_BUFFER_SIZE=${jerryscript_snapshot_buffer_size}" ] + defines += [ "BMS_TASK_HEAP_SIZE=${jerryscript_bms_task_heap_size}" ] + defines += [ "JS_TASK_HEAP_SIZE=${jerryscript_js_task_heap_size}" ] include_dirs = jerry_port_default_include_dirs include_dirs += [ diff --git a/tests/unit-core/BUILD.gn b/tests/unit-core/BUILD.gn index 54c64ded48ba7e7fcc53c415d11ad751273946ba..b14804fa7741d91320665bb8dea3a11ec9734f31 100755 --- a/tests/unit-core/BUILD.gn +++ b/tests/unit-core/BUILD.gn @@ -102,7 +102,7 @@ host_unittest_action("TddTest") { "JERRY_REF_TRACKER", "JERRY_ES2015_BUILTIN_TYPEDARRAY=1", ] - if (thirdparty_jerryscript_enable_external_context == true) { + if (jerryscript_enable_external_context == true) { defines += [ "JERRY_EXTERNAL_CONTEXT=1" ] } sources = [