From 7401b55e09cd99ddfcd65fb5bca165df04d6cdc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=9F=E6=88=98?= <40414978+PatriceJiang@users.noreply.github.com> Date: Thu, 17 Aug 2023 16:19:29 +0800 Subject: [PATCH] add java_home (#15996) --- .../native-pack-tool/source/base/default.ts | 12 +++++----- .../source/platforms/android.ts | 22 +++++++++++++++---- .../source/platforms/openharmony.ts | 4 +++- scripts/native-pack-tool/source/utils.ts | 2 +- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/scripts/native-pack-tool/source/base/default.ts b/scripts/native-pack-tool/source/base/default.ts index 3f9899653d..b7e5a99498 100644 --- a/scripts/native-pack-tool/source/base/default.ts +++ b/scripts/native-pack-tool/source/base/default.ts @@ -370,7 +370,7 @@ export abstract class NativePackTool { protected getExcutableNameOrDefault(): string { const en = this.params.executableName; - return en ? en : this.projectNameASCII(); + return en ? en : this.projectNameASCII(); } protected async excuteTemplateTask(tasks: CocosProjectTasks) { @@ -422,7 +422,7 @@ export abstract class NativePackTool { replaceFilesDelay[fp] = replaceFilesDelay[fp] || []; replaceFilesDelay[fp].push({ reg: name, - content: this.params.platformParams.packageName!, + content: (this.params.platformParams as any).packageName!, }); }); delete tasks.projectReplacePackageName; @@ -454,7 +454,7 @@ export abstract class NativePackTool { } }); Object.keys(config).forEach((key: string) => { - if(typeof config[key] !== 'string') { + if (typeof config[key] !== 'string') { console.error(`cMakeConfig.${key} is not a string, "${config[key]}"`); } else { content += config[key] + '\n'; @@ -468,7 +468,7 @@ export abstract class NativePackTool { args.push(`-DRES_DIR="${cchelper.fixPath(this.paths.buildDir)}"`); args.push(`-DAPP_NAME="${this.params.projectName}"`); args.push(`-DLAUNCH_TYPE="${this.buildType}"`); - if (this.params.platformParams?.skipUpdateXcodeProject) { + if ((this.params.platformParams as any).skipUpdateXcodeProject) { args.push(`-DCMAKE_SUPPRESS_REGENERATION=ON`); } } @@ -543,7 +543,7 @@ export abstract class NativePackTool { // cocos.compile.json export class CocosParams { - platformParams!: T | any; + platformParams: T; public debug: boolean; public projectName: string; public cmakePath: string; @@ -602,7 +602,7 @@ export class CocosParams { CC_ENABLE_SWAPPY: false, } - constructor(params: CocosParams) { + constructor(params: CocosParams) { this.buildAssetsDir = params.buildAssetsDir; this.projectName = params.projectName; this.debug = params.debug; diff --git a/scripts/native-pack-tool/source/platforms/android.ts b/scripts/native-pack-tool/source/platforms/android.ts index 212974a8ae..6cb7d8f126 100644 --- a/scripts/native-pack-tool/source/platforms/android.ts +++ b/scripts/native-pack-tool/source/platforms/android.ts @@ -5,6 +5,7 @@ import { cchelper, Paths } from "../utils"; import * as URL from 'url'; import { spawn, spawnSync } from 'child_process'; import * as xml2js from 'xml2js'; +import { platform } from 'os'; export interface IOrientation { landscapeLeft: boolean; @@ -17,7 +18,10 @@ export interface IAndroidParams { packageName: string; sdkPath: string; ndkPath: string; + javaHome: string; + javaPath: string; androidInstant: boolean, + maxAspectRatio: string; remoteUrl?: string; apiLevel: number; appABIs: string[]; @@ -25,6 +29,7 @@ export interface IAndroidParams { keystoreAlias: string; keystoreAliasPassword: string; keystorePath: string; + inputSDK: boolean; orientation: IOrientation; appBundle: boolean; @@ -77,6 +82,18 @@ export class AndroidPackTool extends NativePackTool { async make() { const options = this.params.platformParams; + if (options.javaHome) { + if (process.env.JAVA_HOME !== options.javaHome) { + process.env.JAVA_HOME = options.javaHome; + console.log(`Update JAVA_HOME to ${options.javaHome}`); + } + if (!process.env.PATH!.startsWith(options.javaHome)) { + const sep = platform() === 'win32' ? ';' : ':'; + process.env.PATH = ps.join(options.javaHome, 'bin') + sep + process.env.PATH; + console.log(`Add JAVA_HOME/bin to PATH`); + } + } + const projDir: string = this.paths.nativePrjDir; if (!fs.existsSync(projDir)) { throw new Error(`dir ${projDir} not exits`); @@ -93,7 +110,6 @@ export class AndroidPackTool extends NativePackTool { // compile android buildMode = `${this.projectNameASCII()}:assemble${outputMode}`; - // await cchelper.runCmd(gradle, [buildMode /* "--quiet",*/ /*"--build-cache", "--project-cache-dir", nativePrjDir */], false, projDir); // pushd const originDir = process.cwd(); @@ -111,7 +127,6 @@ export class AndroidPackTool extends NativePackTool { // compile android-instant if (options.androidInstant) { buildMode = `instantapp:assemble${outputMode}`; - // await cchelper.runCmd(gradle, [buildMode, /*"--quiet",*/ /*"--build-cache", "--project-cache-dir", nativePrjDir*/], false, projDir); await cchelper.runCmd(gradle, [buildMode], false, projDir); } @@ -122,7 +137,6 @@ export class AndroidPackTool extends NativePackTool { } else { buildMode = `${this.params.projectName}:bundle${outputMode}`; } - // await cchelper.runCmd(gradle, [buildMode, /*"--quiet",*/ /*"--build-cache", "--project-cache-dir", nativePrjDir*/], false, projDir); await cchelper.runCmd(gradle, [buildMode], false, projDir); } return await this.copyToDist(); @@ -214,7 +228,7 @@ export class AndroidPackTool extends NativePackTool { const application = data.manifest.application[0]; //append meta-data application['meta-data'].push({ - $:{'android:name': 'android.max_aspect', 'android:value': `${aspectRatioFloatValue}`} + $: { 'android:name': 'android.max_aspect', 'android:value': `${aspectRatioFloatValue}` } }); } diff --git a/scripts/native-pack-tool/source/platforms/openharmony.ts b/scripts/native-pack-tool/source/platforms/openharmony.ts index b7a18fa9d1..45af3334f3 100644 --- a/scripts/native-pack-tool/source/platforms/openharmony.ts +++ b/scripts/native-pack-tool/source/platforms/openharmony.ts @@ -20,6 +20,8 @@ export interface OHOSParam { ndkPath: string; orientation: IOrientation; packageName: string; + appABIs: string[]; + apiLevel: number; } export class OpenHarmonyPackTool extends NativePackTool { @@ -143,7 +145,7 @@ export class OpenHarmonyPackTool extends NativePackTool { hdcExe, ['uninstall', packageName], false, hdcCwd); console.debug(`${hdc} install -r ${hapFile}`); await cchelper.runCmd( - hdcExe,['install', '-r', hapFile], false, hdcCwd); + hdcExe, ['install', '-r', hapFile], false, hdcCwd); console.debug(`${hdc} shell aa start -a ${ability} -b ${packageName}`); await cchelper.runCmd( hdcExe, ['shell', 'aa', 'start', '-a', ability, '-b', packageName, '-m', moduleName], false, hdcCwd); diff --git a/scripts/native-pack-tool/source/utils.ts b/scripts/native-pack-tool/source/utils.ts index 67eeb88a4d..b6559cbd19 100644 --- a/scripts/native-pack-tool/source/utils.ts +++ b/scripts/native-pack-tool/source/utils.ts @@ -557,7 +557,7 @@ export class Paths { this.buildDir = params.buildDir; this.buildAssetsDir = params.buildAssetsDir; if (params.platform === 'windows') { - this.platformTemplateDirName = params.platformParams.targetPlatform === "win32" ? "win32" : "win64"; + this.platformTemplateDirName = (params.platformParams as any).targetPlatform === "win32" ? "win32" : "win64"; } else { this.platformTemplateDirName = params.platformName ? params.platformName : this.platform; }