diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 2c3bec8eb4df537c5dad9ebcb2fa7bc49198ec48..3d7831e864cb6f0f3148ca3fb50cf1df282f6cf5 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 + 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 + build interop.abc: stage: build interruptible: true diff --git a/arkoala-arkts/libarkts/playground/src/playground.cc b/arkoala-arkts/libarkts/playground/src/playground.cc index 16d73df27838332de3cfe8a3c46764dad583a242..880c12aebff808cc1d23808ea0cf09c23741ce03 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); diff --git a/incremental/compat/package.json b/incremental/compat/package.json index 56f60597e3b4a3901807c528530117baa2fa23fb..c84729e43b2c1a923d8015f13bd93b714e005b6b 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 +}