From 2bf88256081efa448172d43909bf4fc61fc52531 Mon Sep 17 00:00:00 2001 From: Korobeinikov Evgeny Date: Wed, 15 Jan 2025 12:11:33 +0300 Subject: [PATCH 1/3] Class path env --- arkoala-arkts/har/arkoala-har-bundle/loader.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arkoala-arkts/har/arkoala-har-bundle/loader.js b/arkoala-arkts/har/arkoala-har-bundle/loader.js index fe7b4a169..2b7a23c0c 100644 --- a/arkoala-arkts/har/arkoala-har-bundle/loader.js +++ b/arkoala-arkts/har/arkoala-har-bundle/loader.js @@ -100,8 +100,9 @@ export async function runEventLoop() { } export function checkLoader(variant) { let vm = -1; - let classPath = `/data/storage/el1/bundle/libs/__ARCH__` - let nativePath = `/data/storage/el1/bundle/libs/__ARCH__` + + let classPath = process.env["CLASS_PATH"] ?? `/data/storage/el1/bundle/libs/__ARCH__` + let nativePath = classPath switch (variant) { case 'panda': { vm = 2; -- Gitee From 62776ed045cffcbc58450ab477ce4911a8ad1ab1 Mon Sep 17 00:00:00 2001 From: Korobeinikov Evgeny Date: Wed, 15 Jan 2025 14:19:01 +0300 Subject: [PATCH 2/3] Class path env 2 --- arkoala-arkts/har/arkoala-har-bundle/loader.js | 3 ++- arkoala-arkts/har/arkoala-har-bundle/rollup.config.mjs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arkoala-arkts/har/arkoala-har-bundle/loader.js b/arkoala-arkts/har/arkoala-har-bundle/loader.js index 2b7a23c0c..f88bbc216 100644 --- a/arkoala-arkts/har/arkoala-har-bundle/loader.js +++ b/arkoala-arkts/har/arkoala-har-bundle/loader.js @@ -101,7 +101,8 @@ export async function runEventLoop() { export function checkLoader(variant) { let vm = -1; - let classPath = process.env["CLASS_PATH"] ?? `/data/storage/el1/bundle/libs/__ARCH__` + let classPath = `__PANDA_CLASS_PATH__` != 'NO_CLASS_PATH' ? `__PANDA_CLASS_PATH__` : `/data/storage/el1/bundle/libs/__ARCH__` + let nativePath = classPath switch (variant) { case 'panda': { diff --git a/arkoala-arkts/har/arkoala-har-bundle/rollup.config.mjs b/arkoala-arkts/har/arkoala-har-bundle/rollup.config.mjs index 0c3d31151..8af776dd9 100644 --- a/arkoala-arkts/har/arkoala-har-bundle/rollup.config.mjs +++ b/arkoala-arkts/har/arkoala-har-bundle/rollup.config.mjs @@ -59,7 +59,8 @@ export default cliOptions => [{ preventAssignment: true, values: { __ARKOALA_HAR__: 'true', - __ARCH__: cliOptions.arch + __ARCH__: cliOptions.arch, + __PANDA_CLASS_PATH__: process.env["PANDA_CLASS_PATH"] ?? "NO_CLASS_PATH" } }), inject({ -- Gitee From 7ba05e140d1b8985988768a20b89514debe223ff Mon Sep 17 00:00:00 2001 From: Korobeinikov Evgeny Date: Wed, 15 Jan 2025 14:25:38 +0300 Subject: [PATCH 3/3] Class path env 3 --- arkoala-arkts/har/arkoala-har-bundle/loader.js | 2 +- arkoala-arkts/har/arkoala-har-bundle/rollup.config.mjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arkoala-arkts/har/arkoala-har-bundle/loader.js b/arkoala-arkts/har/arkoala-har-bundle/loader.js index f88bbc216..cf497dfb7 100644 --- a/arkoala-arkts/har/arkoala-har-bundle/loader.js +++ b/arkoala-arkts/har/arkoala-har-bundle/loader.js @@ -101,7 +101,7 @@ export async function runEventLoop() { export function checkLoader(variant) { let vm = -1; - let classPath = `__PANDA_CLASS_PATH__` != 'NO_CLASS_PATH' ? `__PANDA_CLASS_PATH__` : `/data/storage/el1/bundle/libs/__ARCH__` + let classPath = `__PANDA_CLASS_PATH__` != 'EMPTY' ? `__PANDA_CLASS_PATH__` : `/data/storage/el1/bundle/libs/__ARCH__` let nativePath = classPath switch (variant) { diff --git a/arkoala-arkts/har/arkoala-har-bundle/rollup.config.mjs b/arkoala-arkts/har/arkoala-har-bundle/rollup.config.mjs index 8af776dd9..8daa24c99 100644 --- a/arkoala-arkts/har/arkoala-har-bundle/rollup.config.mjs +++ b/arkoala-arkts/har/arkoala-har-bundle/rollup.config.mjs @@ -60,7 +60,7 @@ export default cliOptions => [{ values: { __ARKOALA_HAR__: 'true', __ARCH__: cliOptions.arch, - __PANDA_CLASS_PATH__: process.env["PANDA_CLASS_PATH"] ?? "NO_CLASS_PATH" + __PANDA_CLASS_PATH__: process.env["PANDA_CLASS_PATH"] ?? "EMPTY" } }), inject({ -- Gitee