From 08a6db1c33e64d75d7e0c533d2c9ddb0691a7334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AA=9B=E5=AA=9B?= Date: Tue, 12 Jul 2022 16:04:35 +0800 Subject: [PATCH] [3.6.0] fix ohos make (#11942) * add rawfilw dir * fix res_path missing * fix check java path --- scripts/native-pack-tool/source/platforms/ohos.ts | 2 +- scripts/native-pack-tool/source/utils.ts | 2 +- templates/ohos/entry/src/main/resources/rawfile/.keep | 0 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 templates/ohos/entry/src/main/resources/rawfile/.keep diff --git a/scripts/native-pack-tool/source/platforms/ohos.ts b/scripts/native-pack-tool/source/platforms/ohos.ts index 99cfc81f3f..2cde86ffe2 100644 --- a/scripts/native-pack-tool/source/platforms/ohos.ts +++ b/scripts/native-pack-tool/source/platforms/ohos.ts @@ -55,7 +55,7 @@ export class OHOSPackTool extends NativePackTool { // gradle.properties await cchelper.replaceInFile([ - { reg: '^RES_ps.*', text: `RES_PATH=${cchelper.fixPath(this.paths.buildDir)}` }, + { reg: '^RES_PATH.*', text: `RES_PATH=${cchelper.fixPath(this.paths.buildDir)}` }, { reg: '^ENGINE_ROOT.*', text: `ENGINE_ROOT=${cchelper.fixPath(cocosXRoot)}` }, { reg: '^COMMON_DIR.*', text: `COMMON_DIR=${cchelper.fixPath(process.env.COMMON_DIR || '')}` }, ], ps.join(ohosProjDir, 'gradle.properties')); diff --git a/scripts/native-pack-tool/source/utils.ts b/scripts/native-pack-tool/source/utils.ts index 3407525135..364508a961 100644 --- a/scripts/native-pack-tool/source/utils.ts +++ b/scripts/native-pack-tool/source/utils.ts @@ -366,7 +366,7 @@ export class cchelper { console.error(`'java' is not found in PATH`); } else { try { - const version = execSync(`${javaPath} --version`).toString(); + const version = execSync(`"${cchelper.fixPath(javaPath)}" -version`).toString(); if (/Java\(TM\)/.test(version)) { return true; } else { diff --git a/templates/ohos/entry/src/main/resources/rawfile/.keep b/templates/ohos/entry/src/main/resources/rawfile/.keep new file mode 100644 index 0000000000..e69de29bb2