From 9389ce407070056ea62efc9a513be61230b2b4e5 Mon Sep 17 00:00:00 2001 From: Amosov Alexey Date: Wed, 15 Jan 2025 14:46:50 +0300 Subject: [PATCH 1/3] fix retry Downloading sdk Signed-off-by: Amosov Alexey --- .../scripts/download-interface-sdk.mjs | 16 ++++++++++------ incremental/tools/panda/build_panda_sdk.mjs | 13 ++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/arkoala/arkui-common/scripts/download-interface-sdk.mjs b/arkoala/arkui-common/scripts/download-interface-sdk.mjs index 59b2eda06..2fca65ea0 100644 --- a/arkoala/arkui-common/scripts/download-interface-sdk.mjs +++ b/arkoala/arkui-common/scripts/download-interface-sdk.mjs @@ -25,14 +25,18 @@ const sdkInfo = JSON.parse(fs.readFileSync(path.join(__dirname, "ohos-sdk.json") const dir = "./interface_sdk-js" -if (fs.existsSync(dir)) { - //execSync(`cd ${dir} && git pull`) -} else { - console.log("Downloading sdk") - execSync("git clone https://gitee.com/openharmony/interface_sdk-js.git") +if (!fs.existsSync(dir)) { + fs.mkdirSync(dir) } +execSync(`cd interface_sdk-js`) +execSync(`git init`, { cwd: dir }) +execSync(`git remote add origin https://gitee.com/openharmony/interface_sdk-js.git`, { cwd: dir }) +console.log("Downloading sdk") +execSync(`num=0; until git fetch --depth 1 origin ${sdkInfo.hash}; do num=$((num+1)); if [[ $num -eq 5 ]]; then break; fi; done`, { cwd: dir }) +execSync(`git checkout FETCH_HEAD`, { cwd: dir }) const components = "interface_sdk-js/api/@internal/component/ets" const fakeComponents = "fake-interface-sdk-declarations/" -execSync(`cd interface_sdk-js && git fetch origin && git checkout ${sdkInfo.hash}`) \ No newline at end of file +// TODO: We need patch sdk +fs.cpSync(path.join(fakeComponents, "koala-extensions.d.ts"), path.join(components, "koala-extensions.d.ts"), { recursive: true }) diff --git a/incremental/tools/panda/build_panda_sdk.mjs b/incremental/tools/panda/build_panda_sdk.mjs index 093c504be..d31386404 100644 --- a/incremental/tools/panda/build_panda_sdk.mjs +++ b/incremental/tools/panda/build_panda_sdk.mjs @@ -103,13 +103,16 @@ function makeDir(path) { } function makeSymlink(target, dest) { - if (fs.lstatSync(dest).isDirectory()) { - fs.rmdirSync(dest, { recursive: true, force: true }) - fs.cpSync(target, dest, { recursive: true }) - } else { - if (fs.existsSync(dest)) { + if (fs.existsSync(dest)) { + if (fs.lstatSync(dest).isDirectory()) { + fs.rmdirSync(dest, { recursive: true, force: true }) + } else { fs.unlinkSync(dest) } + } + if (fs.lstatSync(target).isDirectory()) { + fs.cpSync(target, dest, { recursive: true }) + } else { fs.symlinkSync(target, dest) } } -- Gitee From 4d254409c59dfbba05932ecbbe0e796b7e90c87d Mon Sep 17 00:00:00 2001 From: Tatiana Titova Date: Wed, 29 Jan 2025 11:17:18 +0300 Subject: [PATCH 2/3] Fix build script Signed-off-by: Tatiana Titova --- incremental/tools/panda/build_panda_sdk.mjs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/incremental/tools/panda/build_panda_sdk.mjs b/incremental/tools/panda/build_panda_sdk.mjs index d31386404..03c091ffd 100644 --- a/incremental/tools/panda/build_panda_sdk.mjs +++ b/incremental/tools/panda/build_panda_sdk.mjs @@ -26,9 +26,9 @@ console.log("Required packages and utilities:\n" + const argv = new Map(process.argv.slice(2).map(it => it.split("="))) const pandaSdkDir = argv.get("--panda-sdk-dir") const arkCompilerDir = argv.get("--arkcompiler-build-dir") -const buildType = argv.get("--build-type") ?? "Release" -const rtGitRev = argv.get("--runtime-git-rev") -const feGitRev = argv.get("--frontend-git-rev") +const buildType = argv.get("--build-type") ?? "Debug" +const rtGitRev = argv.get("--runtime-git-rev") ?? "OpenHarmony_feature_20241108" +const feGitRev = argv.get("--frontend-git-rev") ?? "OpenHarmony_feature_20241108" const feGitPatches = argv.get("--frontend-git-patches")?.split(":") ?? [] if (arkCompilerDir === undefined) { @@ -107,14 +107,11 @@ function makeSymlink(target, dest) { if (fs.lstatSync(dest).isDirectory()) { fs.rmdirSync(dest, { recursive: true, force: true }) } else { - fs.unlinkSync(dest) + fs.unlinkSync(dest); } } - if (fs.lstatSync(target).isDirectory()) { - fs.cpSync(target, dest, { recursive: true }) - } else { - fs.symlinkSync(target, dest) - } + //fs.symlinkSync(target, dest) + fs.cpSync(target, dest, { recursive: true }) } function gitClone(repo, dir) { -- Gitee From e4a59a83edb2ef91cf2f87063e73fa1a412c5251 Mon Sep 17 00:00:00 2001 From: Tatiana Titova Date: Wed, 12 Feb 2025 15:07:12 +0300 Subject: [PATCH 3/3] tmp commit Signed-off-by: Tatiana Titova --- arkoala-arkts/user/src/ets/page1.ets | 7 ++++--- arkoala/arkui-common/scripts/download-interface-sdk.mjs | 6 +++--- arkoala/arkui-common/tsconfig.json | 3 +++ incremental/common/src/index.ts | 1 + incremental/compat/src/arkts/types.ts | 1 + incremental/compat/src/index.ts | 1 + incremental/compat/src/typescript/types.ts | 1 + 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/arkoala-arkts/user/src/ets/page1.ets b/arkoala-arkts/user/src/ets/page1.ets index 67e7cf8eb..0c6bd2c75 100644 --- a/arkoala-arkts/user/src/ets/page1.ets +++ b/arkoala-arkts/user/src/ets/page1.ets @@ -1,3 +1,4 @@ +import { int32 } from "@koalaui/compat" //@Entry @Component @@ -21,10 +22,10 @@ struct TestConsume { changeBackgroundColor(stateName: string) { if (this.colorFlag == false) { // enum comparation doesn't compile by es2panda now this.colorFlag = true - this.color = Color.Green + this.color = Color.Green as int32 } else { this.colorFlag = false - this.color = Color.Blue + this.color = Color.Blue as int32 } } } @@ -87,4 +88,4 @@ struct Page1 { this.color1 = this.color2 this.color2 = tmp } -} \ No newline at end of file +} diff --git a/arkoala/arkui-common/scripts/download-interface-sdk.mjs b/arkoala/arkui-common/scripts/download-interface-sdk.mjs index 2fca65ea0..aedacd74e 100644 --- a/arkoala/arkui-common/scripts/download-interface-sdk.mjs +++ b/arkoala/arkui-common/scripts/download-interface-sdk.mjs @@ -27,11 +27,11 @@ const dir = "./interface_sdk-js" if (!fs.existsSync(dir)) { fs.mkdirSync(dir) + execSync(`cd interface_sdk-js`) + execSync(`git init`, { cwd: dir }) + execSync(`git remote add origin https://gitee.com/openharmony/interface_sdk-js.git`, { cwd: dir }) } -execSync(`cd interface_sdk-js`) -execSync(`git init`, { cwd: dir }) -execSync(`git remote add origin https://gitee.com/openharmony/interface_sdk-js.git`, { cwd: dir }) console.log("Downloading sdk") execSync(`num=0; until git fetch --depth 1 origin ${sdkInfo.hash}; do num=$((num+1)); if [[ $num -eq 5 ]]; then break; fi; done`, { cwd: dir }) execSync(`git checkout FETCH_HEAD`, { cwd: dir }) diff --git a/arkoala/arkui-common/tsconfig.json b/arkoala/arkui-common/tsconfig.json index b499d86de..df000877d 100644 --- a/arkoala/arkui-common/tsconfig.json +++ b/arkoala/arkui-common/tsconfig.json @@ -17,6 +17,9 @@ "@koalaui/runtime": ["../../incremental/runtime/src"], "@koalaui/arkui-common": ["./src/typescript"], "@koalaui/arkui-common/*": ["./src/typescript/*"], + "#platform": [ + "../../incremental/compat/src/typescript" + ], "#arkcompat/*": ["./src/typescript/*"], "#arkcompat": ["./src/typescript"] } diff --git a/incremental/common/src/index.ts b/incremental/common/src/index.ts index 7d500898c..c6c23b3f4 100644 --- a/incremental/common/src/index.ts +++ b/incremental/common/src/index.ts @@ -14,6 +14,7 @@ */ export { + i8, int8, uint8, int32, uint32, int64, uint64, diff --git a/incremental/compat/src/arkts/types.ts b/incremental/compat/src/arkts/types.ts index f56e8d501..1118e4806 100644 --- a/incremental/compat/src/arkts/types.ts +++ b/incremental/compat/src/arkts/types.ts @@ -13,6 +13,7 @@ * limitations under the License. */ +export type i8 = int export type uint8 = byte export type int8 = byte export type unt16 = short diff --git a/incremental/compat/src/index.ts b/incremental/compat/src/index.ts index 6976bcb33..656c44683 100644 --- a/incremental/compat/src/index.ts +++ b/incremental/compat/src/index.ts @@ -42,6 +42,7 @@ export { functionOverValue, refEqual, isNotPrimitive, + i8, uint8, int8, int16, diff --git a/incremental/compat/src/typescript/types.ts b/incremental/compat/src/typescript/types.ts index 07796d8d4..5da72e248 100644 --- a/incremental/compat/src/typescript/types.ts +++ b/incremental/compat/src/typescript/types.ts @@ -14,6 +14,7 @@ */ /// +export type i8 = int export type uint8 = int export type int8 = int export type int16 = int -- Gitee