From b9c169ee92afa8885cdd25eb6a68c17c21d01c53 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Thu, 30 Jan 2025 12:52:44 +0300 Subject: [PATCH 1/3] Added build:runtime:inc:capi command to common and and runtime Signed-off-by: Alexander Gorshenev --- incremental/common/package.json | 5 +++-- incremental/runtime/package.json | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/incremental/common/package.json b/incremental/common/package.json index cc33dda9b..06ec8895c 100644 --- a/incremental/common/package.json +++ b/incremental/common/package.json @@ -37,7 +37,8 @@ "test:coverage": "nyc mocha", "clean:common": "npm run clean", "build:common": "npm run build:common:inc", - "build:common:inc": "fast-arktsc --input-files ./arktsconfig.json --output-dir ./build --compiler ../tools/panda/arkts/arktsc --link-name common && ninja ${NINJA_OPTIONS} -f build/build.ninja" + "build:common:inc": "fast-arktsc --input-files ./arktsconfig.json --output-dir ./build --compiler ../tools/panda/arkts/arktsc --link-name common && ninja ${NINJA_OPTIONS} -f build/build.ninja", + "build:common:inc:capi": "fast-arktsc --input-files ./arktsconfig.json --output-dir ./build --compiler ../tools/panda/arkts/arktsc-capi --file-option --link-name common && PANDA_SDK_PATH=../tools/panda/node_modules/@panda/sdk ninja ${NINJA_OPTIONS} -f build/build.ninja" }, "keywords": [], "dependencies": { @@ -55,4 +56,4 @@ "mocha": "^9.2.2", "source-map-support": "^0.5.21" } -} \ No newline at end of file +} diff --git a/incremental/runtime/package.json b/incremental/runtime/package.json index 5a8d3f8aa..9318efc12 100644 --- a/incremental/runtime/package.json +++ b/incremental/runtime/package.json @@ -30,6 +30,7 @@ "build:common:inc": "npm run build:common:inc --prefix ../common", "build:runtime": "npm run build:runtime:inc", "build:runtime:inc": "npm run unmemoize && fast-arktsc --input-files ./arktsconfig-run-unmemoized.json --output-dir ./build --compiler ../tools/panda/arkts/arktsc --link-name runtime && ninja ${NINJA_OPTIONS} -f build/build.ninja", + "build:runtime:inc:capi": "npm run unmemoize && fast-arktsc --input-files ./arktsconfig-run-unmemoized.json --output-dir ./build --compiler ../tools/panda/arkts/arktsc-capi --link-name runtime --file-option && PANDA_SDK_PATH=../tools/panda/node_modules/@panda/sdk ninja ${NINJA_OPTIONS} -f build/build.ninja", "build:incremental:components": "npm run build:compat && npm run build:common && npm run build:runtime", "build:incremental:components:inc": "npm run build:compat:inc && npm run build:common:inc && npm run build:runtime:inc", "link:incremental": "../tools/panda/arkts/arklink --output build/incremental.abc -- ../compat/build/compat.abc ../common/build/common.abc build/runtime.abc", @@ -53,4 +54,4 @@ "mocha": "^9.2.2", "source-map-support": "^0.5.21" } -} \ No newline at end of file +} -- Gitee From 0a3da4d80191adf2e232606959d19b47f337744d Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Thu, 30 Jan 2025 12:54:29 +0300 Subject: [PATCH 2/3] Added common build with arktsc-capi compiler Signed-off-by: Alexander Gorshenev --- arkoala-arkts/.gitlab-ci.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 3d7831e86..b2719e2fa 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -117,7 +117,7 @@ install node modules (arkoala-arkts): - incremental/runtime/build/incremental.abc expire_in: 1 day - build incremental (w/plugin): + build compat (w/plugin): stage: build interruptible: true extends: @@ -134,6 +134,24 @@ install node modules (arkoala-arkts): script: - npm run build:compat:inc:capi --prefix incremental/compat + build common (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/common + + build interop.abc: stage: build interruptible: true -- Gitee From a5e5db5ae26262e55f62550dfc63f9e09eab885c Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Thu, 30 Jan 2025 15:25:07 +0300 Subject: [PATCH 3/3] more Signed-off-by: Alexander Gorshenev --- arkoala-arkts/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index b2719e2fa..fad71b9c4 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -149,7 +149,7 @@ install node modules (arkoala-arkts): - npm run panda:sdk:install --prefix arkoala-arkts - npm run compile --prefix arkoala-arkts/libarkts script: - - npm run build:compat:inc:capi --prefix incremental/common + - npm run build:common:inc:capi --prefix incremental/common build interop.abc: -- Gitee