diff --git a/BUILD.gn b/BUILD.gn index 971365a4a407bdaf1b3724ea3c6300a6a9c05080..47a1f0bce595f102cbfd10c1a70279589327fcf8 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -12,7 +12,7 @@ import("//build/lite/config/component/lite_component.gni") import("//build/lite/ndk/ndk.gni") -lite_component("lite_wms") { +lite_component("window_manager_lite") { features = [ ":wms_server", ":wms_client", @@ -20,7 +20,7 @@ lite_component("lite_wms") { public_deps = [ ":wms_client" ] } -ndk_lib("lite_wms_ndk") { +ndk_lib("window_manager_lite_ndk") { lib_extension = ".so" deps = [ ":wms_client" ] head_files = [] @@ -30,8 +30,8 @@ commonDeps = [ "//foundation/systemabilitymgr/samgr_lite/samgr:samgr", "//foundation/systemabilitymgr/samgr_lite/communication/broadcast:broadcast", "//foundation/communication/ipc/interfaces/innerkits/c/ipc:ipc_single", - "//foundation/graphic/surface:surface", - "//foundation/graphic/utils:lite_graphic_utils", + "//foundation/graphic/surface_lite:surface", + "//foundation/graphic/graphic_utils_lite:graphic_utils_lite", "//third_party/bounds_checking_function:libsec_shared", ] @@ -47,7 +47,7 @@ shared_library("wms_client") { "frameworks/wms/lite_wms_client.cpp", ] deps = commonDeps - public_deps = [ "//foundation/graphic/surface:lite_surface" ] + public_deps = [ "//foundation/graphic/surface_lite:surface_lite" ] public_configs = [ ":wms_public_config" ] ldflags = [ "-lstdc++" ] cflags = [ "-Wall" ] @@ -96,7 +96,7 @@ executable("wms_server") { deps = [ "//base/security/permission_lite/services/pms_client:pms_client", "//drivers/peripheral/input/hal:hdi_input", - "//foundation/graphic/utils:lite_graphic_hals", + "//foundation/graphic/graphic_utils_lite:lite_graphic_hals", ] deps += commonDeps cflags = [ "-Wall" ] diff --git a/README.md b/README.md index 0cdf37fd8c21b14a6fc83ec08df9be943e8dce0d..00ae0d14da52d038b0b0b2535918d8f394536bbc 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The graphics service uses the client/server \(C/S\) architecture and is divided ## Directory Structure ``` -/foundation/graphic/wms +/foundation/window/window_manager_lite ├── frameworks # Client │ ├── ims # Input event management service client │ └── wms # Window management service client @@ -39,7 +39,7 @@ The graphics service uses the client/server \(C/S\) architecture and is divided ``` # Generate the wms_server and libwms_client.so files in the out directory of the product folder through GN compilation. -hb build lite_wms +hb build window_manager_lite ``` ## Description @@ -53,10 +53,10 @@ hb build lite_wms [Graphic subsystem](https://gitee.com/openharmony/docs/blob/master/en/readme/graphics.md) -**graphic_wms** +**window_window_manager_lite** -[graphic_surface](https://gitee.com/openharmony/graphic_surface/blob/master/README.md) +[graphic_surface_lite](https://gitee.com/openharmony/graphic_surface_lite/blob/master/README.md) -[graphic_ui](https://gitee.com/openharmony/graphic_ui/blob/master/README.md) +[arkui_ui_lite](https://gitee.com/openharmony/arkui_ui_lite/blob/master/README.md) -[graphic_utils](https://gitee.com/openharmony/graphic_utils/blob/master/README.md) \ No newline at end of file +[graphic_graphic_utils_lite](https://gitee.com/openharmony/graphic_graphic_utils_lite/blob/master/README.md) diff --git a/README_zh.md b/README_zh.md index 4f12044fc8ba2443dea6f5ce76d86b29c444a684..2eb8063fa0f832d1856747dfb6355120e93befaf 100644 --- a/README_zh.md +++ b/README_zh.md @@ -23,7 +23,7 @@ ## 目录 ``` -/foundation/graphic/wms +/foundation/window/window_manager_lite ├── frameworks # 客户端 │ ├── ims # 输入管理客户端 │ └── wms # 窗口管理服务客户端 @@ -39,7 +39,7 @@ ``` # 通过gn编译,在out目录下对应产品的文件夹中生成可执行文件wms_server和libwms_client.so -hb build lite_wms +hb build window_manager_lite ``` ## 说明 @@ -53,10 +53,10 @@ hb build lite_wms [图形子系统](https://gitee.com/openharmony/docs/blob/master/zh-cn/readme/%E5%9B%BE%E5%BD%A2%E5%AD%90%E7%B3%BB%E7%BB%9F.md) -**graphic_wms** +**window_window_manager_lite** -[graphic_surface](https://gitee.com/openharmony/graphic_surface/blob/master/README_zh.md) +[graphic_surface_lite](https://gitee.com/openharmony/graphic_surface_lite/blob/master/README_zh.md) -[graphic_ui](https://gitee.com/openharmony/graphic_ui/blob/master/README_zh.md) +[arkui_ui_lite](https://gitee.com/openharmony/arkui_ui_lite/blob/master/README_zh.md) -[graphic_utils](https://gitee.com/openharmony/graphic_utils/blob/master/README_zh.md) \ No newline at end of file +[graphic_graphic_utils_lite](https://gitee.com/openharmony/graphic_graphic_utils_lite/blob/master/README_zh.md) diff --git a/bundle.json b/bundle.json index d80147bbded65bf5b1dfc966884a60b50ab10554..7db90b37b417b496f6be0832bc6f02bd84a89bef 100644 --- a/bundle.json +++ b/bundle.json @@ -5,14 +5,14 @@ "license": "Apache License 2.0", "pubiishAs": "code-segment", "segment": { - "destPath": "foundation/graphic/wms" + "destPath": "foundation/window/window_manager_lite" }, "dirs": {}, "scripts": {}, "component": { - "name": "wms", - "subsystem": "graphic", - "syscap": [ "SystemCapability.Graphic.Wms" ], + "name": "window_manager_lite", + "subsystem": "window", + "syscap": [ "SystemCapability.Window.WindowManagerLite" ], "feature": [], "adapted_system_type": [ "small" ], "rom": "110KB", @@ -31,8 +31,8 @@ }, "build": { "sub_component": [ - "//foundation/graphic/wms:lite_wms", - "//foundation/graphic/wms/test:lite_wms_test" + "//foundation/window/window_manager_lite:window_manager_lite", + "//foundation/window/window_manager_lite/test:window_manager_lite_test" ], "inner_kits": [], "test": [] diff --git a/test/BUILD.gn b/test/BUILD.gn index 04666d33fde08eaa022be3cb0eab6292a0ec1f06..042d3fe3aca3f5f464912a48e2e8413c86860b02 100755 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -12,7 +12,7 @@ import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/subsystem/graphic/config.gni") -group("lite_wms_test") { +group("window_manager_lite_test") { if (ohos_build_type == "debug") { deps = [ ":sample_auto_ui", @@ -26,8 +26,8 @@ if (ohos_build_type == "debug") { executable("sample_ui") { sources = [ "sample_ui.cpp" ] include_dirs = [ - "//foundation/graphic/ui/frameworks", - "//foundation/graphic/ui/test/framework", + "//foundation/arkui/ui_lite/frameworks", + "//foundation/arkui/ui_lite/test/framework", "//third_party/freetype/include", ] ldflags = [ @@ -37,9 +37,9 @@ if (ohos_build_type == "debug") { ] deps = [ - "//foundation/graphic/ui/test/framework:lite_graphic_test_framework", - "//foundation/graphic/utils:lite_graphic_hals", - "//foundation/graphic/wms:wms_client", + "//foundation/arkui/ui_lite/test/framework:lite_graphic_test_framework", + "//foundation/graphic/graphic_utils_lite:lite_graphic_hals", + "//foundation/window/window_manager_lite:wms_client", ] output_dir = "$root_out_dir/dev_tools" } @@ -47,8 +47,8 @@ if (ohos_build_type == "debug") { executable("sample_auto_ui") { sources = [ "sample_ui.cpp" ] include_dirs = [ - "//foundation/graphic/ui/frameworks", - "//foundation/graphic/ui/test/framework", + "//foundation/arkui/ui_lite/frameworks", + "//foundation/arkui/ui_lite/test/framework", "//third_party/freetype/include", ] ldflags = [ @@ -57,9 +57,9 @@ if (ohos_build_type == "debug") { "-Wl,-rpath-link=$ohos_root_path/$root_out_dir", ] deps = [ - "//foundation/graphic/ui/test/framework:auto_framework", - "//foundation/graphic/utils:lite_graphic_hals", - "//foundation/graphic/wms:wms_client", + "//foundation/arkui/ui_lite/test/framework:auto_framework", + "//foundation/graphic/graphic_utils_lite:lite_graphic_hals", + "//foundation/window/window_manager_lite:wms_client", ] output_dir = "$root_out_dir/dev_tools" @@ -67,13 +67,13 @@ if (ohos_build_type == "debug") { executable("sample_window") { sources = [ - "//foundation/graphic/ui/test/framework/common/ui_text_language.cpp", + "//foundation/arkui/ui_lite/test/framework/common/ui_text_language.cpp", "sample_window.cpp", ] include_dirs = [ - "//foundation/graphic/ui/frameworks", - "//foundation/graphic/ui/test/framework", - "//foundation/graphic/surface/interfaces/kits", + "//foundation/arkui/ui_lite/frameworks", + "//foundation/arkui/ui_lite/test/framework", + "//foundation/graphic/surface_lite/interfaces/kits", "//third_party/freetype/include", ] ldflags = [ @@ -82,7 +82,7 @@ if (ohos_build_type == "debug") { "-Wl,-rpath-link=$ohos_root_path/$root_out_dir", ] - deps = [ "//foundation/graphic/ui:lite_ui" ] + deps = [ "//foundation/arkui/ui_lite:ui_lite" ] output_dir = "$root_out_dir/dev_tools" } }