From 0b5a45ec413073cc35ee3440f52c7e54633da65f Mon Sep 17 00:00:00 2001 From: qiuguohua Date: Thu, 28 Nov 2024 22:02:59 +0800 Subject: [PATCH] Change openharmony to harmonyos-next --- scripts/native-pack-tool/source/index.ts | 5 ++--- .../platforms/{openharmony.ts => harmonyos-next.ts} | 2 +- .../{openharmony => harmonyos-next}/.gitignore | 0 .../AppScope/app.json5 | 0 .../AppScope/resources/base/element/string.json | 0 .../AppScope/resources/base/media/app_icon.png | Bin .../{openharmony => harmonyos-next}/CMakeLists.txt | 0 .../build-profile.json5 | 0 .../entry/.gitignore | 0 .../entry/build-profile.json5 | 0 .../entry/hvigorfile.ts | 0 .../entry/oh-package.json5 | 0 .../entry/src/main/cpp/types/libcocos/index.d.ts | 0 .../src/main/cpp/types/libcocos/oh-package.json5 | 0 .../entry/src/main/ets/cocos/WorkerManager.ets | 0 .../entry/src/main/ets/cocos/game.ts | 0 .../ets/cocos/jsb-adapter/sys-ability-polyfill.js | 0 .../ets/cocos/oh-adapter/sys-ability-polyfill.js | 0 .../entry/src/main/ets/common/Constants.ts | 0 .../entry/src/main/ets/common/PortProxy.ts | 0 .../src/main/ets/components/CocosVideoPlayer.ets | 0 .../entry/src/main/ets/components/CocosWebView.ets | 0 .../entry/src/main/ets/components/EditBoxDialog.ets | 0 .../entry/src/main/ets/entryability/EntryAbility.ts | 0 .../entry/src/main/ets/pages/index.ets | 0 .../entry/src/main/ets/workers/cocos_worker.ts | 0 .../entry/src/main/module.json5 | 0 .../src/main/resources/base/element/color.json | 0 .../src/main/resources/base/element/string.json | 0 .../entry/src/main/resources/base/media/icon.png | Bin .../src/main/resources/base/profile/main_pages.json | 0 .../entry/src/main/resources/rawfile/.keep | 0 .../hvigor/hvigor-config.json5 | 0 .../{openharmony => harmonyos-next}/hvigorfile.ts | 0 .../oh-package.json5 | 0 35 files changed, 3 insertions(+), 4 deletions(-) rename scripts/native-pack-tool/source/platforms/{openharmony.ts => harmonyos-next.ts} (99%) rename templates/{openharmony => harmonyos-next}/.gitignore (100%) rename templates/{openharmony => harmonyos-next}/AppScope/app.json5 (100%) rename templates/{openharmony => harmonyos-next}/AppScope/resources/base/element/string.json (100%) rename templates/{openharmony => harmonyos-next}/AppScope/resources/base/media/app_icon.png (100%) rename templates/{openharmony => harmonyos-next}/CMakeLists.txt (100%) rename templates/{openharmony => harmonyos-next}/build-profile.json5 (100%) rename templates/{openharmony => harmonyos-next}/entry/.gitignore (100%) rename templates/{openharmony => harmonyos-next}/entry/build-profile.json5 (100%) rename templates/{openharmony => harmonyos-next}/entry/hvigorfile.ts (100%) rename templates/{openharmony => harmonyos-next}/entry/oh-package.json5 (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/cpp/types/libcocos/index.d.ts (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/cpp/types/libcocos/oh-package.json5 (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/ets/cocos/WorkerManager.ets (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/ets/cocos/game.ts (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/ets/cocos/jsb-adapter/sys-ability-polyfill.js (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/ets/cocos/oh-adapter/sys-ability-polyfill.js (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/ets/common/Constants.ts (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/ets/common/PortProxy.ts (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/ets/components/CocosVideoPlayer.ets (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/ets/components/CocosWebView.ets (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/ets/components/EditBoxDialog.ets (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/ets/entryability/EntryAbility.ts (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/ets/pages/index.ets (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/ets/workers/cocos_worker.ts (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/module.json5 (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/resources/base/element/color.json (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/resources/base/element/string.json (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/resources/base/media/icon.png (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/resources/base/profile/main_pages.json (100%) rename templates/{openharmony => harmonyos-next}/entry/src/main/resources/rawfile/.keep (100%) rename templates/{openharmony => harmonyos-next}/hvigor/hvigor-config.json5 (100%) rename templates/{openharmony => harmonyos-next}/hvigorfile.ts (100%) rename templates/{openharmony => harmonyos-next}/oh-package.json5 (100%) diff --git a/scripts/native-pack-tool/source/index.ts b/scripts/native-pack-tool/source/index.ts index 6d4e2653656..5dcaf78dd9c 100644 --- a/scripts/native-pack-tool/source/index.ts +++ b/scripts/native-pack-tool/source/index.ts @@ -1,9 +1,8 @@ - import { nativePackToolMg } from './base/manager'; import { MacPackTool } from './platforms/mac'; import { WindowsPackTool } from './platforms/windows'; import { AndroidPackTool } from './platforms/android'; -import { OpenHarmonyPackTool } from './platforms/openharmony'; +import { HarmonyOSNextPackTool } from './platforms/harmonyos-next'; import { OHOSPackTool } from './platforms/ohos'; import { IOSPackTool } from './platforms/ios'; import { HuaweiAGCPackTool } from './platforms/huawei-agc'; @@ -12,7 +11,7 @@ nativePackToolMg.register('ios', new IOSPackTool()); nativePackToolMg.register('mac', new MacPackTool()); nativePackToolMg.register('windows', new WindowsPackTool()); nativePackToolMg.register('android', new AndroidPackTool()); -nativePackToolMg.register('openharmony', new OpenHarmonyPackTool()); +nativePackToolMg.register('harmonyos-next', new HarmonyOSNextPackTool()); nativePackToolMg.register('ohos', new OHOSPackTool()); nativePackToolMg.register('huawei-agc', new HuaweiAGCPackTool()); diff --git a/scripts/native-pack-tool/source/platforms/openharmony.ts b/scripts/native-pack-tool/source/platforms/harmonyos-next.ts similarity index 99% rename from scripts/native-pack-tool/source/platforms/openharmony.ts rename to scripts/native-pack-tool/source/platforms/harmonyos-next.ts index 6dbbad129db..c9edd1e34be 100644 --- a/scripts/native-pack-tool/source/platforms/openharmony.ts +++ b/scripts/native-pack-tool/source/platforms/harmonyos-next.ts @@ -24,7 +24,7 @@ export interface OHOSParam { apiLevel: number; } -export class OpenHarmonyPackTool extends NativePackTool { +export class HarmonyOSNextPackTool extends NativePackTool { params!: CocosParams; initEnv() { diff --git a/templates/openharmony/.gitignore b/templates/harmonyos-next/.gitignore similarity index 100% rename from templates/openharmony/.gitignore rename to templates/harmonyos-next/.gitignore diff --git a/templates/openharmony/AppScope/app.json5 b/templates/harmonyos-next/AppScope/app.json5 similarity index 100% rename from templates/openharmony/AppScope/app.json5 rename to templates/harmonyos-next/AppScope/app.json5 diff --git a/templates/openharmony/AppScope/resources/base/element/string.json b/templates/harmonyos-next/AppScope/resources/base/element/string.json similarity index 100% rename from templates/openharmony/AppScope/resources/base/element/string.json rename to templates/harmonyos-next/AppScope/resources/base/element/string.json diff --git a/templates/openharmony/AppScope/resources/base/media/app_icon.png b/templates/harmonyos-next/AppScope/resources/base/media/app_icon.png similarity index 100% rename from templates/openharmony/AppScope/resources/base/media/app_icon.png rename to templates/harmonyos-next/AppScope/resources/base/media/app_icon.png diff --git a/templates/openharmony/CMakeLists.txt b/templates/harmonyos-next/CMakeLists.txt similarity index 100% rename from templates/openharmony/CMakeLists.txt rename to templates/harmonyos-next/CMakeLists.txt diff --git a/templates/openharmony/build-profile.json5 b/templates/harmonyos-next/build-profile.json5 similarity index 100% rename from templates/openharmony/build-profile.json5 rename to templates/harmonyos-next/build-profile.json5 diff --git a/templates/openharmony/entry/.gitignore b/templates/harmonyos-next/entry/.gitignore similarity index 100% rename from templates/openharmony/entry/.gitignore rename to templates/harmonyos-next/entry/.gitignore diff --git a/templates/openharmony/entry/build-profile.json5 b/templates/harmonyos-next/entry/build-profile.json5 similarity index 100% rename from templates/openharmony/entry/build-profile.json5 rename to templates/harmonyos-next/entry/build-profile.json5 diff --git a/templates/openharmony/entry/hvigorfile.ts b/templates/harmonyos-next/entry/hvigorfile.ts similarity index 100% rename from templates/openharmony/entry/hvigorfile.ts rename to templates/harmonyos-next/entry/hvigorfile.ts diff --git a/templates/openharmony/entry/oh-package.json5 b/templates/harmonyos-next/entry/oh-package.json5 similarity index 100% rename from templates/openharmony/entry/oh-package.json5 rename to templates/harmonyos-next/entry/oh-package.json5 diff --git a/templates/openharmony/entry/src/main/cpp/types/libcocos/index.d.ts b/templates/harmonyos-next/entry/src/main/cpp/types/libcocos/index.d.ts similarity index 100% rename from templates/openharmony/entry/src/main/cpp/types/libcocos/index.d.ts rename to templates/harmonyos-next/entry/src/main/cpp/types/libcocos/index.d.ts diff --git a/templates/openharmony/entry/src/main/cpp/types/libcocos/oh-package.json5 b/templates/harmonyos-next/entry/src/main/cpp/types/libcocos/oh-package.json5 similarity index 100% rename from templates/openharmony/entry/src/main/cpp/types/libcocos/oh-package.json5 rename to templates/harmonyos-next/entry/src/main/cpp/types/libcocos/oh-package.json5 diff --git a/templates/openharmony/entry/src/main/ets/cocos/WorkerManager.ets b/templates/harmonyos-next/entry/src/main/ets/cocos/WorkerManager.ets similarity index 100% rename from templates/openharmony/entry/src/main/ets/cocos/WorkerManager.ets rename to templates/harmonyos-next/entry/src/main/ets/cocos/WorkerManager.ets diff --git a/templates/openharmony/entry/src/main/ets/cocos/game.ts b/templates/harmonyos-next/entry/src/main/ets/cocos/game.ts similarity index 100% rename from templates/openharmony/entry/src/main/ets/cocos/game.ts rename to templates/harmonyos-next/entry/src/main/ets/cocos/game.ts diff --git a/templates/openharmony/entry/src/main/ets/cocos/jsb-adapter/sys-ability-polyfill.js b/templates/harmonyos-next/entry/src/main/ets/cocos/jsb-adapter/sys-ability-polyfill.js similarity index 100% rename from templates/openharmony/entry/src/main/ets/cocos/jsb-adapter/sys-ability-polyfill.js rename to templates/harmonyos-next/entry/src/main/ets/cocos/jsb-adapter/sys-ability-polyfill.js diff --git a/templates/openharmony/entry/src/main/ets/cocos/oh-adapter/sys-ability-polyfill.js b/templates/harmonyos-next/entry/src/main/ets/cocos/oh-adapter/sys-ability-polyfill.js similarity index 100% rename from templates/openharmony/entry/src/main/ets/cocos/oh-adapter/sys-ability-polyfill.js rename to templates/harmonyos-next/entry/src/main/ets/cocos/oh-adapter/sys-ability-polyfill.js diff --git a/templates/openharmony/entry/src/main/ets/common/Constants.ts b/templates/harmonyos-next/entry/src/main/ets/common/Constants.ts similarity index 100% rename from templates/openharmony/entry/src/main/ets/common/Constants.ts rename to templates/harmonyos-next/entry/src/main/ets/common/Constants.ts diff --git a/templates/openharmony/entry/src/main/ets/common/PortProxy.ts b/templates/harmonyos-next/entry/src/main/ets/common/PortProxy.ts similarity index 100% rename from templates/openharmony/entry/src/main/ets/common/PortProxy.ts rename to templates/harmonyos-next/entry/src/main/ets/common/PortProxy.ts diff --git a/templates/openharmony/entry/src/main/ets/components/CocosVideoPlayer.ets b/templates/harmonyos-next/entry/src/main/ets/components/CocosVideoPlayer.ets similarity index 100% rename from templates/openharmony/entry/src/main/ets/components/CocosVideoPlayer.ets rename to templates/harmonyos-next/entry/src/main/ets/components/CocosVideoPlayer.ets diff --git a/templates/openharmony/entry/src/main/ets/components/CocosWebView.ets b/templates/harmonyos-next/entry/src/main/ets/components/CocosWebView.ets similarity index 100% rename from templates/openharmony/entry/src/main/ets/components/CocosWebView.ets rename to templates/harmonyos-next/entry/src/main/ets/components/CocosWebView.ets diff --git a/templates/openharmony/entry/src/main/ets/components/EditBoxDialog.ets b/templates/harmonyos-next/entry/src/main/ets/components/EditBoxDialog.ets similarity index 100% rename from templates/openharmony/entry/src/main/ets/components/EditBoxDialog.ets rename to templates/harmonyos-next/entry/src/main/ets/components/EditBoxDialog.ets diff --git a/templates/openharmony/entry/src/main/ets/entryability/EntryAbility.ts b/templates/harmonyos-next/entry/src/main/ets/entryability/EntryAbility.ts similarity index 100% rename from templates/openharmony/entry/src/main/ets/entryability/EntryAbility.ts rename to templates/harmonyos-next/entry/src/main/ets/entryability/EntryAbility.ts diff --git a/templates/openharmony/entry/src/main/ets/pages/index.ets b/templates/harmonyos-next/entry/src/main/ets/pages/index.ets similarity index 100% rename from templates/openharmony/entry/src/main/ets/pages/index.ets rename to templates/harmonyos-next/entry/src/main/ets/pages/index.ets diff --git a/templates/openharmony/entry/src/main/ets/workers/cocos_worker.ts b/templates/harmonyos-next/entry/src/main/ets/workers/cocos_worker.ts similarity index 100% rename from templates/openharmony/entry/src/main/ets/workers/cocos_worker.ts rename to templates/harmonyos-next/entry/src/main/ets/workers/cocos_worker.ts diff --git a/templates/openharmony/entry/src/main/module.json5 b/templates/harmonyos-next/entry/src/main/module.json5 similarity index 100% rename from templates/openharmony/entry/src/main/module.json5 rename to templates/harmonyos-next/entry/src/main/module.json5 diff --git a/templates/openharmony/entry/src/main/resources/base/element/color.json b/templates/harmonyos-next/entry/src/main/resources/base/element/color.json similarity index 100% rename from templates/openharmony/entry/src/main/resources/base/element/color.json rename to templates/harmonyos-next/entry/src/main/resources/base/element/color.json diff --git a/templates/openharmony/entry/src/main/resources/base/element/string.json b/templates/harmonyos-next/entry/src/main/resources/base/element/string.json similarity index 100% rename from templates/openharmony/entry/src/main/resources/base/element/string.json rename to templates/harmonyos-next/entry/src/main/resources/base/element/string.json diff --git a/templates/openharmony/entry/src/main/resources/base/media/icon.png b/templates/harmonyos-next/entry/src/main/resources/base/media/icon.png similarity index 100% rename from templates/openharmony/entry/src/main/resources/base/media/icon.png rename to templates/harmonyos-next/entry/src/main/resources/base/media/icon.png diff --git a/templates/openharmony/entry/src/main/resources/base/profile/main_pages.json b/templates/harmonyos-next/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from templates/openharmony/entry/src/main/resources/base/profile/main_pages.json rename to templates/harmonyos-next/entry/src/main/resources/base/profile/main_pages.json diff --git a/templates/openharmony/entry/src/main/resources/rawfile/.keep b/templates/harmonyos-next/entry/src/main/resources/rawfile/.keep similarity index 100% rename from templates/openharmony/entry/src/main/resources/rawfile/.keep rename to templates/harmonyos-next/entry/src/main/resources/rawfile/.keep diff --git a/templates/openharmony/hvigor/hvigor-config.json5 b/templates/harmonyos-next/hvigor/hvigor-config.json5 similarity index 100% rename from templates/openharmony/hvigor/hvigor-config.json5 rename to templates/harmonyos-next/hvigor/hvigor-config.json5 diff --git a/templates/openharmony/hvigorfile.ts b/templates/harmonyos-next/hvigorfile.ts similarity index 100% rename from templates/openharmony/hvigorfile.ts rename to templates/harmonyos-next/hvigorfile.ts diff --git a/templates/openharmony/oh-package.json5 b/templates/harmonyos-next/oh-package.json5 similarity index 100% rename from templates/openharmony/oh-package.json5 rename to templates/harmonyos-next/oh-package.json5