From 34c219cd0d4df59a9c5b2df9cf726b93fddf5c9f Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <gorshenev.alexander@huawei.com>
Date: Fri, 24 Jan 2025 19:28:19 +0300
Subject: [PATCH 1/2] Ensure arktsc-capi runs on CI for compat

Signed-off-by: Alexander Gorshenev <gorshenev.alexander@huawei.com>
---
 arkoala-arkts/.gitlab-ci.yml    | 17 +++++++++++++++++
 incremental/compat/package.json |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml
index 2c3bec8eb..3d7831e86 100644
--- a/arkoala-arkts/.gitlab-ci.yml
+++ b/arkoala-arkts/.gitlab-ci.yml
@@ -117,6 +117,23 @@ install node modules (arkoala-arkts):
       - incremental/runtime/build/incremental.abc
     expire_in: 1 day
 
+<ArkTS> build incremental (w/plugin):
+  stage: build
+  interruptible: true
+  extends:
+    - .linux-vm-shell-task
+  needs:
+    - install node modules (arkoala)
+    - install node modules (arkoala-arkts)
+    - install node modules (incremental)
+    - install node modules (interop)
+  before_script:
+    - !reference [.setup, script]
+    - npm run panda:sdk:install --prefix arkoala-arkts
+    - npm run compile --prefix arkoala-arkts/libarkts
+  script:
+    - npm run build:compat:inc:capi --prefix incremental/compat
+
 <ArkTS> build interop.abc:
   stage: build
   interruptible: true
diff --git a/incremental/compat/package.json b/incremental/compat/package.json
index 56f60597e..c84729e43 100644
--- a/incremental/compat/package.json
+++ b/incremental/compat/package.json
@@ -27,7 +27,7 @@
     "compile:all": "npm run compile && npm run compile:ohos",
     "build:compat": "npm run build:compat:inc",
     "build:compat:inc": "fast-arktsc --input-files ./arktsconfig.json --output-dir ./build --compiler ../tools/panda/arkts/arktsc --link-name compat && ninja ${NINJA_OPTIONS} -f build/build.ninja",
-    "build:compat:inc:capi": "fast-arktsc --input-files ./arktsconfig.json --output-dir ./build --compiler ../tools/panda/arkts/arktsc-capi --file-option --link-name compat && ninja ${NINJA_OPTIONS} -f build/build.ninja"
+    "build:compat:inc:capi": "fast-arktsc --input-files ./arktsconfig.json --output-dir ./build --compiler ../tools/panda/arkts/arktsc-capi --file-option --link-name compat && PANDA_SDK_PATH=../tools/panda/node_modules/@panda/sdk ninja ${NINJA_OPTIONS} -f build/build.ninja"
   },
   "keywords": [],
   "dependencies": {},
@@ -43,4 +43,4 @@
     "mocha": "^9.2.2",
     "source-map-support": "^0.5.21"
   }
-}
\ No newline at end of file
+}
-- 
Gitee


From 87d5e65b64e8b78b95cbccf0199b8f9bd40bcc84 Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <gorshenev.alexander@huawei.com>
Date: Tue, 28 Jan 2025 12:49:03 -0500
Subject: [PATCH 2/2] Updated the playground

---
 arkoala-arkts/libarkts/playground/src/playground.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arkoala-arkts/libarkts/playground/src/playground.cc b/arkoala-arkts/libarkts/playground/src/playground.cc
index 16d73df27..880c12aeb 100644
--- a/arkoala-arkts/libarkts/playground/src/playground.cc
+++ b/arkoala-arkts/libarkts/playground/src/playground.cc
@@ -42,10 +42,12 @@ int main() {
         // path to config
         "./arktsconfig.json",
         // path to source
-        "./examples/input/main.sts"
+        "./examples/input/main.sts",
+        "--stdlib",
+        "../../incremental/tools/panda/node_modules/@panda/sdk/ets/stdlib"
     };
 
-    auto config = GetImpl()->CreateConfig(4, args);
+    auto config = GetImpl()->CreateConfig(6, args);
     auto context = GetImpl()->CreateContextFromString(config, source, args[3]);
 
     GetImpl()->ProceedToState(context, ES2PANDA_STATE_PARSED);
-- 
Gitee