From 1e24d3ba3e78ee4b118ed0a4b0a78bc42422457d Mon Sep 17 00:00:00 2001 From: Zhelyapov Aleksey Date: Thu, 4 Sep 2025 13:33:52 +0300 Subject: [PATCH] Add es2pandaLanguage to IDL Update koala revision to 11 Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICVU0F https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICW520 Signed-off-by: Zhelyapov Aleksey Signed-off-by: Tatiana Titova --- ets2panda/public/es2panda_lib.idl.erb | 7 +++++++ ets2panda/scripts/arkui-setup.sh | 12 ++++++++++-- ets2panda/scripts/arkui.properties | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ets2panda/public/es2panda_lib.idl.erb b/ets2panda/public/es2panda_lib.idl.erb index 4b8d6c0261..56f8266106 100644 --- a/ets2panda/public/es2panda_lib.idl.erb +++ b/ets2panda/public/es2panda_lib.idl.erb @@ -148,6 +148,13 @@ dictionary es2panda_PluginDiagnosticType { i32 ES2PANDA_PLUGIN_SUGGESTION = 2; }; +dictionary Es2pandaLanguage { + i32 LANGUAGE_AS = 0; + i32 LANGUAGE_JS = 1; + i32 LANGUAGE_TS = 2; + i32 LANGUAGE_ETS = 3; +}; + [Entity=Class] interface VoidPtr {}; // void * diff --git a/ets2panda/scripts/arkui-setup.sh b/ets2panda/scripts/arkui-setup.sh index fbb054131f..bf486df8c8 100755 --- a/ets2panda/scripts/arkui-setup.sh +++ b/ets2panda/scripts/arkui-setup.sh @@ -159,6 +159,14 @@ function run_script() { fi } +function skip_linker_verification_error() { + npm run $1 | tee out.txt + ERROR_MESSAGE="$(grep 'Error:' out.txt)" + if [[ -n "${ERROR_MESSAGE}" && "${ERROR_MESSAGE}" != *"LinkerVerificationError:"* ]] ; then + exit 1 + fi +} + export ENABLE_BUILD_CACHE=0 # Compile libarkts @@ -174,7 +182,7 @@ popd >/dev/null 2>&1 || exit 1 # run_script "all --prefix ui2abc" run_script "build:all --prefix ui2abc" -run_script "build:deps --prefix ets-tests" +run_script "build:deps --prefix ui2abc/ets-tests" if [ -z "${DEMO}" ] ; then echo "Just compiled ArkUI, but no demo specified." @@ -186,7 +194,7 @@ case "${DEMO}" in run_script "run:node --prefix arkoala-arkts/shopping/user" ;; "trivial") - run_script "run --prefix arkoala-arkts/trivial/user" + skip_linker_verification_error "run --prefix arkoala-arkts/trivial/user" ;; "empty") ;; diff --git a/ets2panda/scripts/arkui.properties b/ets2panda/scripts/arkui.properties index dbe231e9e7..7f0cf795d6 100644 --- a/ets2panda/scripts/arkui.properties +++ b/ets2panda/scripts/arkui.properties @@ -1,3 +1,3 @@ ARKUI_DEV_REPO=https://gitee.com/rri_opensource/koala_projects.git -ARKUI_DEV_BRANCH=panda_rev_10-ani-remove-module-find +ARKUI_DEV_BRANCH=panda_rev_11 ARKUI_DEST=koala-sig -- Gitee