From 592144e98af0796f204da11bb222ec281152f685 Mon Sep 17 00:00:00 2001 From: lubinglun Date: Sun, 23 Apr 2023 19:48:19 +0800 Subject: [PATCH 1/2] Update nodejs to 14.21.1 Issue:https://gitee.com/openharmony/build/issues/I6TECN Test:build Signed-off-by: lubinglun Change-Id: I4dfa45f98bcf96426e22adb2d0a7eac8257f7440 --- ts2panda/ts2abc_config.gni | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts2panda/ts2abc_config.gni b/ts2panda/ts2abc_config.gni index a728a16268..f5c9c143d6 100755 --- a/ts2panda/ts2abc_config.gni +++ b/ts2panda/ts2abc_config.gni @@ -40,7 +40,7 @@ if (host_toolchain == toolchain_mac) { get_label_info("$ts2abc_root:ts2abc_build_mac($toolchain_mac)", "root_out_dir") + "/obj/arkcompiler/ets_frontend/ts2panda/build-mac" - node_path = "${nodejs_dir}/node-v12.18.4-darwin-x64/bin/" + node_path = "${nodejs_dir}/node-v14.21.1-darwin-x64/bin/" } else if (host_toolchain == toolchain_win) { ts2abc_build_deps = [ "$ts2abc_root:ts2abc_build_win($toolchain_win)" ] ts2abc_build_path = @@ -53,7 +53,7 @@ if (host_toolchain == toolchain_mac) { get_label_info("$ts2abc_root:ts2abc_build($toolchain_linux)", "root_out_dir") + "/obj/arkcompiler/ets_frontend/ts2panda/build" - node_path = "${nodejs_dir}/node-v12.18.4-linux-x64/bin/" + node_path = "${nodejs_dir}/node-v14.21.1-linux-x64/bin/" merge_abc_deps = [ "$merge_abc_root:merge_abc(${toolchain_linux})" ] merge_abc_path = get_label_info("$merge_abc_root:merge_abc($toolchain_linux)", -- Gitee From fe448df2ccf2de417cc81bea8f183316083c0a60 Mon Sep 17 00:00:00 2001 From: lubinglun Date: Mon, 24 Apr 2023 22:07:29 +0800 Subject: [PATCH 2/2] replace nodejs dir to current Signed-off-by: lubinglun Change-Id: I1ddf3602b576038522cd83c6d8230db26f547767 --- ts2panda/ts2abc_config.gni | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts2panda/ts2abc_config.gni b/ts2panda/ts2abc_config.gni index f5c9c143d6..947cb1b95b 100755 --- a/ts2panda/ts2abc_config.gni +++ b/ts2panda/ts2abc_config.gni @@ -40,7 +40,7 @@ if (host_toolchain == toolchain_mac) { get_label_info("$ts2abc_root:ts2abc_build_mac($toolchain_mac)", "root_out_dir") + "/obj/arkcompiler/ets_frontend/ts2panda/build-mac" - node_path = "${nodejs_dir}/node-v14.21.1-darwin-x64/bin/" + node_path = "${nodejs_dir}/current/bin/" } else if (host_toolchain == toolchain_win) { ts2abc_build_deps = [ "$ts2abc_root:ts2abc_build_win($toolchain_win)" ] ts2abc_build_path = @@ -53,7 +53,7 @@ if (host_toolchain == toolchain_mac) { get_label_info("$ts2abc_root:ts2abc_build($toolchain_linux)", "root_out_dir") + "/obj/arkcompiler/ets_frontend/ts2panda/build" - node_path = "${nodejs_dir}/node-v14.21.1-linux-x64/bin/" + node_path = "${nodejs_dir}/current/bin/" merge_abc_deps = [ "$merge_abc_root:merge_abc(${toolchain_linux})" ] merge_abc_path = get_label_info("$merge_abc_root:merge_abc($toolchain_linux)", -- Gitee