diff --git a/README.md b/README.md index 4838e2191a7673ee2954d215228c574a608e6d24..0e578500b8a432dcc0c382984b4992d4908af14e 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ $ ./build.sh --product-name hispark_taurus_standard --build-target ets_frontend_ convert JS to ARK bytecode via es2abc ``` -$ cd out/hispark_taurus/clang_x64/ark/ark/ +$ cd out/hispark_taurus/clang_x64/arkcompiler/ets_frontend/ $ ./es2abc [options] file.js ``` @@ -214,7 +214,7 @@ Install `node` and `npm` convert JS to ARK bytecode ``` -$ cd out/hispark_taurus/clang_x64/ark/ark/build +$ cd out/hispark_taurus/clang_x64/arkcompiler/ets_frontend/build $ npm install $ node --expose-gc src/index.js [options] file.js ``` @@ -436,7 +436,7 @@ If no parameter is specified for **\[options\]**, an ARK binary file is generat -For more information, please see: [ARK-Runtime-Usage-Guide](https://gitee.com/openharmony/ark_js_runtime/blob/master/docs/ARK-Runtime-Usage-Guide.md). +For more information, please see: [ARK-Runtime-Usage-Guide](https://gitee.com/openharmony/arkcompiler_ets_runtime/blob/master/docs/ARK-Runtime-Usage-Guide.md). ## Repositories Involved diff --git a/README_zh.md b/README_zh.md index 42ad1c14649dd6b9425e90b5479e6dddbbc30c77..68d332d761a5b1ea716efbcb2c97310a0cc940fa 100644 --- a/README_zh.md +++ b/README_zh.md @@ -59,7 +59,7 @@ $ ./build.sh --product-name hispark_taurus_standard --build-target ets_frontend_ 使用ets_frontend组件下的es2abc可执行文件将JavaScript文件转换为方舟字节码文件 ``` -$ cd out/hispark_taurus/clang_x64/ark/ark/ +$ cd out/hispark_taurus/clang_x64/arkcompiler/ets_frontend/ $ ./es2abc [options] file.js ``` @@ -214,7 +214,7 @@ $ ./es2abc [options] file.js 使用ets_frontend组件将JavaScript文件转换为方舟字节码文件 ``` -$ cd out/hispark_taurus/clang_x64/ark/ark/build +$ cd out/hispark_taurus/clang_x64/arkcompiler/ets_frontend/build $ npm install $ node --expose-gc src/index.js [options] file.js ``` @@ -437,7 +437,7 @@ $ node --expose-gc src/index.js [options] file.js -更多使用说明请参考：[方舟运行时使用指南](https://gitee.com/openharmony/ark_js_runtime/blob/master/docs/ARK-Runtime-Usage-Guide-zh.md) +更多使用说明请参考：[方舟运行时使用指南](https://gitee.com/openharmony/arkcompiler_ets_runtime/blob/master/docs/ARK-Runtime-Usage-Guide-zh.md) ## 相关仓 diff --git a/bundle.json b/bundle.json index 488d3769fa8e0a162d0773f9bf015f25b05cc8bf..2614ab0d5f69016febe7c830e4e038435325b427 100644 --- a/bundle.json +++ b/bundle.json @@ -8,7 +8,7 @@ }, "component": { "name": "ets_frontend", - "subsystem": "ark", + "subsystem": "arkcompiler", "syscap": [], "features": [], "adapted_system_type": [ diff --git a/es2panda/BUILD.gn b/es2panda/BUILD.gn index 119844163f51d80f7ce1e9c6ea27686cab361346..075eedd3e83fda04fc59ca1a6d4c77b847704ba1 100644 --- a/es2panda/BUILD.gn +++ b/es2panda/BUILD.gn @@ -456,24 +456,25 @@ ohos_executable("es2panda") { } output_name = "es2abc" - install_enable = true - subsystem_name = "ark" + install_enable = false + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } if (is_linux) { ohos_copy("es2abc_build") { deps = [ ":es2panda" ] - sources = [ "${root_out_dir}/ark/ark/es2abc" ] + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/es2abc" ] outputs = [ "${target_out_dir}/es2abc-tmp" ] - module_source_dir = "${root_out_dir}/ark/ark" + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend" module_install_name = "es2abc" } ohos_copy("es2abc_build_ets") { deps = [ ":es2panda" ] - sources = [ "${root_out_dir}/ark/ark/es2abc" ] - outputs = [ "${root_out_dir}/ark/ark/es2abc-ets" ] - module_source_dir = "${root_out_dir}/ark/ark" + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/es2abc" ] + outputs = [ "${root_out_dir}/arkcompiler/ets_frontend/es2abc-ets" ] + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend" module_install_name = "es2abc" } } @@ -481,17 +482,17 @@ if (is_linux) { if (is_mingw) { ohos_copy("es2abc_build_win") { deps = [ ":es2panda" ] - sources = [ "${root_out_dir}/ark/ark/es2abc.exe" ] + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/es2abc.exe" ] outputs = [ "${target_out_dir}/es2abc-tmp" ] - module_source_dir = "${root_out_dir}/ark/ark" + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend" module_install_name = "es2abc.exe" } ohos_copy("es2abc_build_win_ets") { deps = [ ":es2panda" ] - sources = [ "${root_out_dir}/ark/ark/es2abc.exe" ] - outputs = [ "${root_out_dir}/ark/ark/es2abc-win-ets" ] - module_source_dir = "${root_out_dir}/ark/ark" + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/es2abc.exe" ] + outputs = [ "${root_out_dir}/arkcompiler/ets_frontend/es2abc-win-ets" ] + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend" module_install_name = "es2abc.exe" } } @@ -499,17 +500,17 @@ if (is_mingw) { if (is_mac) { ohos_copy("es2abc_build_mac") { deps = [ ":es2panda" ] - sources = [ "${root_out_dir}/ark/ark/es2abc" ] + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/es2abc" ] outputs = [ "${target_out_dir}/es2abc-tmp" ] - module_source_dir = "${root_out_dir}/ark/ark" + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend" module_install_name = "es2abc" } ohos_copy("es2abc_build_mac_ets") { deps = [ ":es2panda" ] - sources = [ "${root_out_dir}/ark/ark/es2abc" ] - outputs = [ "${root_out_dir}/ark/ark/es2abc-mac-ets" ] - module_source_dir = "${root_out_dir}/ark/ark" + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/es2abc" ] + outputs = [ "${root_out_dir}/arkcompiler/ets_frontend/es2abc-mac-ets" ] + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend" module_install_name = "es2abc" } } @@ -521,7 +522,7 @@ ohos_copy("build_es2abc_for_hap") { es2abc_target_out_dir = get_label_info(":es2panda_build($host_toolchain)", "target_out_dir") - sources = [ "${es2abc_root_out_dir}/ark/ark/es2abc" ] + sources = [ "${es2abc_root_out_dir}/arkcompiler/ets_frontend/es2abc" ] outputs = [ "${es2abc_target_out_dir}/build/bin/es2abc" ] } diff --git a/es2panda/es2abc_config.gni b/es2panda/es2abc_config.gni index 008466806f5076e43604f814f5fece83d3b0c401..5c1786c68a038ff6e45bf9f2836d53f731ce91b7 100644 --- a/es2panda/es2abc_config.gni +++ b/es2panda/es2abc_config.gni @@ -38,7 +38,7 @@ if (host_toolchain == toolchain_mac) { get_label_info("$es2abc_root:es2panda($toolchain_linux)", "root_out_dir") es2abc_build_deps = [ "$es2abc_root:es2panda($toolchain_linux)" ] } -es2abc_build_path = es2abc_out_root + "/ark/ark" +es2abc_build_path = es2abc_out_root + "/arkcompiler/ets_frontend" # Generate abc. # diff --git a/es2panda/test/BUILD.gn b/es2panda/test/BUILD.gn index 83e24f81f70d9e560b3ff64579a587c95a291246..e3753c2c8e0027fb88a4846319298c18cdbeb353 100644 --- a/es2panda/test/BUILD.gn +++ b/es2panda/test/BUILD.gn @@ -51,7 +51,7 @@ action("es2abc_compiler_tests") { host_jsvm_target = "${js_root}/ecmascript/js_vm:ark_js_vm(${host_toolchain})" root_out_dir = get_label_info(host_jsvm_target, "root_out_dir") - ark_js_runtime_dir = rebase_path("${root_out_dir}/ark/ark_js_runtime") + ark_js_runtime_dir = rebase_path("${root_out_dir}/arkcompiler/ets_runtime") if (is_standard_system) { icu_path = "thirdparty/icu" diff --git a/legacy_bin/BUILD.gn b/legacy_bin/BUILD.gn index c035460ee8cd11c9e20534ff7c4ff11af740b04b..c8e5856335cd1aeaf036f677b97e11050437e568 100644 --- a/legacy_bin/BUILD.gn +++ b/legacy_bin/BUILD.gn @@ -16,121 +16,145 @@ import("//build/ohos.gni") # for js-loader ohos_prebuilt_executable("js_js2abc_api8_linux") { source = "./api8/bin/linux/js2abc" - subsystem_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_executable("js_js2abc_api8_win") { source = "./api8/bin/win/js2abc.exe" - subsystem_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_executable("js_js2abc_api8_mac") { source = "./api8/bin/mac/js2abc" - subsystem_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("js_ts2abc_api8_linux") { source = "./api8/src/index.js" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("js_ts2abc_api8_win") { source = "./api8/src/index.js" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("js_ts2abc_api8_mac") { source = "./api8/src/index.js" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("js_package_api8_linux") { source = "./api8/package.json" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("js_package_api8_win") { source = "./api8/package.json" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("js_package_api8_mac") { source = "./api8/package.json" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("js_package-lock_api8_linux") { source = "./api8/package-lock.json" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("js_package-lock_api8_win") { source = "./api8/package-lock.json" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("js_package-lock_api8_mac") { source = "./api8/package-lock.json" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } # for ets-loader ohos_prebuilt_executable("ets_js2abc_api8_linux") { source = "./api8/bin/linux/js2abc" - subsystem_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_executable("ets_js2abc_api8_win") { source = "./api8/bin/win/js2abc.exe" - subsystem_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_executable("ets_js2abc_api8_mac") { source = "./api8/bin/mac/js2abc" - subsystem_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("ets_ts2abc_api8_linux") { source = "./api8/src/index.js" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("ets_ts2abc_api8_win") { source = "./api8/src/index.js" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("ets_ts2abc_api8_mac") { source = "./api8/src/index.js" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("ets_package_api8_linux") { source = "./api8/package.json" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("ets_package_api8_win") { source = "./api8/package.json" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("ets_package_api8_mac") { source = "./api8/package.json" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("ets_package-lock_api8_linux") { source = "./api8/package-lock.json" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("ets_package-lock_api8_win") { source = "./api8/package-lock.json" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_prebuilt_etc("ets_package-lock_api8_mac") { source = "./api8/package-lock.json" - part_name = "ark" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } diff --git a/merge_abc/BUILD.gn b/merge_abc/BUILD.gn index 24b6ce535165a334874bcadd18f69ea62deb5379..3b928ff1c4e7d3f99f092d8847622e688da1ae1c 100644 --- a/merge_abc/BUILD.gn +++ b/merge_abc/BUILD.gn @@ -212,24 +212,25 @@ ohos_executable("merge_abc") { } output_name = "merge_abc" - install_enable = true - subsystem_name = "ark" + install_enable = false + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } if (is_linux) { ohos_copy("merge_abc_build") { deps = [ ":merge_abc" ] - sources = [ "${root_out_dir}/ark/ark/merge_abc" ] + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/merge_abc" ] outputs = [ "${target_out_dir}/merge_abc-tmp" ] - module_source_dir = "${root_out_dir}/ark/ark" + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend" module_install_name = "merge_abc" } ohos_copy("merge_abc_build_ets") { deps = [ ":merge_abc" ] - sources = [ "${root_out_dir}/ark/ark/merge_abc" ] - outputs = [ "${root_out_dir}/ark/ark/merge_abc-ets" ] - module_source_dir = "${root_out_dir}/ark/ark" + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/merge_abc" ] + outputs = [ "${root_out_dir}/arkcompiler/ets_frontend/merge_abc-ets" ] + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend" module_install_name = "merge_abc" } } @@ -237,17 +238,17 @@ if (is_linux) { if (is_mingw) { ohos_copy("merge_abc_build_win") { deps = [ ":merge_abc" ] - sources = [ "${root_out_dir}/ark/ark/merge_abc.exe" ] + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/merge_abc.exe" ] outputs = [ "${target_out_dir}/merge_abc-tmp" ] - module_source_dir = "${root_out_dir}/ark/ark" + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend" module_install_name = "merge_abc.exe" } ohos_copy("merge_abc_build_win_ets") { deps = [ ":merge_abc" ] - sources = [ "${root_out_dir}/ark/ark/merge_abc.exe" ] - outputs = [ "${root_out_dir}/ark/ark/merge_abc-win-ets" ] - module_source_dir = "${root_out_dir}/ark/ark" + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/merge_abc.exe" ] + outputs = [ "${root_out_dir}/arkcompiler/ets_frontend/merge_abc-win-ets" ] + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend" module_install_name = "merge_abc.exe" } } @@ -255,17 +256,17 @@ if (is_mingw) { if (is_mac) { ohos_copy("merge_abc_build_mac") { deps = [ ":merge_abc" ] - sources = [ "${root_out_dir}/ark/ark/merge_abc" ] + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/merge_abc" ] outputs = [ "${target_out_dir}/merge_abc-tmp" ] - module_source_dir = "${root_out_dir}/ark/ark" + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend" module_install_name = "merge_abc" } ohos_copy("merge_abc_build_mac_ets") { deps = [ ":merge_abc" ] - sources = [ "${root_out_dir}/ark/ark/merge_abc" ] - outputs = [ "${root_out_dir}/ark/ark/merge_abc-mac-ets" ] - module_source_dir = "${root_out_dir}/ark/ark" + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/merge_abc" ] + outputs = [ "${root_out_dir}/arkcompiler/ets_frontend/merge_abc-mac-ets" ] + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend" module_install_name = "merge_abc" } } diff --git a/test262/README.md b/test262/README.md index 8259b92e0c9984f0d8f55a44a9e3523e0fc4b57b..b419165cf511daee3778034188c9b3bc0de12548 100644 --- a/test262/README.md +++ b/test262/README.md @@ -113,7 +113,7 @@ zgy@lfgphicprd23154:/home/share/OpenHarmony2.0_20210604/ark/ts2abc$ python3 -B t Wait a moment.......... -07-30 16:56:03.857383 D:>>> command: npm install | dir: /home/share/OpenHarmony2.0_20210604/out/ohos-arm-release/clang_x64/ark/ark/build/src/.. +07-30 16:56:03.857383 D:>>> command: npm install | dir: /home/share/OpenHarmony2.0_20210604/out/ohos-arm-release/clang_x64/arkcompiler/ets_frontend/build/src/.. npm WARN ts2panda@1.0.0 No description npm WARN ts2panda@1.0.0 No repository field. npm WARN ts2panda@1.0.0 No license field. @@ -145,7 +145,7 @@ Test command: test262/harness/bin/run.js --hostType=panda --hostPath=python3 - --hostArgs='-B test262/run_sunspider.py --ark-tool=/home/share/OpenHarmony2.0_20210604/out/ohos-arm-release/clang_x64/ark/ark/ark_js_vm --ark-frontend-tool=/home/share/OpenHarmony2.0_20210604/out/ohos-arm-release/clang_x64/ark/ark/build/src/index.js --libs-dir=/home/share/OpenHarmony2.0_20210604/out/ohos-arm-release/clang_x64/ark/ark:/home/share/OpenHarmony2.0_20210604/out/ohos-arm-release/clang_x64/global/i18n_standard:/home/share/OpenHarmony2.0_20210604/prebuilts/clang/ohos/linux-x86_64/llvm/lib/ --ark-frontend=ts2panda ' + --hostArgs='-B test262/run_sunspider.py --ark-tool=/home/share/OpenHarmony2.0_20210604/out/ohos-arm-release/clang_x64/arkcompiler/ets_runtime/ark_js_vm --ark-frontend-tool=/home/share/OpenHarmony2.0_20210604/out/ohos-arm-release/clang_x64/arkcompiler/ets_frontend/build/src/index.js --libs-dir=/home/share/OpenHarmony2.0_20210604/out/ohos-arm-release/clang_x64/arkcompiler/ets_runtime:/home/share/OpenHarmony2.0_20210604/out/ohos-arm-release/clang_x64/global/i18n_standard:/home/share/OpenHarmony2.0_20210604/prebuilts/clang/ohos/linux-x86_64/llvm/lib/ --ark-frontend=ts2panda ' --threads=15 --mode=only strict mode --timeout=60000 diff --git a/test262/config.py b/test262/config.py index 7e3cb5068c6e460d079fc7504a28b5b188d6eb3d..e58a30fa51352ae1b0d0ba1ef8f349352eed6947 100755 --- a/test262/config.py +++ b/test262/config.py @@ -30,10 +30,10 @@ BASE_OUT_DIR = os.path.join("out", "test262") CUR_FILE_DIR = os.path.dirname(__file__) CODE_ROOT = os.path.abspath(os.path.join(CUR_FILE_DIR, "../../..")) -ARK_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/ark/ark" +ARK_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/arkcompiler/ets_frontend" ICUI_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/thirdparty/icu" LLVM_DIR = f"{CODE_ROOT}/prebuilts/clang/ohos/linux-x86_64/llvm/lib/" -ARK_JS_RUNTIME_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/ark/ark_js_runtime" +ARK_JS_RUNTIME_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/arkcompiler/ets_runtime" DEFAULT_MODE = 2 @@ -46,7 +46,7 @@ TEST_CI_DIR = os.path.join(DATA_DIR, "test_CI") DEFAULT_ARK_TOOL = os.path.join(ARK_JS_RUNTIME_DIR, "ark_js_vm") DEFAULT_ARK_AOT_TOOL = os.path.join(ARK_JS_RUNTIME_DIR, "ark_aot_compiler") -DEFAULT_LIBS_DIR = f"{ARK_DIR}:{ICUI_DIR}:{LLVM_DIR}:{ARK_JS_RUNTIME_DIR}" +DEFAULT_LIBS_DIR = f"{ICUI_DIR}:{LLVM_DIR}:{ARK_JS_RUNTIME_DIR}" DEFAULT_HOST_TYPE = "panda" DEFAULT_HOST_PATH = "python3" diff --git a/testTs/README.md b/testTs/README.md index 06a754567d7dd3416306d6c9703f956e17ad38a3..2dbefa6a036bc517b3ec17f21e3ddb6521abcf92 100644 --- a/testTs/README.md +++ b/testTs/README.md @@ -6,7 +6,7 @@ ### Environment to prepare 1. Compile TS2ABC warehouse in hongmeng system code root directory. Delete the out directory and run the './build.sh --product-name hispark_taurus_standard --build-target ark_ts2abc' command. -2. Go to the tool build directory 'cd out/hispark_taurus/clang_x64/ark/ark/build' in the out file and run the 'npm install' command to set up the environment +2. Go to the tool build directory 'cd out/hispark_taurus/clang_x64/arkcompiler/ets_frontend/build' in the out file and run the 'npm install' command to set up the environment 3. After setting up the environment, enter the ark/ts2abc directory of Hongmeng system ### Execute test framework diff --git a/testTs/README_zh.md b/testTs/README_zh.md index 3ffcf7c96f369abc2145d457a4063b8899a51622..2a566b6c4f9c5dd04742925d79a1c254837df8e6 100644 --- a/testTs/README_zh.md +++ b/testTs/README_zh.md @@ -6,7 +6,7 @@ ### 环境准备 1.在鸿蒙系统代码根目录下编译ts2abc仓。先删除out目录，然后执行./build.sh --product-name hispark_taurus_standard --build-target ark_ts2abc命令进行编译。
-2.进入out文件中的工具build目录 cd out/hispark_taurus/clang_x64/ark/ark/build，使用npm install命令进行环境搭建
+2.进入out文件中的工具build目录 cd out/hispark_taurus/clang_x64/arkcompiler/ets_frontend/build，使用npm install命令进行环境搭建
3.搭建完环境，进入到鸿蒙系统ark/ts2abc目录下
diff --git a/testTs/config.py b/testTs/config.py index cec2f8135e7cc258b657f6366cd804cbe0c01c19..687a35526004a529c73d2618af2e7c28f07b9d90 100644 --- a/testTs/config.py +++ b/testTs/config.py @@ -33,7 +33,7 @@ SKIP_FILE_PATH = os.path.join("testTs", "skip_tests.json") CUR_FILE_DIR = os.path.dirname(__file__) IMPORT_FILE_PATH = os.path.join(CUR_FILE_DIR, "import_tests.json") CODE_ROOT = os.path.abspath(os.path.join(CUR_FILE_DIR, "../../..")) -ARK_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/ark/ark" +ARK_DIR = f"{CODE_ROOT}/out/hispark_taurus/clang_x64/arkcompiler/ets_frontend" WORK_PATH = f'{CODE_ROOT}/arkcompiler/ets_frontend' DEFAULT_ARK_FRONTEND_TOOL = os.path.join(ARK_DIR, "build", "src", "index.js") diff --git a/ts2panda/BUILD.gn b/ts2panda/BUILD.gn index 82f0b07209be1a2e5388acdfb49705a027932f63..d1ef4ebfd533b89da07d1c1ec915408f73e2ed49 100755 --- a/ts2panda/BUILD.gn +++ b/ts2panda/BUILD.gn @@ -116,21 +116,21 @@ action("npm_run_build") { "--platform", "linux", "--js2abc", - rebase_path("${root_out_dir}/ark/ark/js2abc"), + rebase_path("${root_out_dir}/arkcompiler/ets_frontend/js2abc"), ] } else if (is_mingw) { args += [ "--platform", "win", "--js2abc", - rebase_path("${root_out_dir}/ark/ark/js2abc.exe"), + rebase_path("${root_out_dir}/arkcompiler/ets_frontend/js2abc.exe"), ] } else if (is_mac) { args += [ "--platform", "mac", "--js2abc", - rebase_path("${root_out_dir}/ark/ark/js2abc"), + rebase_path("${root_out_dir}/arkcompiler/ets_frontend/js2abc"), ] } @@ -148,29 +148,29 @@ action("npm_run_build") { outputs = [] if (is_mingw) { - outputs += [ "${root_out_dir}/ark/ark/build-win" ] + outputs += [ "${root_out_dir}/arkcompiler/ets_frontend/build-win" ] } else if (is_mac) { - outputs += [ "${root_out_dir}/ark/ark/build-mac" ] + outputs += [ "${root_out_dir}/arkcompiler/ets_frontend/build-mac" ] } else { - outputs += [ "${root_out_dir}/ark/ark/build" ] + outputs += [ "${root_out_dir}/arkcompiler/ets_frontend/build" ] } } if (is_linux) { ohos_copy("ts2abc_build") { deps = [ "$ts2abc_root:npm_run_build" ] - sources = [ "${root_out_dir}/ark/ark/build" ] + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/build" ] outputs = [ "${target_out_dir}/build-tmp" ] - module_source_dir = "${root_out_dir}/ark/ark/build" + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend/build" module_install_name = "" } ohos_copy("ts2abc_build_ets") { deps = [ "$ts2abc_root:npm_run_build" ] - sources = [ "${root_out_dir}/ark/ark/build" ] - outputs = [ "${root_out_dir}/ark/ark/build-ets" ] - module_source_dir = "${root_out_dir}/ark/ark/build-ets" + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/build" ] + outputs = [ "${root_out_dir}/arkcompiler/ets_frontend/build-ets" ] + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend/build-ets" module_install_name = "" } } @@ -178,17 +178,17 @@ if (is_linux) { if (is_mingw) { ohos_copy("ts2abc_build_win") { deps = [ "$ts2abc_root:npm_run_build" ] - sources = [ "${root_out_dir}/ark/ark/build-win" ] + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/build-win" ] outputs = [ "${target_out_dir}/build-tmp" ] - module_source_dir = "${root_out_dir}/ark/ark/build-win" + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend/build-win" module_install_name = "" } ohos_copy("ts2abc_build_win_ets") { deps = [ "$ts2abc_root:npm_run_build" ] - sources = [ "${root_out_dir}/ark/ark/build-win" ] - outputs = [ "${root_out_dir}/ark/ark/build-win-ets" ] - module_source_dir = "${root_out_dir}/ark/ark/build-win-ets" + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/build-win" ] + outputs = [ "${root_out_dir}/arkcompiler/ets_frontend/build-win-ets" ] + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend/build-win-ets" module_install_name = "" } } @@ -196,17 +196,17 @@ if (is_mingw) { if (is_mac) { ohos_copy("ts2abc_build_mac") { deps = [ "$ts2abc_root:npm_run_build" ] - sources = [ "${root_out_dir}/ark/ark/build-mac" ] + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/build-mac" ] outputs = [ "${target_out_dir}/build-tmp" ] - module_source_dir = "${root_out_dir}/ark/ark/build-mac" + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend/build-mac" module_install_name = "" } ohos_copy("ts2abc_build_mac_ets") { deps = [ "$ts2abc_root:npm_run_build" ] - sources = [ "${root_out_dir}/ark/ark/build-mac" ] - outputs = [ "${root_out_dir}/ark/ark/build-mac-ets" ] - module_source_dir = "${root_out_dir}/ark/ark/build-mac-ets" + sources = [ "${root_out_dir}/arkcompiler/ets_frontend/build-mac" ] + outputs = [ "${root_out_dir}/arkcompiler/ets_frontend/build-mac-ets" ] + module_source_dir = "${root_out_dir}/arkcompiler/ets_frontend/build-mac-ets" module_install_name = "" } } diff --git a/ts2panda/README.md b/ts2panda/README.md index 6e1fe3daa207cea70f97ce480b7cf56660838930..9ea232013d8323d524db028eed21e25cdca0ea4b 100644 --- a/ts2panda/README.md +++ b/ts2panda/README.md @@ -14,9 +14,9 @@ The whole converter could be splited into several phases. The whole ARK project needs to be built before running cases. #### dump panda binary ``` -node --expose-gc ../../out/release/clang_x64/ark/ark/build/src/index.js <--> <--output> +node --expose-gc ../../out/release/clang_x64/arkcompiler/ets_frontend/build/src/index.js <--> <--output> ``` #### dump panda assembly ``` -node --expose-gc ../../out/release/clang_x64/ark/ark/build/src/index.js --dump-assembly +node --expose-gc ../../out/release/clang_x64/arkcompiler/ets_frontend/build/src/index.js --dump-assembly ``` diff --git a/ts2panda/ts2abc/BUILD.gn b/ts2panda/ts2abc/BUILD.gn index a6ee96c5ab999a41c2bc54b2fa9d5ae469e53536..5653deaadf3708f92af84bb5da70494d7107d3b2 100755 --- a/ts2panda/ts2abc/BUILD.gn +++ b/ts2panda/ts2abc/BUILD.gn @@ -73,8 +73,8 @@ if (!defined(ark_independent_build)) { ohos_static_library("jsoncpp_static") { deps = [ ":jsoncpp_set_static" ] use_exceptions = true - subsystem_name = "ark" - part_name = "ark_frontend_tool" + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } ohos_executable("ts2abc") { @@ -135,8 +135,9 @@ if (!defined(ark_independent_build)) { } output_name = "js2abc" - install_enable = true - subsystem_name = "ark" + install_enable = false + part_name = "ets_frontend" + subsystem_name = "arkcompiler" } } else { ark_static_library("jsoncpp_static") {