From 540cae921aac9e8272239c03a9c18cc3c5359574 Mon Sep 17 00:00:00 2001 From: wengchangcheng Date: Thu, 13 Oct 2022 16:10:39 +0800 Subject: [PATCH] =?UTF-8?q?Descriptor:=20=E9=83=A8=E4=BB=B6=E5=8C=96?= =?UTF-8?q?=E6=95=B4=E6=94=B9=20ark=20->=20arkcompiler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Details: 部件化整改 ark -> arkcompiler Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/I5VJMH Signed-off-by: wengchangcheng Change-Id: I2ed3881d0670ea8606db1d6e5b851b645f29e0f2 --- BUILD.gn | 8 ++++++++ build/README.md | 4 ++-- build/compile_script/ark.py | 4 ++-- build/config/BUILDCONFIG.gn | 2 +- bundle.json | 4 ++-- inspector/BUILD.gn | 2 +- test/test_helper.gni | 4 ++-- tooling/BUILD.gn | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 1ab08af3..b76254e9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -143,3 +143,11 @@ group("ark_toolchain_host_unittest") { deps += [ "//arkcompiler/toolchain/tooling/test:host_unittest" ] } } + +group("ark_js_host_unittest") { + testonly = true + deps = [ + "//arkcompiler/ets_runtime:ark_runtime_host_unittest", + "//arkcompiler/toolchain:ark_toolchain_host_unittest", + ] +} diff --git a/build/README.md b/build/README.md index a930d7a8..309a62af 100644 --- a/build/README.md +++ b/build/README.md @@ -37,11 +37,11 @@ python ark.py x64.release ``` ### step2 将js文件转换为abc文件 ``` -./out/x64.release/ark/ark/es2abc test.js +./out/x64.release/arkcompiler/ets_frontend/es2abc test.js ``` ### step3 执行生成的abc文件 ``` -LD_LIBRARY_PATH=out/x64.release:prebuilts/clang/ohos/linux-x86_64/llvm/lib ./out/x64.release/ark/ark_js_runtime/ark_js_vm test.abc +LD_LIBRARY_PATH=out/x64.release:prebuilts/clang/ohos/linux-x86_64/llvm/lib ./out/x64.release/arkcompiler/ets_runtime/ark_js_vm test.abc ``` ### 执行262测试套 ``` diff --git a/build/compile_script/ark.py b/build/compile_script/ark.py index 68331b48..39031f76 100644 --- a/build/compile_script/ark.py +++ b/build/compile_script/ark.py @@ -196,7 +196,7 @@ def RunTest(template): test = template[5] test_dir = arch + "." + mode test262_code = '''cd ets_frontend - python3 test262/run_test262.py --es2021 all --timeout 180000 --libs-dir ../out/%s:../prebuilts/clang/ohos/linux-x86_64/llvm/lib --ark-tool=../out/%s/ark/ark_js_runtime/ark_js_vm --ark-frontend-binary=../out/%s/clang_x64/ark/ark/es2abc --merge-abc-binary=../out/%s/clang_x64/ark/ark/merge_abc --ark-frontend=es2panda + python3 test262/run_test262.py --es2021 all --timeout 180000 --libs-dir ../out/%s:../prebuilts/clang/ohos/linux-x86_64/llvm/lib --ark-tool=../out/%s/arkcompiler/ets_runtime/ark_js_vm --ark-frontend-binary=../out/%s/clang_x64/arkcompiler/ets_frontend/es2abc --merge-abc-binary=../out/%s/clang_x64/arkcompiler/ets_frontend/merge_abc --ark-frontend=es2panda ''' % (test_dir, test_dir, test_dir, test_dir) if ("-test262" == test): print("=== come to test ===") @@ -220,4 +220,4 @@ def Main(argvs): if __name__ == "__main__": - sys.exit(Main(sys.argv[1:])) \ No newline at end of file + sys.exit(Main(sys.argv[1:])) diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index 10a7d3f8..e92dc231 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -137,4 +137,4 @@ set_defaults("shared_library") { set_defaults("source_set") { configs = default_compiler_configs -} \ No newline at end of file +} diff --git a/bundle.json b/bundle.json index e735a971..ccd800a8 100644 --- a/bundle.json +++ b/bundle.json @@ -1,7 +1,7 @@ { "name": "@ohos/arkcompiler_toolchain", "version": "3.1", - "description": "ark compiler toolchain", + "description": "arkcompiler toolchain", "homePage": "https://gitee.com/openharmony", "license": "Apache Liscense 2.0", "publishAs": "code-segment", @@ -12,7 +12,7 @@ }, "component": { "name": "toolchain", - "subsystem": "ark", + "subsystem": "arkcompiler", "syscap": [], "features": [], "adapted_system_type": [ diff --git a/inspector/BUILD.gn b/inspector/BUILD.gn index b2b0a511..0e6f4952 100644 --- a/inspector/BUILD.gn +++ b/inspector/BUILD.gn @@ -81,6 +81,6 @@ ohos_shared_library("ark_debugger") { configs = [ ":ark_debugger_config" ] - subsystem_name = "ark" part_name = "toolchain" + subsystem_name = "arkcompiler" } diff --git a/test/test_helper.gni b/test/test_helper.gni index 85064946..e9a4c739 100644 --- a/test/test_helper.gni +++ b/test/test_helper.gni @@ -53,8 +53,8 @@ template("host_unittest_action") { "--expect-output", "0", "--env-path", - rebase_path(_root_out_dir_) + "/ark/ark:" + rebase_path(_root_out_dir_) + - "/ark/ark_js_runtime:" + rebase_path(_root_out_dir_) + "/test/test:" + + rebase_path(_root_out_dir_) + "/arkcompiler/ets_runtime:" + + rebase_path(_root_out_dir_) + "/test/test:" + rebase_path(_root_out_dir_) + "/${_icu_path_}:" + rebase_path("//prebuilts/clang/ohos/linux-x86_64/llvm/lib/"), "--timeout-limit", diff --git a/tooling/BUILD.gn b/tooling/BUILD.gn index 8031de1f..3cfa4e16 100644 --- a/tooling/BUILD.gn +++ b/tooling/BUILD.gn @@ -114,7 +114,7 @@ ohos_shared_library("libark_ecma_debugger") { relative_install_dir = "ark" } part_name = "toolchain" - subsystem_name = "ark" + subsystem_name = "arkcompiler" } source_set("libark_ecma_debugger_test_set") { -- Gitee