diff --git a/BUILD.gn b/BUILD.gn index b2d139f..c22871b 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -23,18 +23,18 @@ if (enable_ohos_graphic_utils_product_config) { defines += [ "ENABLE_OHOS_GRAPHIC_UTILS_PRODUCT_CONFIG=1" ] } -lite_component("graphic_utils_lite") { - features = [ ":graphic_utils" ] +lite_component("utils_lite") { + features = [ ":graphic_utils_lite" ] public_deps = features } ndk_lib("graphic_utils_lite_ndk") { lib_extension = ".so" - deps = [ ":graphic_utils" ] + deps = [ ":graphic_utils_lite" ] head_files = [ "interfaces/kits" ] } -lite_library("graphic_utils") { +lite_library("graphic_utils_lite") { if (ohos_kernel_type == "liteos_m") { target_type = "static_library" } else { @@ -132,9 +132,10 @@ if (ohos_kernel_type != "liteos_m") { "frameworks/hals/gfx_engines.cpp", "frameworks/hals/hi_fbdev.cpp", ] - include_dirs = [ "//foundation/graphic/wms/interfaces/innerkits" ] + include_dirs = + [ "//foundation/window/window_manager_lite/interfaces/innerkits" ] deps = [ - ":graphic_utils_lite", + ":utils_lite", "//drivers/peripheral/display/hal:hdi_display", ] public_configs = [ ":graphic_hals_public_config" ] diff --git a/README.md b/README.md index 6d988d2..3651387 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ The Utils module defines the common data structure in the graphics subsystem and ## Directory Structure ``` -/foundation/graphic/utils +/foundation/graphic/graphic_utils_lite ├── frameworks # Framework code │   ├── diagram # 2d graphic engine implementation │   │   ├── depiction # Smooth curve point generation algorithm @@ -52,11 +52,11 @@ hb build graphic_utils_lite [Graphic subsystem](https://gitee.com/openharmony/docs/blob/master/en/readme/graphics.md) -[graphic_wms](https://gitee.com/openharmony/graphic_wms/blob/master/README.md) +[window_window_manager_lite](https://gitee.com/openharmony/window_window_manager_lite/blob/master/README.md) -[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) # Hals @@ -78,7 +78,7 @@ The Hals module adapts and encapsulates the functions related to the driver subs ## Directory Structure ``` -/foundation/graphic/utils +/foundation/graphic/graphic_utils_lite ├── frameworks # Framework code │ ├── hals # Hardware adaptation layer │ ├── linux # Linux platform adaptation layer @@ -108,10 +108,10 @@ hb build graphic_utils_lite [Graphic subsystem](https://gitee.com/openharmony/docs/blob/master/en/readme/graphics.md) -[graphic_wms](https://gitee.com/openharmony/graphic_wms/blob/master/README.md) +[window_window_manager_lite](https://gitee.com/openharmony/window_window_manager_lite/blob/master/README.md) -[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** \ No newline at end of file +**graphic_graphic_utils_lite** \ No newline at end of file diff --git a/README_zh.md b/README_zh.md index e8635c6..c141a78 100644 --- a/README_zh.md +++ b/README_zh.md @@ -18,7 +18,7 @@ HALS组件中实现了对驱动子系统和平台相关功能的适配封装， ## 目录 ``` -/foundation/graphic/utils +/foundation/graphic/graphic_utils_lite ├── frameworks # 框架代码 │   ├── diagram # 2d图形引擎 │   │   ├── depiction # 光滑曲线点生成算法 @@ -51,11 +51,11 @@ hb build graphic_utils_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](https://gitee.com/openharmony/graphic_wms/blob/master/README_zh.md) +[window_window_manager_lite](https://gitee.com/openharmony/window_window_manager_lite/blob/master/README.md) -[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) # 图形UTILS组件 @@ -77,7 +77,7 @@ UTILS组件中定义了图形子系统中的公共数据结构，并提供了一 ## 目录 ``` -/foundation/graphic/utils +/foundation/graphic/graphic_utils_lite ├── frameworks # 框架代码 │ ├── hals # 硬件适配层 │ ├── linux # linux平台适配层 @@ -108,10 +108,10 @@ hb build graphic_utils_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](https://gitee.com/openharmony/graphic_wms/blob/master/README_zh.md) +[window_window_manager_lite](https://gitee.com/openharmony/window_window_manager_lite/blob/master/README.md) -[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** \ No newline at end of file +**graphic_graphic_utils_lite** \ No newline at end of file diff --git a/bundle.json b/bundle.json index f194242..24c7b02 100644 --- a/bundle.json +++ b/bundle.json @@ -1,18 +1,18 @@ { - "name": "@ohos/graphic_utils", + "name": "@ohos/graphic_utils_lite", "description": "Graphic fundamental components", "version": "3.1", "license": "Apache License 2.0", "pubiishAs": "code-segment", "segment": { - "destPath": "foundation/graphic/utils" + "destPath": "foundation/graphic/graphic_utils_lite" }, "dirs": {}, "scripts": {}, "component": { - "name": "graphic_utils", + "name": "graphic_utils_lite", "subsystem": "graphic", - "syscap": [ "SystemCapability.Graphic.Utils" ], + "syscap": [ "SystemCapability.Graphic.GraphicUtilsLite" ], "feature": [], "adapted_system_type": [ "mini","small" ], "rom": "", @@ -27,8 +27,8 @@ }, "build": { "sub_component": [ - "//foundation/graphic/utils:graphic_utils_lite", - "//foundation/graphic/utils/test:graphic_utils_lite_test" ], + "//foundation/graphic/graphic_utils_lite:utils_lite", + "//foundation/graphic/graphic_utils_lite/test:graphic_utils_lite_test" ], "inner_kits": [], "test": [] } diff --git a/test/BUILD.gn b/test/BUILD.gn index 4ecda97..4bd8e71 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -30,7 +30,7 @@ if (ohos_kernel_type != "liteos_m") { unittest("graphic_test_utils_door") { output_extension = "bin" output_dir = "$root_out_dir/test/unittest/graphic" - deps = [ "//foundation/graphic/utils:graphic_utils" ] + deps = [ "//foundation/graphic/graphic_utils_lite:utils_lite" ] configs = [ ":graphic_utils_lite_test_config" ] sources = [ "color_unit_test.cpp", diff --git a/utils.gni b/utils.gni index ac74c91..426a699 100644 --- a/utils.gni +++ b/utils.gni @@ -9,45 +9,45 @@ # See the License for the specific language governing permissions and # limitations under the License. -GRAPHIC_UTILS_PATH = "//foundation/graphic/utils" +GRAPHIC_GRAPHIC_UTILS_LITE_PATH = "//foundation/graphic/graphic_utils_lite" graphic_utils_include_dirs = [ - "$GRAPHIC_UTILS_PATH/interfaces/innerkits", - "$GRAPHIC_UTILS_PATH/interfaces/kits", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/interfaces/innerkits", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/interfaces/kits", ] graphic_utils_sources = [ - "$GRAPHIC_UTILS_PATH/frameworks/color.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/diagram/depiction/depict_curve.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/diagram/rasterizer/rasterizer_cells_antialias.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/diagram/rasterizer/rasterizer_scanline_antialias.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/diagram/rasterizer/rasterizer_scanline_clip.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/diagram/vertexgenerate/vertex_generate_dash.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/diagram/vertexgenerate/vertex_generate_stroke.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/diagram/vertexprimitive/geometry_arc.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/diagram/vertexprimitive/geometry_bezier_arc.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/diagram/vertexprimitive/geometry_curves.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/diagram/vertexprimitive/geometry_shorten_path.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/geometry2d.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/graphic_math.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/graphic_performance.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/hal_cpu.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/hal_tick.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/mem_api.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/pixel_format_utils.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/style.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/trans_affine.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/transform.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/version.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/color.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/diagram/depiction/depict_curve.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/diagram/rasterizer/rasterizer_cells_antialias.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/diagram/rasterizer/rasterizer_scanline_antialias.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/diagram/rasterizer/rasterizer_scanline_clip.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/diagram/vertexgenerate/vertex_generate_dash.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/diagram/vertexgenerate/vertex_generate_stroke.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/diagram/vertexprimitive/geometry_arc.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/diagram/vertexprimitive/geometry_bezier_arc.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/diagram/vertexprimitive/geometry_curves.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/diagram/vertexprimitive/geometry_shorten_path.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/geometry2d.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/graphic_math.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/graphic_performance.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/hal_cpu.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/hal_tick.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/mem_api.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/pixel_format_utils.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/style.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/trans_affine.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/transform.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/version.cpp", ] graphic_hals_include_dirs = [ - "$GRAPHIC_UTILS_PATH/interfaces/innerkits", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/interfaces/innerkits", "//drivers/peripheral/base", "//drivers/peripheral/display/interfaces/include", ] graphic_hals_sources = [ - "$GRAPHIC_UTILS_PATH/frameworks/hals/gfx_engines.cpp", - "$GRAPHIC_UTILS_PATH/frameworks/hals/hi_fbdev.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/hals/gfx_engines.cpp", + "$GRAPHIC_GRAPHIC_UTILS_LITE_PATH/frameworks/hals/hi_fbdev.cpp", ]