From c64ec12d8e75ab1a40d1ee25548a07b420924995 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Mon, 10 Feb 2025 11:04:40 +0300 Subject: [PATCH 1/2] Recovery of shopping build Signed-off-by: Nikolay Igotti --- arkoala-arkts/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index 4c748baec..d60ad8d9b 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -68,7 +68,7 @@ "aot:arm32:arkoala": "npm run link:arkoala && npm run -C ../incremental/tools/fast-arktsc compile && node ../incremental/tools/fast-arktsc --only-aot build/arkoala.abc --aot-target arm", "aot:arm64:arkoala": "npm run link:arkoala && npm run -C ../incremental/tools/fast-arktsc compile && node ../incremental/tools/fast-arktsc --only-aot build/arkoala.abc --aot-target arm64", "build:user": "npm run build:user --prefix trivial/user && mkdir -p ./build && cp -r trivial/user/build/user.abc ./build/", - "build:shopping": "npm run build:shopping --prefix shopping/user && mkdir -p ./build && cp -r shopping/user/build/shopping.abc ./build/", + "build:shopping": "npm run build:user --prefix shopping/user && mkdir -p ./build && cp -r shopping/user/build/user.abc ./build/shopping.abc", "aot:host:shopping": "npm run build:shopping && npm run -C ../incremental/tools/fast-arktsc compile && npm run aot:host:arkoala && node ../incremental/tools/fast-arktsc --only-aot build/shopping.abc --aot-libs ./build/arkoala.abc", "aot:arm32:shopping": "npm run build:shopping && npm run -C ../incremental/tools/fast-arktsc compile && npm run aot:host:arkoala && node ../incremental/tools/fast-arktsc --only-aot build/shopping.abc --aot-libs ./build/arkoala.abc --aot-target arm", "aot:arm64:shopping": "npm run build:shopping && npm run -C ../incremental/tools/fast-arktsc compile && npm run aot:host:arkoala && node ../incremental/tools/fast-arktsc --only-aot build/shopping.abc --aot-libs ./build/arkoala.abc --aot-target arm64", @@ -94,7 +94,7 @@ "shopping:har-universal": "npm run user:har:universal --prefix shopping", "clean": "rimraf build", "clean:native": "npm run clean --prefix ../arkoala/framework", - "clean:all": "npm run clean && npm run clean:common && npm run clean:incremental && npm run clean:interop && npm run clean:arkui-common && npm run clean:arkui-no-common && npm run clean:native && npm run clean --prefix har && npm run clean --prefix user && npm run clean:shopping", + "clean:all": "npm run clean && npm run clean:common && npm run clean:incremental && npm run clean:interop && npm run clean:arkui-common && npm run clean:arkui-no-common && npm run clean:native && npm run clean --prefix har && npm run clean --prefix trivial/user && npm run clean:shopping", "perf:trivial": "npm run build:user && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk valgrind --tool=cachegrind --valgrind-stacksize=8000000 --main-stacksize=100000000 node build/index.js panda:TrivialApp 2>/dev/null && ls -lh cachegrind.out.* && echo 'Use cg_annotate to inspect'" } } -- Gitee From 54ffc27e75cce616b2c22067214fd6adfa93d78c Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Mon, 10 Feb 2025 11:42:05 +0300 Subject: [PATCH 2/2] Fixed build Signed-off-by: Nikolay Igotti --- arkoala-arkts/loader/src/loader.ts | 5 +++-- arkoala-arkts/navigation/navigation/AppScope/app.json5 | 2 +- arkoala-arkts/navigation/user/src/Page.ts | 2 +- arkoala-arkts/navigation/user/src/ets/etsconfig.json | 2 +- arkoala-arkts/package.json | 9 +++++---- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/arkoala-arkts/loader/src/loader.ts b/arkoala-arkts/loader/src/loader.ts index 084ff46b7..c59eab18a 100644 --- a/arkoala-arkts/loader/src/loader.ts +++ b/arkoala-arkts/loader/src/loader.ts @@ -156,12 +156,13 @@ checkLoader( vm, app, params, (process && process.argv.length > 4) ? parseInt(process.argv[4]) : undefined) .then(control => { + console.log(`Started ${app}...`) switch (app) { - case "TrivialApp": { + case "ComExampleTrivialApplication": { trivialChecker(control) break; } - case "NavigationApp": { + case "ComExampleNavigationApplication": { navigationChecker(control) break; } diff --git a/arkoala-arkts/navigation/navigation/AppScope/app.json5 b/arkoala-arkts/navigation/navigation/AppScope/app.json5 index c9219fbc3..65da20328 100644 --- a/arkoala-arkts/navigation/navigation/AppScope/app.json5 +++ b/arkoala-arkts/navigation/navigation/AppScope/app.json5 @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.example.shopping.application", + "bundleName": "com.example.navigation.application", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", diff --git a/arkoala-arkts/navigation/user/src/Page.ts b/arkoala-arkts/navigation/user/src/Page.ts index 1ef0c025f..fddb5f1fd 100644 --- a/arkoala-arkts/navigation/user/src/Page.ts +++ b/arkoala-arkts/navigation/user/src/Page.ts @@ -1,7 +1,7 @@ import { NavigationPage } from "app/navigation" import { UserView, UserViewBuilder } from "@koalaui/arkts-arkui" -export class ViewNavigationApp extends UserView { +export class ComExampleNavigationApplication extends UserView { private params: String constructor(params: String) { super() diff --git a/arkoala-arkts/navigation/user/src/ets/etsconfig.json b/arkoala-arkts/navigation/user/src/ets/etsconfig.json index 2e88d85ca..8c8b162b4 100644 --- a/arkoala-arkts/navigation/user/src/ets/etsconfig.json +++ b/arkoala-arkts/navigation/user/src/ets/etsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../arkui/config/etsconfig-base.json", + "extends": "../../../../arkui/config/etsconfig-base.json", "include": [ "./**/*.ets" ], diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index d60ad8d9b..9ffcaff2a 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -68,14 +68,15 @@ "aot:arm32:arkoala": "npm run link:arkoala && npm run -C ../incremental/tools/fast-arktsc compile && node ../incremental/tools/fast-arktsc --only-aot build/arkoala.abc --aot-target arm", "aot:arm64:arkoala": "npm run link:arkoala && npm run -C ../incremental/tools/fast-arktsc compile && node ../incremental/tools/fast-arktsc --only-aot build/arkoala.abc --aot-target arm64", "build:user": "npm run build:user --prefix trivial/user && mkdir -p ./build && cp -r trivial/user/build/user.abc ./build/", + "build:navigation": "npm run build:user --prefix navigation/user && mkdir -p ./build && cp -r navigation/user/build/user.abc ./build/navigation.abc", "build:shopping": "npm run build:user --prefix shopping/user && mkdir -p ./build && cp -r shopping/user/build/user.abc ./build/shopping.abc", "aot:host:shopping": "npm run build:shopping && npm run -C ../incremental/tools/fast-arktsc compile && npm run aot:host:arkoala && node ../incremental/tools/fast-arktsc --only-aot build/shopping.abc --aot-libs ./build/arkoala.abc", "aot:arm32:shopping": "npm run build:shopping && npm run -C ../incremental/tools/fast-arktsc compile && npm run aot:host:arkoala && node ../incremental/tools/fast-arktsc --only-aot build/shopping.abc --aot-libs ./build/arkoala.abc --aot-target arm", "aot:arm64:shopping": "npm run build:shopping && npm run -C ../incremental/tools/fast-arktsc compile && npm run aot:host:arkoala && node ../incremental/tools/fast-arktsc --only-aot build/shopping.abc --aot-libs ./build/arkoala.abc --aot-target arm64", - "run:node:user": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:TrivialApp", - "run:node:user:navigation": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:NavigationApp", - "run:node:shopping": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:ShoppingApp", - "run:node:ci": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:TrivialApp 10", + "run:node:user": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:ComExampleTrivialApplication", + "run:node:user:navigation": "npm run build:navigation && ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:ComExampleNavigationApplication", + "run:node:shopping": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:ComExampleShoppingApplication", + "run:node:ci": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:ComExampleTrivialApplication 10", "trivial:all:node": "npm run compile:native:node-host && npm run build:arkoala && npm run build:user && npm run build:loader:node && npm run run:node:user", "trivial:all:node:navigation": "npm run compile:native:node-host && npm run build:arkoala && npm run build:user && npm run build:loader:node && npm run run:node:user:navigation", "trivial:node": "npm run build:user && npm run build:loader:node && npm run run:node:user", -- Gitee