From a7c2cbd5ec783bb8d4fda2ab59f24aa24a083987 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Thu, 14 Nov 2024 17:13:35 +0300 Subject: [PATCH 01/20] log file --- interop/src/cpp/ohos/hilog/log.h | 286 +++++++++++++++++++++++++++++++ 1 file changed, 286 insertions(+) create mode 100644 interop/src/cpp/ohos/hilog/log.h diff --git a/interop/src/cpp/ohos/hilog/log.h b/interop/src/cpp/ohos/hilog/log.h new file mode 100644 index 000000000..7452137c2 --- /dev/null +++ b/interop/src/cpp/ohos/hilog/log.h @@ -0,0 +1,286 @@ +/* + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef HIVIEWDFX_HILOG_H +#define HIVIEWDFX_HILOG_H +/** + * @addtogroup HiLog + * @{ + * + * @brief Provides logging functions. + * + * For example, you can use these functions to output logs of the specified log type, service domain, log tag, + * and log level. + * + * @syscap SystemCapability.HiviewDFX.HiLog + * + * @since 8 + */ + +/** + * @file log.h + * + * @brief Defines the logging functions of the HiLog module. + * + * Before outputting logs, you must define the service domain, and log tag, use the function with + * the specified log type and level, and specify the privacy identifier.\n + * \n + * + * Sample code:\n + * Defining the service domain and log tag:\n + * #include \n + * #define LOG_DOMAIN 0x0201\n + * #define LOG_TAG "MY_TAG"\n + * Outputting logs:\n + * HILOG_WARN({@link LOG_APP}, "Failed to visit %{private}s, reason:%{public}d.", url, errno);\n + * Output result:\n + * 05-06 15:01:06.870 1051 1051 W 0201/MY_TAG: Failed to visit , reason:503.\n + * + * @since 8 + */ +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief Defines the service domain for a log file. + * + * The service domain is used to identify the subsystem and module of a service. Its value is a hexadecimal integer + * ranging from 0x0 to 0xFFFF. If the value is beyond the range, its significant bits are automatically truncated. \n + * + * @since 8 + */ +#ifndef LOG_DOMAIN +#define LOG_DOMAIN 0 +#endif + +/** + * @brief Defines a string constant used to identify the class, file, or service. + * + * @since 8 + */ +#ifndef LOG_TAG +#define LOG_TAG NULL +#endif + +/** + * @brief Enumerates log types. + * + * Currently, LOG_APP is available. \n + * + * @since 8 + */ +typedef enum { + /** Third-party application logs */ + LOG_APP = 0, +} LogType; + +/** + * @brief Enumerates log levels. + * + * You are advised to select log levels based on their respective usage scenarios:\n + *
  • DEBUG: used for debugging and disabled from commercial releases
    • \n + *
  • INFO: used for logging important system running status and steps in key processes
    • \n + *
  • WARN: used for logging unexpected exceptions that have little impact on user experience and can + * automatically recover. Logs at this level are generally output when such exceptions are detected and + * captured.
    • \n + *
  • ERROR: used for logging malfunction that affects user experience and cannot automatically + * recover
    • \n + *
  • FATAL: used for logging major exceptions that have severely affected user experience and should + * not occur.
\n + * + * @since 8 + */ +typedef enum { + /** Debug level to be used by {@link OH_LOG_DEBUG} */ + LOG_DEBUG = 3, + /** Informational level to be used by {@link OH_LOG_INFO} */ + LOG_INFO = 4, + /** Warning level to be used by {@link OH_LOG_WARN} */ + LOG_WARN = 5, + /** Error level to be used by {@link OH_LOG_ERROR} */ + LOG_ERROR = 6, + /** Fatal level to be used by {@link OH_LOG_FATAL} */ + LOG_FATAL = 7, +} LogLevel; + +/** + * @brief Outputs logs. + * + * You can use this function to output logs based on the specified log type, log level, service domain, log tag, + * and variable parameters determined by the format specifier and privacy identifier in the printf format. + * + * @param type Indicates the log type. The type for third-party applications is defined by {@link LOG_APP}. + * @param level Indicates the log level, which can be LOG_DEBUG, LOG_INFO, LOG_WARN, + * LOG_ERROR, and LOG_FATAL. + * @param domain Indicates the service domain of logs. Its value is a hexadecimal integer ranging from 0x0 to 0xFFFF. + * @param tag Indicates the log tag, which is a string used to identify the class, file, or service behavior. + * @param fmt Indicates the format string, which is an enhancement of a printf format string and supports the privacy + * identifier. Specifically, {public} or {private} is added between the % character and the format specifier + * in each parameter. \n + * @param ... Indicates a list of parameters. The number and type of parameters must map onto the format specifiers + * in the format string. + * @return Returns 0 or a larger value if the operation is successful; returns a value smaller + * than 0 otherwise. + * @since 8 + */ +int OH_LOG_Print(LogType type, LogLevel level, unsigned int domain, const char *tag, const char *fmt, ...) + __attribute__((__format__(os_log, 5, 6))); + +/** + * @brief Checks whether logs of the specified service domain, log tag, and log level can be output. + * + * @param domain Indicates the service domain of logs. + * @param tag Indicates the log tag. + * @param level Indicates the log level. + * @return Returns true if the specified logs can be output; returns false otherwise. + * @since 8 + */ +bool OH_LOG_IsLoggable(unsigned int domain, const char *tag, LogLevel level); + +/** + * @brief Outputs debug logs. This is a function-like macro. + * + * Before calling this function, define the log service domain and log tag. Generally, you need to define them at + * the beginning of the source file. \n + * + * @param type Indicates the log type. The type for third-party applications is defined by {@link LOG_APP}. + * @param fmt Indicates the format string, which is an enhancement of a printf format string and supports the + * privacy identifier. Specifically, {public} or {private} is added between the % character and the format specifier + * in each parameter. \n + * @param ... Indicates a list of parameters. The number and type of parameters must map onto the format specifiers + * in the format string. + * @see OH_LOG_Print + * @since 8 + */ +#define OH_LOG_DEBUG(type, ...) ((void)OH_LOG_Print((type), LOG_DEBUG, LOG_DOMAIN, LOG_TAG, __VA_ARGS__)) + +/** + * @brief Outputs informational logs. This is a function-like macro. + * + * Before calling this function, define the log service domain and log tag. Generally, you need to define them + * at the beginning of the source file. \n + * + * @param type Indicates the log type. The type for third-party applications is defined by {@link LOG_APP}. + * @param fmt Indicates the format string, which is an enhancement of a printf format string and supports the privacy + * identifier. Specifically, {public} or {private} is added between the % character and the format specifier in + * each parameter. \n + * @param ... Indicates a list of parameters. The number and type of parameters must map onto the format specifiers + * in the format string. + * @see OH_LOG_Print + * @since 8 + */ +#define OH_LOG_INFO(type, ...) ((void)OH_LOG_Print((type), LOG_INFO, LOG_DOMAIN, LOG_TAG, __VA_ARGS__)) + +/** + * @brief Outputs warning logs. This is a function-like macro. + * + * Before calling this function, define the log service domain and log tag. Generally, you need to define them + * at the beginning of the source file. \n + * + * @param type Indicates the log type. The type for third-party applications is defined by {@link LOG_APP}. + * @param fmt Indicates the format string, which is an enhancement of a printf format string and supports the + * privacy identifier. Specifically, {public} or {private} is added between the % character and the format specifier + * in each parameter. \n + * @param ... Indicates a list of parameters. The number and type of parameters must map onto the format specifiers + * in the format string. + * @see OH_LOG_Print + * @since 8 + */ +#define OH_LOG_WARN(type, ...) ((void)OH_LOG_Print((type), LOG_WARN, LOG_DOMAIN, LOG_TAG, __VA_ARGS__)) + +/** + * @brief Outputs error logs. This is a function-like macro. + * + * Before calling this function, define the log service domain and log tag. Generally, you need to define + * them at the beginning of the source file. \n + * + * @param type Indicates the log type. The type for third-party applications is defined by {@link LOG_APP}. + * @param fmt Indicates the format string, which is an enhancement of a printf format string and supports the privacy + * identifier. Specifically, {public} or {private} is added between the % character and the format specifier in each + * parameter. \n + * @param ... Indicates a list of parameters. The number and type of parameters must map onto the format specifiers + * in the format string. + * @see OH_LOG_Print + * @since 8 + */ +#define OH_LOG_ERROR(type, ...) ((void)OH_LOG_Print((type), LOG_ERROR, LOG_DOMAIN, LOG_TAG, __VA_ARGS__)) + +/** + * @brief Outputs fatal logs. This is a function-like macro. + * + * Before calling this function, define the log service domain and log tag. Generally, you need to define them at + * the beginning of the source file. \n + * + * @param type Indicates the log type. The type for third-party applications is defined by {@link LOG_APP}. + * @param fmt Indicates the format string, which is an enhancement of a printf format string and supports the privacy + * identifier. Specifically, {public} or {private} is added between the % character and the format specifier in + * each parameter. \n + * @param ... Indicates a list of parameters. The number and type of parameters must map onto the format specifiers + * in the format string. + * @see OH_LOG_Print + * @since 8 + */ +#define OH_LOG_FATAL(type, ...) ((void)OH_LOG_Print((type), LOG_FATAL, LOG_DOMAIN, LOG_TAG, __VA_ARGS__)) + +/** + * @brief Defines the function pointer type for the user-defined log processing function. + * + * @param type Indicates the log type. The type for third-party applications is defined by {@link LOG_APP}. + * @param level Indicates the log level, which can be LOG_DEBUG, LOG_INFO, LOG_WARN, + * LOG_ERROR, and LOG_FATAL. + * @param domain Indicates the service domain of logs. Its value is a hexadecimal integer ranging from 0x0 to 0xFFFF. + * @param tag Indicates the log tag, which is a string used to identify the class, file, or service behavior. + * @param msg Indicates the log message itself, which is a formatted log string. + * @since 11 + */ +typedef void (*LogCallback)(const LogType type, const LogLevel level, const unsigned int domain, const char *tag, + const char *msg); + +/** + * @brief Set the user-defined log processing function. + * + * After calling this function, the callback function implemented by the user can receive all hilogs of the + * current process. + * Note that it will not change the default behavior of hilog logs of the current process, no matter whether this + * interface is called or not. \n + * + * @param callback Indicates the callback function implemented by the user. If you do not need to process hilog logs, + * you can transfer a null pointer. + * @since 11 + */ +void OH_LOG_SetCallback(LogCallback callback); + +#ifdef __cplusplus +} +#endif +/** @} */ + +#ifdef HILOG_RAWFORMAT +#include "hilog/log_inner.h" +#endif + +#endif // HIVIEWDFX_HILOG_C_H -- Gitee From 0f42cf9a838c41136595e064266b89cad8563dbf Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Thu, 14 Nov 2024 18:13:21 +0300 Subject: [PATCH 02/20] compiler --- arkoala/framework/scripts/configure.mjs | 7 ++- arkoala/tools/compiler/.gitignore | 2 + arkoala/tools/compiler/install.mjs | 53 +++++++++++++++++++++ arkoala/tools/compiler/package.json | 9 ++++ arkoala/tools/peer-generator/.gitlab-ci.yml | 6 +++ 5 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 arkoala/tools/compiler/.gitignore create mode 100644 arkoala/tools/compiler/install.mjs create mode 100644 arkoala/tools/compiler/package.json diff --git a/arkoala/framework/scripts/configure.mjs b/arkoala/framework/scripts/configure.mjs index feba326eb..828e64b32 100644 --- a/arkoala/framework/scripts/configure.mjs +++ b/arkoala/framework/scripts/configure.mjs @@ -278,9 +278,14 @@ function createOhosCrossFile(target) { suffix = ".exe"; } compilersPath = path.join(sdkNativePath, "llvm", "bin"); + let sysroot = path.resolve(path.join(sdkNativePath, 'sysroot')) + if (platform == 'linux') { + compilersPath = path.resolve('../../tools/compiler/llvm-toolchain') + sysroot = path.resolve('../../tools/compiler/sysroot') + } let cflags = [ - '--sysroot=' + path.resolve(path.join(sdkNativePath, 'sysroot')) + '--sysroot=' + sysroot ] let cpu = 'unknown' if (target == 'hzvm-ohos-arm64' || target == 'hzvm-ohos-arm64-vmloader' || target == 'panda-ohos-arm64') { diff --git a/arkoala/tools/compiler/.gitignore b/arkoala/tools/compiler/.gitignore new file mode 100644 index 000000000..3c49376d5 --- /dev/null +++ b/arkoala/tools/compiler/.gitignore @@ -0,0 +1,2 @@ +llvm-toolchain +sysroot \ No newline at end of file diff --git a/arkoala/tools/compiler/install.mjs b/arkoala/tools/compiler/install.mjs new file mode 100644 index 000000000..d9755ecea --- /dev/null +++ b/arkoala/tools/compiler/install.mjs @@ -0,0 +1,53 @@ +import { existsSync } from "fs" + +const platform = (() => { + switch (process.platform) { + case "linux": return "linux" + default: throw new Error(`Unsupported platform ${process.platform}`) + } +})() + +const arch = (() => { + switch (process.arch) { + case "x64": return "x86_64" + case "arm64": return "arm64" + default: throw new Error(`Unsupported arch ${process.platform}`) + } +})() + +const generic_package_archive_resolve = (async (koala_bz) => { + switch (koala_bz) { + case 0: + const { generic_package_archive_gitlab } = await import("../../../../sdk/scripts/gitlab/gitlab.mjs") + return generic_package_archive_gitlab + case 1: + const { generic_package_archive_openlab } = await import("../../ohos-sdk/scripts/openlab.mjs") + return generic_package_archive_openlab + default: throw new Error(`Invalid koala_bz ${koala_bz}`) + } +}) + +const koala_bz = parseInt(process.env.KOALA_BZ) ?? 0 +const llvm_toolchain = `llvm-toolchain-${arch}_${platform}.tar.gz` +const sysroot_arm = `sysroot-arm.tar.gz` +const sysroot_arm64 = `sysroot-arm64.tar.gz` + +const generic_package_archive = await generic_package_archive_resolve(koala_bz) + +if (!existsSync("./llvm_toolchain") && process.argv[2] == 'toolchain') { + generic_package_archive( + "compiler", + "1.0.0", + llvm_toolchain, + "./llvm-toolchain" + ) +} + +if (!existsSync("./sysroot") && process.argv[2] == 'sysroot') { + generic_package_archive( + "compiler", + "1.0.0", + process.argv[3] == 'arm64' ? sysroot_arm64 : sysroot_arm, + "./sysroot" + ) +} diff --git a/arkoala/tools/compiler/package.json b/arkoala/tools/compiler/package.json new file mode 100644 index 000000000..b9288fcb7 --- /dev/null +++ b/arkoala/tools/compiler/package.json @@ -0,0 +1,9 @@ +{ + "name": "compiler", + "description": "", + "scripts": { + "install:toolchain": "node install.mjs toolchain", + "install:sysroot:arm64": "node install.mjs sysroot arm64", + "install:sysroot:arm32": "node install.mjs sysroot arm32" + } +} \ No newline at end of file diff --git a/arkoala/tools/peer-generator/.gitlab-ci.yml b/arkoala/tools/peer-generator/.gitlab-ci.yml index 341aa7671..66e0a3ddb 100644 --- a/arkoala/tools/peer-generator/.gitlab-ci.yml +++ b/arkoala/tools/peer-generator/.gitlab-ci.yml @@ -59,6 +59,8 @@ Build generated ArkoalaNative (linux, ohos-arm64, hzvm): - Idlize generate arkoala/arkui (linux) script: - !reference [.setup, script] + - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run install:toolchain --prefix arkoala/tools/compiler + - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run install:sysroot:arm64 --prefix arkoala/tools/compiler - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework artifacts: paths: @@ -75,6 +77,8 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm): - Idlize generate arkoala/arkui (linux) script: - !reference [.setup, script] + - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run install:toolchain --prefix arkoala/tools/compiler + - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run install:sysroot:arm32 --prefix arkoala/tools/compiler - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework artifacts: paths: @@ -145,6 +149,8 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm+panda): - Idlize generate arkoala-arkts/arkui (linux) script: - !reference [.setup, script] + - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run install:toolchain --prefix arkoala/tools/compiler + - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run install:sysroot:arm32 --prefix arkoala/tools/compiler - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework artifacts: paths: -- Gitee From 28e88dfe727cdf4311740fb70ea72d9a077280b9 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Thu, 14 Nov 2024 18:15:41 +0300 Subject: [PATCH 03/20] variables --- arkoala/tools/peer-generator/.gitlab-ci.yml | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arkoala/tools/peer-generator/.gitlab-ci.yml b/arkoala/tools/peer-generator/.gitlab-ci.yml index 66e0a3ddb..a9acb0578 100644 --- a/arkoala/tools/peer-generator/.gitlab-ci.yml +++ b/arkoala/tools/peer-generator/.gitlab-ci.yml @@ -7,7 +7,7 @@ Idlize generate arkoala/arkui (linux): needs: [] script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run ohos-sdk --prefix arkoala/arkui-common + - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run ohos-sdk --prefix arkoala/arkui-common - npm i --prefix arkoala/tools/peer-generator - npm run generate:ts --prefix arkoala/tools/peer-generator artifacts: @@ -59,9 +59,9 @@ Build generated ArkoalaNative (linux, ohos-arm64, hzvm): - Idlize generate arkoala/arkui (linux) script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run install:toolchain --prefix arkoala/tools/compiler - - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run install:sysroot:arm64 --prefix arkoala/tools/compiler - - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework + - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run install:toolchain --prefix arkoala/tools/compiler + - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run install:sysroot:arm64 --prefix arkoala/tools/compiler + - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework artifacts: paths: - arkoala/framework/build/libArkoalaNative.so @@ -77,9 +77,9 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm): - Idlize generate arkoala/arkui (linux) script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run install:toolchain --prefix arkoala/tools/compiler - - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run install:sysroot:arm32 --prefix arkoala/tools/compiler - - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework + - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run install:toolchain --prefix arkoala/tools/compiler + - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run install:sysroot:arm32 --prefix arkoala/tools/compiler + - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework artifacts: paths: - arkoala/framework/build/libArkoalaNative.so @@ -94,7 +94,7 @@ Idlize generate arkoala-arkts/arkui (linux): needs: [] script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run ohos-sdk --prefix arkoala/arkui-common + - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run ohos-sdk --prefix arkoala/arkui-common - npm i --prefix arkoala/tools/peer-generator - npm run generate:arkts --prefix arkoala/tools/peer-generator artifacts: @@ -149,9 +149,9 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm+panda): - Idlize generate arkoala-arkts/arkui (linux) script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run install:toolchain --prefix arkoala/tools/compiler - - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run install:sysroot:arm32 --prefix arkoala/tools/compiler - - KOALA_BZ=1 OPENLAB_USERNAME=koala-ci OPENLAB_PASSWORD=w1llUgu3ss npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework + - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run install:toolchain --prefix arkoala/tools/compiler + - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run install:sysroot:arm32 --prefix arkoala/tools/compiler + - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework artifacts: paths: - arkoala/framework/build/libArkoalaLoader.so -- Gitee From 9304c0488c176a5c196bffb9c68ba64ae6d5ea8a Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Thu, 14 Nov 2024 18:21:11 +0300 Subject: [PATCH 04/20] more clever scripts --- arkoala/framework/package.json | 11 +++++++---- arkoala/tools/peer-generator/.gitlab-ci.yml | 6 ------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/arkoala/framework/package.json b/arkoala/framework/package.json index c9ae2443f..c545a71f3 100644 --- a/arkoala/framework/package.json +++ b/arkoala/framework/package.json @@ -23,6 +23,9 @@ "@types/node": "^18.0.0" }, "scripts": { + "prepare": "npm run --prefix ../ohos-sdk download && npm run install:toolchain --prefix ../tools/compiler", + "prepare:arm64": "npm run prepare && npm run install:sysroot:arm64 --prefix ../tools/compiler", + "prepare:arm32": "npm run prepare && npm run install:sysroot:arm32 --prefix ../tools/compiler", "clean": "memo-tsc -b . --clean && rimraf -g build dist lib generated native/build-* *.ini", "configure:native-node-host": "cd native && meson setup -D vm_kind=node build-node-host", "compile:native-node-host": "npm run configure:native-node-host && cd native && meson compile -C build-node-host && meson install -C build-node-host", @@ -32,15 +35,15 @@ "compile:native-panda-host": "npm run configure:native-panda-host && cd native && meson compile -C build-panda-host && meson install -C build-panda-host", "configure:native-jvm-host": "cd native && meson setup -D vm_kind=jvm build-jvm-host -D jdk_dir=$JAVA_HOME", "compile:native-jvm-host": "npm run configure:native-jvm-host && cd native && meson compile -C build-jvm-host && meson install -C build-jvm-host", - "configure:native-hzvm-ohos-arm64": "npm run --prefix ../ohos-sdk download && cd native && node ../scripts/configure.mjs hzvm-ohos-arm64", + "configure:native-hzvm-ohos-arm64": "npm run prepare:arm64 && cd native && node ../scripts/configure.mjs hzvm-ohos-arm64", "compile:native-hzvm-ohos-arm64": "npm run configure:native-hzvm-ohos-arm64 && cd native && meson compile -C build-hzvm-ohos-arm64 && meson install -C build-hzvm-ohos-arm64", - "configure:native-hzvm-ohos-arm32": "npm run --prefix ../ohos-sdk download && cd native && node ../scripts/configure.mjs hzvm-ohos-arm32", + "configure:native-hzvm-ohos-arm32": "npm run prepare:arm32 && cd native && node ../scripts/configure.mjs hzvm-ohos-arm32", "compile:native-hzvm-ohos-arm32": "npm run configure:native-hzvm-ohos-arm32 && cd native && meson compile -C build-hzvm-ohos-arm32 && meson install -C build-hzvm-ohos-arm32", "configure:native-hzvm-ohos": "npm run configure:native-hzvm-ohos-arm64", "compile:native-hzvm-ohos": "memo-tsc -b . && npm run compile:native-hzvm-ohos-arm64", - "configure:native-panda-ohos-arm64": "npm run --prefix ../ohos-sdk download && cd native && node ../scripts/configure.mjs panda-ohos-arm64", + "configure:native-panda-ohos-arm64": "npm run prepare:arm64 && cd native && node ../scripts/configure.mjs panda-ohos-arm64", "compile:native-panda-ohos-arm64": "npm run configure:native-panda-ohos-arm64 && cd native && meson compile -C build-panda-ohos-arm64 && meson install -C build-panda-ohos-arm64", - "configure:native-panda-ohos-arm32": "npm run --prefix ../ohos-sdk download && cd native && node ../scripts/configure.mjs panda-ohos-arm32", + "configure:native-panda-ohos-arm32": "npm run prepare:arm32 && cd native && node ../scripts/configure.mjs panda-ohos-arm32", "compile:native-panda-ohos-arm32": "npm run configure:native-panda-ohos-arm32 && cd native && meson compile -C build-panda-ohos-arm32 && meson install -C build-panda-ohos-arm32", "configure:native-panda-with-node-host": "npm run configure:native-panda-host && cd native && meson setup -D vm_kind=node -D vmloader=true -D arkoala=false build-node-host-vmloader", "compile:native-panda-with-node-host": "npm run configure:native-panda-with-node-host && cd native && npm run compile:native-panda-host && meson compile -C build-node-host-vmloader && meson install -C build-node-host-vmloader", diff --git a/arkoala/tools/peer-generator/.gitlab-ci.yml b/arkoala/tools/peer-generator/.gitlab-ci.yml index a9acb0578..20e7fb09b 100644 --- a/arkoala/tools/peer-generator/.gitlab-ci.yml +++ b/arkoala/tools/peer-generator/.gitlab-ci.yml @@ -59,8 +59,6 @@ Build generated ArkoalaNative (linux, ohos-arm64, hzvm): - Idlize generate arkoala/arkui (linux) script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run install:toolchain --prefix arkoala/tools/compiler - - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run install:sysroot:arm64 --prefix arkoala/tools/compiler - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework artifacts: paths: @@ -77,8 +75,6 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm): - Idlize generate arkoala/arkui (linux) script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run install:toolchain --prefix arkoala/tools/compiler - - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run install:sysroot:arm32 --prefix arkoala/tools/compiler - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework artifacts: paths: @@ -149,8 +145,6 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm+panda): - Idlize generate arkoala-arkts/arkui (linux) script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run install:toolchain --prefix arkoala/tools/compiler - - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run install:sysroot:arm32 --prefix arkoala/tools/compiler - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework artifacts: paths: -- Gitee From b6aacdd0d16699e9a375d6bc98d01dc8cdeead2a Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Thu, 14 Nov 2024 18:41:07 +0300 Subject: [PATCH 05/20] refactor --- arkoala/framework/scripts/configure.mjs | 2 +- arkoala/tools/compiler/.gitignore | 3 +- arkoala/tools/compiler/install.mjs | 53 ++++++++++++++++--------- 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/arkoala/framework/scripts/configure.mjs b/arkoala/framework/scripts/configure.mjs index 828e64b32..97a30284c 100644 --- a/arkoala/framework/scripts/configure.mjs +++ b/arkoala/framework/scripts/configure.mjs @@ -281,7 +281,7 @@ function createOhosCrossFile(target) { let sysroot = path.resolve(path.join(sdkNativePath, 'sysroot')) if (platform == 'linux') { compilersPath = path.resolve('../../tools/compiler/llvm-toolchain') - sysroot = path.resolve('../../tools/compiler/sysroot') + sysroot = path.resolve(`../../tools/compiler/sysroot-${ target.includes('arm64') ? 'arm64' : 'arm' }`) } let cflags = [ diff --git a/arkoala/tools/compiler/.gitignore b/arkoala/tools/compiler/.gitignore index 3c49376d5..607900710 100644 --- a/arkoala/tools/compiler/.gitignore +++ b/arkoala/tools/compiler/.gitignore @@ -1,2 +1,3 @@ llvm-toolchain -sysroot \ No newline at end of file +sysroot-arm +sysroot-arm64 diff --git a/arkoala/tools/compiler/install.mjs b/arkoala/tools/compiler/install.mjs index d9755ecea..04f3ff688 100644 --- a/arkoala/tools/compiler/install.mjs +++ b/arkoala/tools/compiler/install.mjs @@ -1,4 +1,10 @@ import { existsSync } from "fs" +import path from "path" +import chalk from "chalk" + +function log(msg) { + console.log(chalk.green(msg)) +} const platform = (() => { switch (process.platform) { @@ -27,27 +33,36 @@ const generic_package_archive_resolve = (async (koala_bz) => { } }) -const koala_bz = parseInt(process.env.KOALA_BZ) ?? 0 -const llvm_toolchain = `llvm-toolchain-${arch}_${platform}.tar.gz` -const sysroot_arm = `sysroot-arm.tar.gz` -const sysroot_arm64 = `sysroot-arm64.tar.gz` - +const koala_bz = parseInt(process.env.KOALA_BZ ?? "0") const generic_package_archive = await generic_package_archive_resolve(koala_bz) -if (!existsSync("./llvm_toolchain") && process.argv[2] == 'toolchain') { - generic_package_archive( - "compiler", - "1.0.0", - llvm_toolchain, - "./llvm-toolchain" - ) +const llvm_toolchain = `llvm-toolchain-${platform}_${arch}` +const sysroot_arm = `sysroot-arm` +const sysroot_arm64 = `sysroot-arm64` + +if (process.argv[2] == 'toolchain') { + if (existsSync("./llvm_toolchain")) { + log(`> ${llvm-toolchain} is already installed at ${ path.resolve("./llvm-toolchain") }`) + } else { + generic_package_archive( + "compiler", + "1.0.0", + `${llvm_toolchain}.tar.gz`, + path.resolve("./llvm_toolchain") + ) + } } -if (!existsSync("./sysroot") && process.argv[2] == 'sysroot') { - generic_package_archive( - "compiler", - "1.0.0", - process.argv[3] == 'arm64' ? sysroot_arm64 : sysroot_arm, - "./sysroot" - ) +if (process.argv[2] == 'sysroot') { + const sysroot = process.argv[3] == 'arm64' ? sysroot_arm64 : sysroot_arm + if (existsSync(`./${sysroot}`)) { + log(`> ${path} is already installed at ${ path.resolve(`./${path}`) }`) + } else { + generic_package_archive( + "compiler", + "1.0.0", + sysroot, + path.resolve(`./${sysroot}`) + ) + } } -- Gitee From 9fea6ad3306e0d56015d39b97b4214bb3dbf7072 Mon Sep 17 00:00:00 2001 From: Korobeinikov Evgeny Date: Thu, 14 Nov 2024 19:05:21 +0300 Subject: [PATCH 06/20] fix --- arkoala/framework/scripts/configure.mjs | 2 +- arkoala/tools/compiler/install.mjs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arkoala/framework/scripts/configure.mjs b/arkoala/framework/scripts/configure.mjs index 97a30284c..e9cdccddb 100644 --- a/arkoala/framework/scripts/configure.mjs +++ b/arkoala/framework/scripts/configure.mjs @@ -280,7 +280,7 @@ function createOhosCrossFile(target) { compilersPath = path.join(sdkNativePath, "llvm", "bin"); let sysroot = path.resolve(path.join(sdkNativePath, 'sysroot')) if (platform == 'linux') { - compilersPath = path.resolve('../../tools/compiler/llvm-toolchain') + compilersPath = path.resolve('../../tools/compiler/llvm-toolchain/bin') sysroot = path.resolve(`../../tools/compiler/sysroot-${ target.includes('arm64') ? 'arm64' : 'arm' }`) } diff --git a/arkoala/tools/compiler/install.mjs b/arkoala/tools/compiler/install.mjs index 04f3ff688..403c539ab 100644 --- a/arkoala/tools/compiler/install.mjs +++ b/arkoala/tools/compiler/install.mjs @@ -41,14 +41,14 @@ const sysroot_arm = `sysroot-arm` const sysroot_arm64 = `sysroot-arm64` if (process.argv[2] == 'toolchain') { - if (existsSync("./llvm_toolchain")) { - log(`> ${llvm-toolchain} is already installed at ${ path.resolve("./llvm-toolchain") }`) + if (existsSync("./llvm-toolchain")) { + log(`> ${llvm_toolchain} is already installed at ${ path.resolve("./llvm-toolchain") }`) } else { generic_package_archive( "compiler", "1.0.0", `${llvm_toolchain}.tar.gz`, - path.resolve("./llvm_toolchain") + path.resolve("./llvm-toolchain") ) } } @@ -56,12 +56,12 @@ if (process.argv[2] == 'toolchain') { if (process.argv[2] == 'sysroot') { const sysroot = process.argv[3] == 'arm64' ? sysroot_arm64 : sysroot_arm if (existsSync(`./${sysroot}`)) { - log(`> ${path} is already installed at ${ path.resolve(`./${path}`) }`) + log(`> ${sysroot} is already installed at ${ path.resolve(`./${sysroot}`) }`) } else { generic_package_archive( "compiler", "1.0.0", - sysroot, + `${sysroot}.tar.gz`, path.resolve(`./${sysroot}`) ) } -- Gitee From b64ac6ba52b317b70ce3ecdf8da4e2504ba1b024 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Thu, 14 Nov 2024 20:42:32 +0300 Subject: [PATCH 07/20] fix+cache --- arkoala/framework/package.json | 6 +++--- arkoala/tools/peer-generator/.gitlab-ci.yml | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/arkoala/framework/package.json b/arkoala/framework/package.json index c545a71f3..32e0f626b 100644 --- a/arkoala/framework/package.json +++ b/arkoala/framework/package.json @@ -23,9 +23,9 @@ "@types/node": "^18.0.0" }, "scripts": { - "prepare": "npm run --prefix ../ohos-sdk download && npm run install:toolchain --prefix ../tools/compiler", - "prepare:arm64": "npm run prepare && npm run install:sysroot:arm64 --prefix ../tools/compiler", - "prepare:arm32": "npm run prepare && npm run install:sysroot:arm32 --prefix ../tools/compiler", + "prepare:compiler": "npm run --prefix ../ohos-sdk download && npm run install:toolchain --prefix ../tools/compiler", + "prepare:arm64": "npm run prepare:compiler && npm run install:sysroot:arm64 --prefix ../tools/compiler", + "prepare:arm32": "npm run prepare:compiler && npm run install:sysroot:arm32 --prefix ../tools/compiler", "clean": "memo-tsc -b . --clean && rimraf -g build dist lib generated native/build-* *.ini", "configure:native-node-host": "cd native && meson setup -D vm_kind=node build-node-host", "compile:native-node-host": "npm run configure:native-node-host && cd native && meson compile -C build-node-host && meson install -C build-node-host", diff --git a/arkoala/tools/peer-generator/.gitlab-ci.yml b/arkoala/tools/peer-generator/.gitlab-ci.yml index 20e7fb09b..f4422d325 100644 --- a/arkoala/tools/peer-generator/.gitlab-ci.yml +++ b/arkoala/tools/peer-generator/.gitlab-ci.yml @@ -60,6 +60,11 @@ Build generated ArkoalaNative (linux, ohos-arm64, hzvm): script: - !reference [.setup, script] - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework + cache: + key: compiler-with-arm64-sysroot + paths: + - arkoala/tools/compiler/llvm-toolchain + - arkoala/tools/compiler/sysroot-arm64 artifacts: paths: - arkoala/framework/build/libArkoalaNative.so @@ -76,6 +81,11 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm): script: - !reference [.setup, script] - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework + cache: + key: compiler-with-arm32-sysroot + paths: + - arkoala/tools/compiler/llvm-toolchain + - arkoala/tools/compiler/sysroot-arm artifacts: paths: - arkoala/framework/build/libArkoalaNative.so @@ -146,6 +156,11 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm+panda): script: - !reference [.setup, script] - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework + cache: + key: compiler-with-arm32-sysroot + paths: + - arkoala/tools/compiler/llvm-toolchain + - arkoala/tools/compiler/sysroot-arm artifacts: paths: - arkoala/framework/build/libArkoalaLoader.so -- Gitee From 0227eb3973e41dced46ed0942769889d258e2a72 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Thu, 14 Nov 2024 22:21:07 +0300 Subject: [PATCH 08/20] add version + copy libc++.so --- arkoala/framework/package.json | 6 +++--- arkoala/tools/compiler/package.json | 7 +++++-- arkoala/tools/peer-generator/.gitlab-ci.yml | 7 ++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/arkoala/framework/package.json b/arkoala/framework/package.json index 32e0f626b..9b7843d47 100644 --- a/arkoala/framework/package.json +++ b/arkoala/framework/package.json @@ -23,7 +23,7 @@ "@types/node": "^18.0.0" }, "scripts": { - "prepare:compiler": "npm run --prefix ../ohos-sdk download && npm run install:toolchain --prefix ../tools/compiler", + "prepare:compiler": "test $(node -e \"console.log(process.platform)\") != \"linux\" && npm run --prefix ../ohos-sdk download || npm run install:toolchain --prefix ../tools/compiler", "prepare:arm64": "npm run prepare:compiler && npm run install:sysroot:arm64 --prefix ../tools/compiler", "prepare:arm32": "npm run prepare:compiler && npm run install:sysroot:arm32 --prefix ../tools/compiler", "clean": "memo-tsc -b . --clean && rimraf -g build dist lib generated native/build-* *.ini", @@ -48,9 +48,9 @@ "configure:native-panda-with-node-host": "npm run configure:native-panda-host && cd native && meson setup -D vm_kind=node -D vmloader=true -D arkoala=false build-node-host-vmloader", "compile:native-panda-with-node-host": "npm run configure:native-panda-with-node-host && cd native && npm run compile:native-panda-host && meson compile -C build-node-host-vmloader && meson install -C build-node-host-vmloader", "configure:native-panda-with-hzvm-ohos-arm64": "npm run configure:native-panda-ohos-arm64 && cd native && node ../scripts/configure.mjs hzvm-ohos-arm64-vmloader", - "compile:native-panda-with-hzvm-ohos-arm64": "npm run configure:native-panda-with-hzvm-ohos-arm64 && npm run compile:native-panda-ohos-arm64 && cd native && meson compile -C build-hzvm-ohos-arm64-vmloader && meson install -C build-hzvm-ohos-arm64-vmloader", + "compile:native-panda-with-hzvm-ohos-arm64": "npm run configure:native-panda-with-hzvm-ohos-arm64 && npm run compile:native-panda-ohos-arm64 && cd native && meson compile -C build-hzvm-ohos-arm64-vmloader && meson install -C build-hzvm-ohos-arm64-vmloader && npm run copy:libcpp:arm64 --prefix ../../tools/compiler", "configure:native-panda-with-hzvm-ohos-arm32": "npm run configure:native-panda-ohos-arm32 && cd native && node ../scripts/configure.mjs hzvm-ohos-arm32-vmloader", - "compile:native-panda-with-hzvm-ohos-arm32": "npm run configure:native-panda-with-hzvm-ohos-arm32 && npm run compile:native-panda-ohos-arm32 && cd native && meson compile -C build-hzvm-ohos-arm32-vmloader && meson install -C build-hzvm-ohos-arm32-vmloader", + "compile:native-panda-with-hzvm-ohos-arm32": "npm run configure:native-panda-with-hzvm-ohos-arm32 && npm run compile:native-panda-ohos-arm32 && cd native && meson compile -C build-hzvm-ohos-arm32-vmloader && meson install -C build-hzvm-ohos-arm32-vmloader && npm run copy:libcpp:arm32 --prefix ../../tools/compiler", "compile:node-host": "memo-tsc -b . && npm run compile:native-node-host", "compile": "npm run compile:node-host", "compile:hzvm-host": "memo-tsc -b . && npm run compile:native-hzvm-host", diff --git a/arkoala/tools/compiler/package.json b/arkoala/tools/compiler/package.json index b9288fcb7..e7701b8d7 100644 --- a/arkoala/tools/compiler/package.json +++ b/arkoala/tools/compiler/package.json @@ -1,9 +1,12 @@ { - "name": "compiler", + "name": "compiler-installer", + "version": "1.0.0", "description": "", "scripts": { "install:toolchain": "node install.mjs toolchain", "install:sysroot:arm64": "node install.mjs sysroot arm64", - "install:sysroot:arm32": "node install.mjs sysroot arm32" + "install:sysroot:arm32": "node install.mjs sysroot arm32", + "copy:libcpp:arm64": "cp sysroot-arm64/libc++.so ../../framework/build", + "copy:libcpp:arm32": "cp sysroot-arm/libc++.so ../../framework/build" } } \ No newline at end of file diff --git a/arkoala/tools/peer-generator/.gitlab-ci.yml b/arkoala/tools/peer-generator/.gitlab-ci.yml index f4422d325..ac3409a61 100644 --- a/arkoala/tools/peer-generator/.gitlab-ci.yml +++ b/arkoala/tools/peer-generator/.gitlab-ci.yml @@ -61,7 +61,7 @@ Build generated ArkoalaNative (linux, ohos-arm64, hzvm): - !reference [.setup, script] - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework cache: - key: compiler-with-arm64-sysroot + key: compiler-with-arm64-sysroot-1.0.0 paths: - arkoala/tools/compiler/llvm-toolchain - arkoala/tools/compiler/sysroot-arm64 @@ -82,7 +82,7 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm): - !reference [.setup, script] - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework cache: - key: compiler-with-arm32-sysroot + key: compiler-with-arm32-sysroot-1.0.0 paths: - arkoala/tools/compiler/llvm-toolchain - arkoala/tools/compiler/sysroot-arm @@ -157,7 +157,7 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm+panda): - !reference [.setup, script] - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework cache: - key: compiler-with-arm32-sysroot + key: compiler-with-arm32-sysroot-1.0.0 paths: - arkoala/tools/compiler/llvm-toolchain - arkoala/tools/compiler/sysroot-arm @@ -166,4 +166,5 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm+panda): - arkoala/framework/build/libArkoalaLoader.so - arkoala/framework/build/libvmloader.so - arkoala/framework/build/libArkoalaNative_ark.so + - arkoala/framework/build/libc++.so expire_in: 1 day -- Gitee From eefae366a6017e46060d7a374c8ce471ef0b5d0a Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Thu, 14 Nov 2024 23:01:09 +0300 Subject: [PATCH 09/20] ci -- Gitee From 20d8a306ca0f0fa1fb218310e0a71decee630f0c Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Thu, 14 Nov 2024 23:25:46 +0300 Subject: [PATCH 10/20] ci -- Gitee From b87942e6bb61ac7a4da52ddbee4ba6f8bff05e64 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Thu, 14 Nov 2024 23:43:32 +0300 Subject: [PATCH 11/20] fix --- arkoala/framework/scripts/configure.mjs | 11 +++++++---- arkoala/tools/peer-generator/.gitlab-ci.yml | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arkoala/framework/scripts/configure.mjs b/arkoala/framework/scripts/configure.mjs index e9cdccddb..dac72d68d 100644 --- a/arkoala/framework/scripts/configure.mjs +++ b/arkoala/framework/scripts/configure.mjs @@ -271,17 +271,20 @@ function createAndroidCrossFile(target) { function createOhosCrossFile(target) { let cf = CrossFile(target, root); - let sdkNativePath = ohSdkInfo(OHCONF.sdkPath(), OH_SDK_COMPONENT.native).path + let sdkNativePath = "" let compilersPath = "" + let sysroot = "" let suffix = "" if (platform == 'win32') { - suffix = ".exe"; + suffix = ".exe" } - compilersPath = path.join(sdkNativePath, "llvm", "bin"); - let sysroot = path.resolve(path.join(sdkNativePath, 'sysroot')) if (platform == 'linux') { compilersPath = path.resolve('../../tools/compiler/llvm-toolchain/bin') sysroot = path.resolve(`../../tools/compiler/sysroot-${ target.includes('arm64') ? 'arm64' : 'arm' }`) + } else { + sdkNativePath = ohSdkInfo(OHCONF.sdkPath(), OH_SDK_COMPONENT.native).path + compilersPath = path.join(sdkNativePath, "llvm", "bin") + sysroot = path.resolve(path.join(sdkNativePath, 'sysroot')) } let cflags = [ diff --git a/arkoala/tools/peer-generator/.gitlab-ci.yml b/arkoala/tools/peer-generator/.gitlab-ci.yml index ac3409a61..7bdbd8d5f 100644 --- a/arkoala/tools/peer-generator/.gitlab-ci.yml +++ b/arkoala/tools/peer-generator/.gitlab-ci.yml @@ -45,7 +45,7 @@ Build generated ArkoalaNative (linux, linux, node): - npm run compile:native-node-host --prefix arkoala/framework artifacts: paths: - - arkoala/framework/build/ArkoalaNative_linux_x64.node + - arkoala/framework/build/ArkoalaNative_linux_arm64.node - arkoala/framework/build/libace_compatible_mock.so expire_in: 1 day @@ -141,7 +141,7 @@ Build generated ArkoalaNative (linux, linux, node+panda): paths: - arkoala/framework/build/ArkoalaLoader.node - arkoala/framework/build/libvmloader.so - - arkoala/framework/build/libArkoalaNative_linux_x64_ark.so + - arkoala/framework/build/libArkoalaNative_linux_arm64_ark.so - arkoala/framework/build/libace_compatible_mock.so expire_in: 1 day -- Gitee From ec749fa06f44cda9efc5718036ef35663eed73ed Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Fri, 15 Nov 2024 00:30:09 +0300 Subject: [PATCH 12/20] test --- arkoala/tools/peer-generator/.gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arkoala/tools/peer-generator/.gitlab-ci.yml b/arkoala/tools/peer-generator/.gitlab-ci.yml index 7bdbd8d5f..1c1f79f1e 100644 --- a/arkoala/tools/peer-generator/.gitlab-ci.yml +++ b/arkoala/tools/peer-generator/.gitlab-ci.yml @@ -7,7 +7,7 @@ Idlize generate arkoala/arkui (linux): needs: [] script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run ohos-sdk --prefix arkoala/arkui-common + - KOALA_BZ=1 npm run ohos-sdk --prefix arkoala/arkui-common - npm i --prefix arkoala/tools/peer-generator - npm run generate:ts --prefix arkoala/tools/peer-generator artifacts: @@ -59,7 +59,7 @@ Build generated ArkoalaNative (linux, ohos-arm64, hzvm): - Idlize generate arkoala/arkui (linux) script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework + - KOALA_BZ=1 npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework cache: key: compiler-with-arm64-sysroot-1.0.0 paths: @@ -80,7 +80,7 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm): - Idlize generate arkoala/arkui (linux) script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework + - KOALA_BZ=1 npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework cache: key: compiler-with-arm32-sysroot-1.0.0 paths: @@ -100,7 +100,7 @@ Idlize generate arkoala-arkts/arkui (linux): needs: [] script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run ohos-sdk --prefix arkoala/arkui-common + - KOALA_BZ=1 npm run ohos-sdk --prefix arkoala/arkui-common - npm i --prefix arkoala/tools/peer-generator - npm run generate:arkts --prefix arkoala/tools/peer-generator artifacts: @@ -155,7 +155,7 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm+panda): - Idlize generate arkoala-arkts/arkui (linux) script: - !reference [.setup, script] - - KOALA_BZ=1 OPENLAB_USERNAME=$OPENLAB_USERNAME OPENLAB_PASSWORD=$OPENLAB_PASSWORD npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework + - KOALA_BZ=1 npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework cache: key: compiler-with-arm32-sysroot-1.0.0 paths: -- Gitee From 98de818c13ecee526ca035a8ec10a8051df1cdce Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Thu, 14 Nov 2024 22:09:18 +0000 Subject: [PATCH 13/20] using cache seems not to work, downloading from nexus is quite fast Signed-off-by: Igor Loginov --- arkoala/tools/peer-generator/.gitlab-ci.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/arkoala/tools/peer-generator/.gitlab-ci.yml b/arkoala/tools/peer-generator/.gitlab-ci.yml index 1c1f79f1e..7bc20f621 100644 --- a/arkoala/tools/peer-generator/.gitlab-ci.yml +++ b/arkoala/tools/peer-generator/.gitlab-ci.yml @@ -60,11 +60,6 @@ Build generated ArkoalaNative (linux, ohos-arm64, hzvm): script: - !reference [.setup, script] - KOALA_BZ=1 npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework - cache: - key: compiler-with-arm64-sysroot-1.0.0 - paths: - - arkoala/tools/compiler/llvm-toolchain - - arkoala/tools/compiler/sysroot-arm64 artifacts: paths: - arkoala/framework/build/libArkoalaNative.so @@ -81,11 +76,6 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm): script: - !reference [.setup, script] - KOALA_BZ=1 npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework - cache: - key: compiler-with-arm32-sysroot-1.0.0 - paths: - - arkoala/tools/compiler/llvm-toolchain - - arkoala/tools/compiler/sysroot-arm artifacts: paths: - arkoala/framework/build/libArkoalaNative.so @@ -156,11 +146,6 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm+panda): script: - !reference [.setup, script] - KOALA_BZ=1 npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework - cache: - key: compiler-with-arm32-sysroot-1.0.0 - paths: - - arkoala/tools/compiler/llvm-toolchain - - arkoala/tools/compiler/sysroot-arm artifacts: paths: - arkoala/framework/build/libArkoalaLoader.so -- Gitee From a087c41fa5e3a0c672efeeae115c72c476af6aa5 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Fri, 15 Nov 2024 08:50:13 +0300 Subject: [PATCH 14/20] ci -- Gitee From 0f0071d33e31ce014050ac91c1ad59d88e0f2d2f Mon Sep 17 00:00:00 2001 From: lWX1337837 Date: Tue, 19 Nov 2024 13:08:43 +0300 Subject: [PATCH 15/20] fix --- arkoala/framework/scripts/configure.mjs | 7 ++----- arkoala/tools/compiler/install.mjs | 15 +++++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/arkoala/framework/scripts/configure.mjs b/arkoala/framework/scripts/configure.mjs index dac72d68d..02aa3cd07 100644 --- a/arkoala/framework/scripts/configure.mjs +++ b/arkoala/framework/scripts/configure.mjs @@ -273,22 +273,19 @@ function createOhosCrossFile(target) { let cf = CrossFile(target, root); let sdkNativePath = "" let compilersPath = "" - let sysroot = "" let suffix = "" if (platform == 'win32') { - suffix = ".exe" + suffix = ".exe"; } if (platform == 'linux') { compilersPath = path.resolve('../../tools/compiler/llvm-toolchain/bin') - sysroot = path.resolve(`../../tools/compiler/sysroot-${ target.includes('arm64') ? 'arm64' : 'arm' }`) } else { sdkNativePath = ohSdkInfo(OHCONF.sdkPath(), OH_SDK_COMPONENT.native).path compilersPath = path.join(sdkNativePath, "llvm", "bin") - sysroot = path.resolve(path.join(sdkNativePath, 'sysroot')) } let cflags = [ - '--sysroot=' + sysroot + '--sysroot=' + path.resolve(`../../tools/compiler/sysroot-${ target.includes('arm64') ? 'arm64' : 'arm' }`) ] let cpu = 'unknown' if (target == 'hzvm-ohos-arm64' || target == 'hzvm-ohos-arm64-vmloader' || target == 'panda-ohos-arm64') { diff --git a/arkoala/tools/compiler/install.mjs b/arkoala/tools/compiler/install.mjs index 403c539ab..54b1f41dd 100644 --- a/arkoala/tools/compiler/install.mjs +++ b/arkoala/tools/compiler/install.mjs @@ -6,20 +6,20 @@ function log(msg) { console.log(chalk.green(msg)) } -const platform = (() => { +const platform_resolve = (() => { switch (process.platform) { case "linux": return "linux" default: throw new Error(`Unsupported platform ${process.platform}`) } -})() +}) -const arch = (() => { +const arch_resolve = (() => { switch (process.arch) { case "x64": return "x86_64" case "arm64": return "arm64" default: throw new Error(`Unsupported arch ${process.platform}`) } -})() +}) const generic_package_archive_resolve = (async (koala_bz) => { switch (koala_bz) { @@ -36,11 +36,8 @@ const generic_package_archive_resolve = (async (koala_bz) => { const koala_bz = parseInt(process.env.KOALA_BZ ?? "0") const generic_package_archive = await generic_package_archive_resolve(koala_bz) -const llvm_toolchain = `llvm-toolchain-${platform}_${arch}` -const sysroot_arm = `sysroot-arm` -const sysroot_arm64 = `sysroot-arm64` - if (process.argv[2] == 'toolchain') { + const llvm_toolchain = `llvm-toolchain-${platform_resolve()}_${arch_resolve()}` if (existsSync("./llvm-toolchain")) { log(`> ${llvm_toolchain} is already installed at ${ path.resolve("./llvm-toolchain") }`) } else { @@ -54,6 +51,8 @@ if (process.argv[2] == 'toolchain') { } if (process.argv[2] == 'sysroot') { + const sysroot_arm = `sysroot-arm` + const sysroot_arm64 = `sysroot-arm64` const sysroot = process.argv[3] == 'arm64' ? sysroot_arm64 : sysroot_arm if (existsSync(`./${sysroot}`)) { log(`> ${sysroot} is already installed at ${ path.resolve(`./${sysroot}`) }`) -- Gitee From 4f84c66ad0a722e20c3f161c9231baa6f4fea991 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Mon, 18 Nov 2024 11:28:18 +0300 Subject: [PATCH 16/20] test --- .gitlab-ci.yml | 2 ++ arkoala-arkts/.gitlab-ci.yml | 15 +++++++++++++++ arkoala-arkts/har/scripts/build-arkoala-har.mjs | 3 +-- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 arkoala-arkts/.gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73d7b7a7d..b0bc6f058 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ stages: - test - idlize - build-with-idlize + - pack workflow: rules: @@ -21,6 +22,7 @@ include: - incremental/runtime/.gitlab-ci.yml - incremental/demo-playground/.gitlab-ci.yml - arkoala/tools/peer-generator/.gitlab-ci.yml + - arkoala-arkts/.gitlab-ci.yml - arkoala-arkts/loader/.gitlab-ci.yml unmemoize arkoala-arkts/arkui: diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml new file mode 100644 index 000000000..387062a5c --- /dev/null +++ b/arkoala-arkts/.gitlab-ci.yml @@ -0,0 +1,15 @@ +pack arkoala-arkts har-arm32 (linux): + stage: pack + interruptible: true + extends: + - .linux-vm-shell-task + needs: [] + script: + - !reference [.setup, script] + - KOALA_BZ=1 npm run panda:sdk:install --prefix arkoala-arkts + - KOALA_BZ=1 npm run trivial:all:har-arm32 --prefix arkoala-arkts + - cp $CI_PROJECT_DIR/arkoala-arkts/har/app/arkoala/build/default/outputs/default/arkoala.har $CI_PROJECT_DIR/arkoala-arkts.har + artifacts: + expire_in: 1 day + paths: + - arkoala-arkts.har diff --git a/arkoala-arkts/har/scripts/build-arkoala-har.mjs b/arkoala-arkts/har/scripts/build-arkoala-har.mjs index bc6a7b2fd..e3f847fcd 100644 --- a/arkoala-arkts/har/scripts/build-arkoala-har.mjs +++ b/arkoala-arkts/har/scripts/build-arkoala-har.mjs @@ -15,7 +15,6 @@ const _dirname = dirname(fileURLToPath(import.meta.url)) const OHOS_SDK_PATH = process.env.HOS_SDK_HOME ?? path.join(_dirname, `../../../arkoala/ohos-sdk/ohos-sdk`) const NATIVE_SDK_PATH = path.join(OHOS_SDK_PATH, `HarmonyOS-NEXT-DB1/openharmony/native`) -const LIBCSHARED_PATH = path.join(NATIVE_SDK_PATH, `llvm/lib/${arch}-linux-ohos/libc++_shared.so`) const CWD = process.cwd() const BUNDLE_PATH = path.join(CWD, "arkoala-har-bundle") @@ -44,7 +43,7 @@ function main() { rollupLaunch() /* we don't yet know which files should be in har */ - copyFilesToHar(LIBCSHARED_PATH, path.join(HAR_PATH, `libs/armeabi-v7a/libc++_shared.so`)) + copyFilesToHar(path.join(_dirname, `../../../arkoala/framework/build/libc++.so`), path.join(HAR_PATH, `libs/armeabi-v7a/libc++.so`)) copyFilesToHar(path.join(_dirname, `../../../arkoala/framework/native/build-hzvm-ohos-arm32-vmloader/libArkoalaLoader.so`), path.join(HAR_PATH, `libs/armeabi-v7a/libArkoalaLoader.so`)) copyFilesToHar(path.join(_dirname, `../../../arkoala/framework/native/build-hzvm-ohos-arm32-vmloader/libvmloader.so`), path.join(HAR_PATH, `libs/armeabi-v7a/libvmloader.so`)) copyFilesToHar(path.join(_dirname, `../../../arkoala/framework/native/build-panda-ohos-arm32/libArkoalaNative_ark.so`), path.join(HAR_PATH, `libs/armeabi-v7a/libArkoalaNative_ark.so`)) -- Gitee From 1e6355170a0ff1d04e7bbb597111641d781e4493 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Mon, 18 Nov 2024 12:21:28 +0300 Subject: [PATCH 17/20] ohos-sdk install --- arkoala-arkts/har/package.json | 4 ++-- arkoala/har/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arkoala-arkts/har/package.json b/arkoala-arkts/har/package.json index 59f47e1de..e83080ba7 100644 --- a/arkoala-arkts/har/package.json +++ b/arkoala-arkts/har/package.json @@ -24,8 +24,8 @@ "native:build-arm32": "npm run --prefix ../../arkoala/framework compile:native-panda-with-hzvm-ohos-arm32", "bundle": "node scripts/build-arkoala-har.mjs --arch arm", "build": "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", - "arkoala:har": "npm run bundle && npm run build", - "arkoala:har-arm32": "npm run bundle && npm run build", + "arkoala:har": "npm run --prefix ../../arkoala/ohos-sdk download && npm run bundle && npm run build", + "arkoala:har-arm32": "npm run --prefix ../../arkoala/ohos-sdk download && npm run bundle && npm run build", "all": "npm run native:clean && npm run compile:arkoala && npm run native:build && npm run arkoala:har", "all-arm32": "npm run native:clean && npm run compile:arkoala-arkts && npm run native:build-arm32 && npm run arkoala:har-arm32", "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", diff --git a/arkoala/har/package.json b/arkoala/har/package.json index 6b6df362d..4e48bea77 100644 --- a/arkoala/har/package.json +++ b/arkoala/har/package.json @@ -26,8 +26,8 @@ "native:build-arm32": "npm run --prefix ../framework compile:native-hzvm-ohos-arm32", "bundle": "node scripts/build-arkoala-har.mjs", "build": "npm run cli-tools:check && cd app && DEVECO_SDK_HOME=../../ohos-sdk/ohos-sdk ../command-line-tools/hvigor/bin/hvigorw --no-daemon --mode module -p product=default -p module=arkoala@default assembleHar", - "arkoala:har": "npm run copy && npm run bundle && npm run build", - "arkoala:har-arm32": "npm run copy:arm32 && npm run bundle && npm run build", + "arkoala:har": "npm run --prefix ../../arkoala/ohos-sdk download && npm run copy && npm run bundle && npm run build", + "arkoala:har-arm32": "npm run --prefix ../../arkoala/ohos-sdk download && npm run copy:arm32 && npm run bundle && npm run build", "all": "npm run native:clean && npm run compile:arkoala && npm run native:build && npm run arkoala:har", "all-arm32": "npm run native:clean && npm run compile:arkoala && npm run native:build-arm32 && npm run arkoala:har-arm32", "cli-tools:chmod:bz": "node ../ohos-sdk/scripts/openlab-cli.mjs chmod -p ./command-line-tools/ohpm/bin -b 755 && node ../ohos-sdk/scripts/openlab-cli.mjs chmod -p ./command-line-tools/hvigor/bin -b 755", -- Gitee From 7642d3ac1b076eb754149502062472ae6fbc7155 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Mon, 18 Nov 2024 13:40:01 +0300 Subject: [PATCH 18/20] better CI --- arkoala-arkts/.gitlab-ci.yml | 4 +-- arkoala/tools/peer-generator/.gitlab-ci.yml | 37 +++++++++++++-------- gitlab/setup.yml | 2 +- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/arkoala-arkts/.gitlab-ci.yml b/arkoala-arkts/.gitlab-ci.yml index 387062a5c..ad34ea986 100644 --- a/arkoala-arkts/.gitlab-ci.yml +++ b/arkoala-arkts/.gitlab-ci.yml @@ -6,8 +6,8 @@ pack arkoala-arkts har-arm32 (linux): needs: [] script: - !reference [.setup, script] - - KOALA_BZ=1 npm run panda:sdk:install --prefix arkoala-arkts - - KOALA_BZ=1 npm run trivial:all:har-arm32 --prefix arkoala-arkts + - npm run panda:sdk:install --prefix arkoala-arkts + - npm run trivial:all:har-arm32 --prefix arkoala-arkts - cp $CI_PROJECT_DIR/arkoala-arkts/har/app/arkoala/build/default/outputs/default/arkoala.har $CI_PROJECT_DIR/arkoala-arkts.har artifacts: expire_in: 1 day diff --git a/arkoala/tools/peer-generator/.gitlab-ci.yml b/arkoala/tools/peer-generator/.gitlab-ci.yml index 7bc20f621..0888523c3 100644 --- a/arkoala/tools/peer-generator/.gitlab-ci.yml +++ b/arkoala/tools/peer-generator/.gitlab-ci.yml @@ -5,10 +5,11 @@ Idlize generate arkoala/arkui (linux): extends: - .linux-vm-shell-task needs: [] - script: + before_script: - !reference [.setup, script] - - KOALA_BZ=1 npm run ohos-sdk --prefix arkoala/arkui-common + - npm run ohos-sdk --prefix arkoala/arkui-common - npm i --prefix arkoala/tools/peer-generator + script: - npm run generate:ts --prefix arkoala/tools/peer-generator artifacts: paths: @@ -24,8 +25,9 @@ Build generated arkoala/arkui (linux): - .linux-vm-shell-task needs: - Idlize generate arkoala/arkui (linux) - script: + before_script: - !reference [.setup, script] + script: - npm run compile --prefix arkoala/arkui artifacts: paths: @@ -40,8 +42,9 @@ Build generated ArkoalaNative (linux, linux, node): - .linux-vm-shell-task needs: - Idlize generate arkoala/arkui (linux) - script: + before_script: - !reference [.setup, script] + script: - npm run compile:native-node-host --prefix arkoala/framework artifacts: paths: @@ -57,9 +60,10 @@ Build generated ArkoalaNative (linux, ohos-arm64, hzvm): - .linux-vm-shell-task needs: - Idlize generate arkoala/arkui (linux) - script: + before_script: - !reference [.setup, script] - - KOALA_BZ=1 npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework + script: + - npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework artifacts: paths: - arkoala/framework/build/libArkoalaNative.so @@ -73,9 +77,10 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm): - .linux-vm-shell-task needs: - Idlize generate arkoala/arkui (linux) - script: + before_script: - !reference [.setup, script] - - KOALA_BZ=1 npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework + script: + - npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework artifacts: paths: - arkoala/framework/build/libArkoalaNative.so @@ -88,10 +93,11 @@ Idlize generate arkoala-arkts/arkui (linux): extends: - .linux-vm-shell-task needs: [] - script: + before_script: - !reference [.setup, script] - - KOALA_BZ=1 npm run ohos-sdk --prefix arkoala/arkui-common + - npm run ohos-sdk --prefix arkoala/arkui-common - npm i --prefix arkoala/tools/peer-generator + script: - npm run generate:arkts --prefix arkoala/tools/peer-generator artifacts: paths: @@ -107,9 +113,10 @@ Build generated arkoala-arkts/arkui (linux): - .linux-vm-shell-task needs: - Idlize generate arkoala-arkts/arkui (linux) - script: + before_script: - !reference [.setup, script] - npm run panda:sdk:install --prefix arkoala-arkts + script: - npm run compile:arkts:unmemoized --prefix arkoala-arkts/arkui || npm run compile:trivial --prefix arkoala-arkts/arkui # TODO: remove trivial artifacts: paths: @@ -124,8 +131,9 @@ Build generated ArkoalaNative (linux, linux, node+panda): - .linux-vm-shell-task needs: - Idlize generate arkoala-arkts/arkui (linux) - script: + before_script: - !reference [.setup, script] + script: - npm run compile:native-panda-with-node-host --prefix arkoala/framework artifacts: paths: @@ -143,9 +151,10 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm+panda): - .linux-vm-shell-task needs: - Idlize generate arkoala-arkts/arkui (linux) - script: + before_script: - !reference [.setup, script] - - KOALA_BZ=1 npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework + script: + - npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework artifacts: paths: - arkoala/framework/build/libArkoalaLoader.so diff --git a/gitlab/setup.yml b/gitlab/setup.yml index a8f79b844..d83eead48 100644 --- a/gitlab/setup.yml +++ b/gitlab/setup.yml @@ -13,7 +13,7 @@ - cd arkoala && npm i --no-audit --no-fund && cd .. - cd arkoala-arkts && npm i --no-audit --no-fund && cd .. - cd interop && npm i --no-audit --no-fund && cd .. - - KOALA_BZ=1 npm run ohos-sdk --prefix arkoala/arkui-common cd - + - npm run ohos-sdk --prefix arkoala/arkui-common cd - .linux-vm-shell-task: tags: -- Gitee From 9220d6f50f5b9b25961ac6f8caf432135769974b Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Mon, 18 Nov 2024 13:56:57 +0300 Subject: [PATCH 19/20] fix --- gitlab/setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/setup.yml b/gitlab/setup.yml index d83eead48..a8f79b844 100644 --- a/gitlab/setup.yml +++ b/gitlab/setup.yml @@ -13,7 +13,7 @@ - cd arkoala && npm i --no-audit --no-fund && cd .. - cd arkoala-arkts && npm i --no-audit --no-fund && cd .. - cd interop && npm i --no-audit --no-fund && cd .. - - npm run ohos-sdk --prefix arkoala/arkui-common cd - + - KOALA_BZ=1 npm run ohos-sdk --prefix arkoala/arkui-common cd - .linux-vm-shell-task: tags: -- Gitee From 2bbdefe569ed1627ada049d1fb2b6c7635edd19e Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Mon, 18 Nov 2024 14:15:50 +0300 Subject: [PATCH 20/20] fix --- arkoala/tools/peer-generator/.gitlab-ci.yml | 12 +++++------- gitlab/setup.yml | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arkoala/tools/peer-generator/.gitlab-ci.yml b/arkoala/tools/peer-generator/.gitlab-ci.yml index 0888523c3..a144582e8 100644 --- a/arkoala/tools/peer-generator/.gitlab-ci.yml +++ b/arkoala/tools/peer-generator/.gitlab-ci.yml @@ -7,8 +7,7 @@ Idlize generate arkoala/arkui (linux): needs: [] before_script: - !reference [.setup, script] - - npm run ohos-sdk --prefix arkoala/arkui-common - - npm i --prefix arkoala/tools/peer-generator + - KOALA_BZ=1 npm run ohos-sdk --prefix arkoala/arkui-common script: - npm run generate:ts --prefix arkoala/tools/peer-generator artifacts: @@ -63,7 +62,7 @@ Build generated ArkoalaNative (linux, ohos-arm64, hzvm): before_script: - !reference [.setup, script] script: - - npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework + - KOALA_BZ=1 npm run compile:native-hzvm-ohos-arm64 --prefix arkoala/framework artifacts: paths: - arkoala/framework/build/libArkoalaNative.so @@ -80,7 +79,7 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm): before_script: - !reference [.setup, script] script: - - npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework + - KOALA_BZ=1 npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework artifacts: paths: - arkoala/framework/build/libArkoalaNative.so @@ -95,8 +94,7 @@ Idlize generate arkoala-arkts/arkui (linux): needs: [] before_script: - !reference [.setup, script] - - npm run ohos-sdk --prefix arkoala/arkui-common - - npm i --prefix arkoala/tools/peer-generator + - KOALA_BZ=1 npm run ohos-sdk --prefix arkoala/arkui-common script: - npm run generate:arkts --prefix arkoala/tools/peer-generator artifacts: @@ -154,7 +152,7 @@ Build generated ArkoalaNative (linux, ohos-arm32, hzvm+panda): before_script: - !reference [.setup, script] script: - - npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework + - KOALA_BZ=1 npm run compile:native-hzvm-ohos-arm32 --prefix arkoala/framework artifacts: paths: - arkoala/framework/build/libArkoalaLoader.so diff --git a/gitlab/setup.yml b/gitlab/setup.yml index a8f79b844..925df0d61 100644 --- a/gitlab/setup.yml +++ b/gitlab/setup.yml @@ -13,7 +13,6 @@ - cd arkoala && npm i --no-audit --no-fund && cd .. - cd arkoala-arkts && npm i --no-audit --no-fund && cd .. - cd interop && npm i --no-audit --no-fund && cd .. - - KOALA_BZ=1 npm run ohos-sdk --prefix arkoala/arkui-common cd - .linux-vm-shell-task: tags: -- Gitee