diff --git a/BUILD.gn b/BUILD.gn index 9e8b1d0a4b9ff76411948a4baf1976628d8e0c5f..3aaeb9c53105f32064f9a0295247683e9a86810c 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -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:graphic_utils_lite", + "//foundation/graphic/surface_lite:surface", + "//foundation/graphic/graphic_utils_lite: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:surface_lite" ] + 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 1d468422c498a06e5a7f71fc0224ec2a2cbbc4e8..eb2347b0c62c67f4ddfca4b6500b3c238922ae86 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 @@ -53,10 +53,10 @@ hb build window_manager_lite [Graphic subsystem](https://gitee.com/openharmony/docs/blob/master/en/readme/graphics.md) -**graphic_wms** +**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) \ No newline at end of file diff --git a/README_zh.md b/README_zh.md index a981474cae3b25c9992ecc5f1f80175d38e2db8d..ff5675a390d427bd003bc1b999479aab5ad34c67 100644 --- a/README_zh.md +++ b/README_zh.md @@ -23,7 +23,7 @@ ## 目录 ``` -/foundation/graphic/wms +/foundation/window/window_manager_lite ├── frameworks # 客户端 │ ├── ims # 输入管理客户端 │ └── wms # 窗口管理服务客户端 @@ -53,10 +53,10 @@ hb build window_manager_lite [图形子系统](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_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.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.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.md) \ No newline at end of file diff --git a/bundle.json b/bundle.json index 88ff404626b599ef486436e85725bd3e531b4ee2..8804bd01bddda2583dd88ce5c9edeeb0e822fa8e 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", @@ -24,15 +24,15 @@ "components": [ "hilog_lite", "samgr_lite", - "surface", + "surface_lite", "peripheral_display", "peripheral_input" ] }, "build": { "sub_component": [ - "//foundation/graphic/wms:window_manager_lite", - "//foundation/graphic/wms/test:window_manager_lite_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 d849481ad090b6f555758d2ad4d8878992c5e193..042d3fe3aca3f5f464912a48e2e8413c86860b02 100755 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -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:ui_lite" ] + deps = [ "//foundation/arkui/ui_lite:ui_lite" ] output_dir = "$root_out_dir/dev_tools" } }