diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 42ef3884f91f442c548dc330ec77280d7747237e..9ac0e21975176d30df8cd4c0a62f2b46dd7c0ff0 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -147,6 +147,24 @@ install node modules (arkoala-arkts): script: - npm run build:common:inc:capi --prefix incremental/common + build capi plugin demo (w/plugin): + stage: build + interruptible: true + extends: + - .linux-vm-shell-task + needs: + - install node modules (arkoala-arkts) + - install node modules (incremental) + - install node modules (interop) + before_script: + - !reference [.setup, script] + - !reference [.setup, regenerate-plugin-api] + - npm run compile --prefix arkoala-arkts/libarkts + - npm run compile:plugins --prefix arkoala-arkts/libarkts + - npm run compile --prefix arkoala-arkts/memo-plugin + script: + - npm run build:user:pure-sts --prefix arkoala-arkts/trivial/user + run capi plugin demo (w/plugin): stage: build interruptible: true @@ -160,6 +178,9 @@ install node modules (arkoala-arkts): before_script: - !reference [.setup, script] - !reference [.setup, regenerate-plugin-api] + - npm run compile --prefix arkoala-arkts/libarkts + - npm run compile:plugins --prefix arkoala-arkts/libarkts + - npm run compile --prefix arkoala-arkts/memo-plugin script: - npm run run:user:pure-sts --prefix arkoala-arkts/trivial/user diff --git a/arkoala-arkts/arkui/package.json b/arkoala-arkts/arkui/package.json index 6a16eacc1630bfd0caa54056429b97b12d3c523d..ac39ea2f6905800585e97d94b360c270f7d62ee0 100644 --- a/arkoala-arkts/arkui/package.json +++ b/arkoala-arkts/arkui/package.json @@ -10,6 +10,6 @@ "build:arkui-no-common:inc": "npm run unmemoize && fast-arktsc --input-files ./arktsconfig-unmemoized.json --output-dir ./build --compiler ../../incremental/tools/panda/arkts/arktsc --link-name arkui-no-common && ninja ${NINJA_OPTIONS} -f build/build.ninja", "build:arkui-no-common": "npm run unmemoize && fast-arktsc --input-files ./arktsconfig-unmemoized.json --output-dir ./build --compiler ../../incremental/tools/panda/arkts/arktsc --link-name arkui-no-common && ninja ${NINJA_OPTIONS} -f build/build.ninja", "unmemoize": "ets-tsc -b ./tsconfig-unmemoize.json && cp -r ./src/generated/arkts ./build/unmemoized/src/generated", - "build:arkui:pure-sts": "mkdir -p build/sts/abc && ../../incremental/tools/panda/arkts/arktsc-capi --arktsconfig arktsconfig-pure-sts.json --file src/sts/arkui.sts --output build/sts/abc/arkui.abc --dump-plugin-ast --restart-stages" + "build:arkui:pure-sts": "mkdir -p build/sts/abc && ../../incremental/tools/panda/arkts/arktsc-capi --arktsconfig arktsconfig-pure-sts.json --file src/sts/arkui.sts --output build/sts/abc/arkui.abc --dump-plugin-ast --restart-stages 2>&1 | grep -v 'Warning: stub node'" } } diff --git a/arkoala-arkts/trivial/user/package.json b/arkoala-arkts/trivial/user/package.json index cf1110bd1f886bb53b1c66ab2c88266e01bb5676..de3306cca528739c10afaaa897fd60fb2f7109d3 100644 --- a/arkoala-arkts/trivial/user/package.json +++ b/arkoala-arkts/trivial/user/package.json @@ -13,10 +13,8 @@ "unmemoize:all": "npm run unmemoize:runtime && npm run unmemoize:arkui-no-common && npm run unmemoize:arkui-common && npm run unmemoize", "build:user": "npm run unmemoize:all && npm run build:user:inc", "build:user:inc": "fast-arktsc --input-files ./arktsconfig-run-unmemoized.json --output-dir ./build --compiler ../../../incremental/tools/panda/arkts/arktsc --link-name user && ninja ${NINJA_OPTIONS} -f build/build.ninja", - "build:user:pure-sts": "npm run build:arkui:pure-sts --prefix ../../arkui && ../../../incremental/tools/panda/arkts/arktsc-capi --file src/sts/hello.sts --arktsconfig arktsconfig-pure-sts.json --output build/sts/abc/hello.abc --dump-plugin-ast --restart-stages", - "run:user:pure-sts": "npm run build:user:pure-sts && ../../../incremental/tools/panda/arkts/ark build/sts/abc/hello.abc --ark-boot-files ../../arkui/build/sts/abc/src/sts/arkui.abc:build/sts/abc/hello.abc --ark-entry-point @ohos.example.src.sts.hello.ArkUIEntry::run", - "pack": "npm run cli-tools:download && cd app && DEVECO_SDK_HOME=../../../../arkoala/ohos-sdk/ohos-sdk ../../../command-line-tools/hvigor/bin/hvigorw --no-daemon --mode module -p product=default -p module=user@default assembleHar", - "run:user:pure-sts": "npm run build:user:pure-sts && ../../../incremental/tools/panda/arkts/ark build/sts/abc/hello.abc --ark-boot-files ../../arkui/build/sts/abc/arkui.abc:build/sts/abc/hello.abc:../../../incremental/runtime/build/incremental.abc --ark-entry-point @ohos.example.src.sts.hello.ArkUIEntry::run", + "build:user:pure-sts": "npm run build:arkui:pure-sts --prefix ../../arkui && ../../../incremental/tools/panda/arkts/arktsc-capi --file src/sts/hello.sts --arktsconfig arktsconfig-pure-sts.json --output build/sts/abc/hello.abc --dump-plugin-ast --restart-stages 2>&1 | grep -v 'Warning: stub node'", + "run:user:pure-sts": "npm run build:user:pure-sts && ../../../incremental/tools/panda/arkts/ark build/sts/abc/hello.abc --ark-boot-files ../../arkui/build/sts/abc/arkui.abc:build/sts/abc/hello.abc:../../../incremental/runtime/build/incremental.abc --ark-entry-point @ohos.example.src.sts.hello.ArkUIEntry::run", "pack": "npm run cli-tools:download && cd app && DEVECO_SDK_HOME=../../../../arkoala/ohos-sdk/ohos-sdk ../../../command-line-tools/hvigor/bin/hvigorw --no-daemon --mode module -p product=default -p module=user@default assembleHar", "har-arm32": "npm run build:user && npm run --prefix ../../../arkoala/ohos-sdk download && node scripts/build-har.mjs --name user --arch arm32 && npm run pack", "har-arm64": "npm run build:user && npm run --prefix ../../../arkoala/ohos-sdk download && node scripts/build-har.mjs --name user --arch arm64 && npm run pack",