diff --git a/arkoala-arkts/har/arkoala-har-bundle/loader.js b/arkoala-arkts/har/arkoala-har-bundle/loader.js index 163c1778f22b3839e69d80ee1008926a30c55183..5967bbcdc7e3ece8044312bed712bf243be4c7ab 100644 --- a/arkoala-arkts/har/arkoala-har-bundle/loader.js +++ b/arkoala-arkts/har/arkoala-har-bundle/loader.js @@ -107,7 +107,7 @@ export function checkLoader(variant) { } let result = nativeModule()._LoadVirtualMachine(vm, classPath, nativePath); if (result == 0) { - rootPointer = nativeModule()._StartApplication("TrivialApp", "ArkTSLoaderParam"); + rootPointer = nativeModule()._StartApplication(`__PROJECT_NAME__`, "ArkTSLoaderParam"); if (rootPointer != 0) { setTimeout(async () => runEventLoop(), 0); } diff --git a/arkoala-arkts/har/arkoala-har-bundle/rollup.config.mjs b/arkoala-arkts/har/arkoala-har-bundle/rollup.config.mjs index 0c3d3115197befce374098359063df51cfa1b084..fb56837999aacc98fd2b1f3ecf2015958605c6d3 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, + __PROJECT_NAME__: cliOptions.name } }), inject({ diff --git a/arkoala-arkts/har/package.json b/arkoala-arkts/har/package.json index 61716d278a9e74411698d215c6abcb2f079b0573..36c5e379805eec47b66f738bd969d324de2b99ca 100644 --- a/arkoala-arkts/har/package.json +++ b/arkoala-arkts/har/package.json @@ -19,8 +19,8 @@ "scripts": { "clean": "rimraf app/arkoala/build app/arkoala/libs app/arkoala/bundle.js arkoala-har-bundle/dist", "pack": "npm run cli-tools:check && 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=arkoala@default assembleHar", - "har-arm32": "npm run --prefix ../../arkoala/ohos-sdk download && node scripts/build-arkoala-har.mjs --arch arm32 && npm run pack", - "har-arm64": "npm run --prefix ../../arkoala/ohos-sdk download && node scripts/build-arkoala-har.mjs --arch arm64 && npm run pack", + "har-arm32": "npm run --prefix ../../arkoala/ohos-sdk download && node scripts/build-arkoala-har.mjs --arch arm32 --project-name ShoppingApp && npm run pack", + "har-arm64": "npm run --prefix ../../arkoala/ohos-sdk download && node scripts/build-arkoala-har.mjs --arch arm64 --project-name ShoppingApp && npm run pack", "cli-tools:chmod:bz": "node ../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ./command-line-tools/ohpm/bin -b 755 && node ../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ./command-line-tools/hvigor/bin -b 755", "cli-tools:chmod:yz": "node ../../../sdk/scripts/gitlab/gitlab-cli.mjs chmod -p ./command-line-tools/ohpm/bin -b 755 && node ../../../sdk/scripts/gitlab/gitlab-cli.mjs chmod -p ./command-line-tools/hvigor/bin -b 755", "cli-tools:download:bz": "node ../../arkoala/ohos-sdk/scripts/openlab-cli.mjs download -p command-line-tools -v 5.0.3502 -f command-line-tools.5.0.3502.zip -d command-line-tools && npm run cli-tools:chmod:bz", diff --git a/arkoala-arkts/har/scripts/build-arkoala-har.mjs b/arkoala-arkts/har/scripts/build-arkoala-har.mjs index f97bb97b577d6c5fcdc8421ba67b80ae11de7de0..a465c6e5266e7c0e957d9fad16c93fc546f90925 100644 --- a/arkoala-arkts/har/scripts/build-arkoala-har.mjs +++ b/arkoala-arkts/har/scripts/build-arkoala-har.mjs @@ -19,9 +19,9 @@ function execCmdSync(cmd, options) { return execSync(cmd, options).toString().trim().replace("\n", " ") } -function rollupLaunch(loaderArch) { +function rollupLaunch(loaderArch, projectName) { console.log(`> Run rollup`) - execCmdSync(`npx rollup -c --arch ${loaderArch}`) + execCmdSync(`npx rollup -c --arch ${loaderArch} --name ${projectName}`) } function copyFileToHar(from, to) { @@ -42,11 +42,11 @@ function copySoLibs(from, to) { }) } -function main(targetLibDir, loaderArch) { +function main(targetLibDir, loaderArch, projectName) { process.chdir(BUNDLE_PATH) - rollupLaunch(loaderArch) + rollupLaunch(loaderArch, projectName) /* we don't yet know which files should be in har */ copyFileToHar(path.join(_dirname, `../../../arkoala/framework/build/libc++.so`), path.join(HAR_PATH, `libs/${targetLibDir}/libc++.so`)) copyFileToHar(path.join(_dirname, `../../../arkoala/framework/build/libArkoalaLoader.so`), path.join(HAR_PATH, `libs/${targetLibDir}/libArkoalaLoader.so`)) @@ -56,10 +56,12 @@ function main(targetLibDir, loaderArch) { } const arch = args["arch"] +const projectName = args["project-name"] + if (arch == "arm32") { - main("armeabi-v7a", "arm") + main("armeabi-v7a", "arm", projectName) } else if (arch == "arm64") { - main("arm64-v8a", arch) + main("arm64-v8a", arch, projectName) // copyFileToHar(path.join(_dirname, `../../../arkoala/framework/build/libace_compatible_mock.so`), path.join(HAR_PATH, `libs/arm64-v8a/libace_compatible_mock.so`)) copyFileToHar(path.join(_dirname, `../../../incremental/tools/panda/node_modules/@panda/sdk/ets/etsstdlib.abc`), path.join(HAR_PATH, `libs/arm64-v8a/etsstdlib.abc.so`)) // copySoLibs(path.join(_dirname, `../../../incremental/tools/panda/node_modules/@panda/sdk/ohos_arm64/lib`), path.join(HAR_PATH, `libs/arm64-v8a`))