From b47281a83bd86fb0f25607c5f6b57255ac5e544d Mon Sep 17 00:00:00 2001 From: huangjie Date: Wed, 4 May 2022 16:00:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=BB=93=E5=90=8Dresource=5F?= =?UTF-8?q?management=5Flite=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huangjie --- README.md | 16 ++++++++-------- README_zh.md | 16 ++++++++-------- bundle.json | 12 ++++++------ .../BUILD.gn | 6 +++--- .../CMakeLists.txt | 6 +++--- .../include/auto_mutex.h | 0 .../include/global_utils.h | 0 .../include/hap_manager.h | 0 .../include/hap_parser.h | 0 .../include/hap_resource.h | 0 .../include/hilog_wrapper.h | 0 .../include/locale_matcher.h | 0 .../include/lock.h | 0 .../include/res_common.h | 0 .../include/res_config.h | 0 .../include/res_config_impl.h | 0 .../include/res_desc.h | 0 .../include/res_locale.h | 0 .../include/resource_manager.h | 0 .../include/resource_manager_impl.h | 0 .../include/rstate.h | 0 .../include/utils/common.h | 0 .../include/utils/date_utils.h | 0 .../include/utils/errors.h | 0 .../include/utils/locale_data.h | 0 .../include/utils/string_utils.h | 0 .../include/utils/utils.h | 0 .../src/global.c | 0 .../src/global.cpp | 0 .../src/global_utils.c | 0 .../src/hap_manager.cpp | 0 .../src/hap_resource.cpp | 0 .../src/likely_subtags_key_data.cpp | 0 .../src/likely_subtags_value_data.cpp | 0 .../src/locale_matcher.cpp | 0 .../src/lock.cpp | 0 .../src/res_config_impl.cpp | 0 .../src/res_desc.cpp | 0 .../src/res_locale.cpp | 0 .../src/resource_manager_impl.cpp | 0 .../src/utils/hap_parser.cpp | 0 .../src/utils/string_utils.cpp | 0 .../src/utils/utils.cpp | 0 .../test/BUILD.gn | 6 +++--- .../test/unittest/lite/common/global_test.cpp | 0 .../test/unittest/lite/common/global_test.h | 0 .../unittest/lite/common/hap_manager_test.cpp | 0 .../test/unittest/lite/common/hap_manager_test.h | 0 .../unittest/lite/common/hap_parser_test.cpp | 0 .../test/unittest/lite/common/hap_parser_test.h | 0 .../unittest/lite/common/hap_resource_test.cpp | 0 .../unittest/lite/common/hap_resource_test.h | 0 .../unittest/lite/common/locale_info_test.cpp | 0 .../test/unittest/lite/common/locale_info_test.h | 0 .../lite/common/res_config_impl_test.cpp | 0 .../unittest/lite/common/res_config_impl_test.h | 0 .../unittest/lite/common/res_config_test.cpp | 0 .../test/unittest/lite/common/res_config_test.h | 0 .../test/unittest/lite/common/res_desc_test.cpp | 0 .../test/unittest/lite/common/res_desc_test.h | 0 .../common/resource_manager_performance_test.cpp | 0 .../common/resource_manager_performance_test.h | 0 .../lite/common/resource_manager_test.cpp | 0 .../unittest/lite/common/resource_manager_test.h | 0 .../unittest/lite/common/string_utils_test.cpp | 0 .../unittest/lite/common/string_utils_test.h | 0 .../test/unittest/lite/common/test_common.cpp | 0 .../test/unittest/lite/common/test_common.h | 0 68 files changed, 31 insertions(+), 31 deletions(-) rename frameworks/{resmgr_lite => resource_management_lite}/BUILD.gn (92%) rename frameworks/{resmgr_lite => resource_management_lite}/CMakeLists.txt (72%) rename frameworks/{resmgr_lite => resource_management_lite}/include/auto_mutex.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/global_utils.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/hap_manager.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/hap_parser.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/hap_resource.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/hilog_wrapper.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/locale_matcher.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/lock.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/res_common.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/res_config.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/res_config_impl.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/res_desc.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/res_locale.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/resource_manager.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/resource_manager_impl.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/rstate.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/utils/common.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/utils/date_utils.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/utils/errors.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/utils/locale_data.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/utils/string_utils.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/include/utils/utils.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/global.c (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/global.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/global_utils.c (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/hap_manager.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/hap_resource.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/likely_subtags_key_data.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/likely_subtags_value_data.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/locale_matcher.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/lock.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/res_config_impl.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/res_desc.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/res_locale.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/resource_manager_impl.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/utils/hap_parser.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/utils/string_utils.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/src/utils/utils.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/BUILD.gn (86%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/global_test.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/global_test.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/hap_manager_test.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/hap_manager_test.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/hap_parser_test.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/hap_parser_test.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/hap_resource_test.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/hap_resource_test.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/locale_info_test.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/locale_info_test.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/res_config_impl_test.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/res_config_impl_test.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/res_config_test.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/res_config_test.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/res_desc_test.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/res_desc_test.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/resource_manager_performance_test.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/resource_manager_performance_test.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/resource_manager_test.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/resource_manager_test.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/string_utils_test.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/string_utils_test.h (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/test_common.cpp (100%) rename frameworks/{resmgr_lite => resource_management_lite}/test/unittest/lite/common/test_common.h (100%) diff --git a/README.md b/README.md index 4766482..b68ddeb 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,14 @@ The directory structure for the resource management module is as follows: ``` /base/global/ -├── resmgr_lite # Code repository for the resource management module -│ ├── frameworks # Core code of the resource management module -│ │ ├── resmgr_lite # Core code for resource parsing -│ │ │ ├── include # Header files of the resource management module -│ │ │ ├── src # Implementation code of the resource management module -│ │ │ └── test # Test code -│ ├── interfaces # APIs of the resource management module -│ │ └── innerkits # APIs of the resource management module for internal subsystems +├── resource_management_lite # Code repository for the resource management module +│ ├── frameworks # Core code of the resource management module +│ │ ├── resource_management_lite # Core code for resource parsing +│ │ │ ├── include # Header files of the resource management module +│ │ │ ├── src # Implementation code of the resource management module +│ │ │ └── test # Test code +│ ├── interfaces # APIs of the resource management module +│ │ └── innerkits # APIs of the resource management module for internal subsystems ``` ## Usage diff --git a/README_zh.md b/README_zh.md index d7e6a80..c6412a1 100644 --- a/README_zh.md +++ b/README_zh.md @@ -16,14 +16,14 @@ ``` /base/global/ -├── resmgr_lite # 资源管理代码仓 -│ ├── frameworks # 资源管理核心代码 -│ │ ├── resmgr_lite # 资源解析核心代码 -│ │ │ ├── include # 资源管理头文件 -│ │ │ ├── src # 资源管理实现代码 -│ │ │ └── test # 资源管理测试代码 -│ ├── interfaces # 资源管理接口 -│ │ └── innerkits # 资源管理对子系统间接口 +├── resource_management_lite # 资源管理代码仓 +│ ├── frameworks # 资源管理核心代码 +│ │ ├── resource_management_lite # 资源解析核心代码 +│ │ │ ├── include # 资源管理头文件 +│ │ │ ├── src # 资源管理实现代码 +│ │ │ └── test # 资源管理测试代码 +│ ├── interfaces # 资源管理接口 +│ │ └── innerkits # 资源管理对子系统间接口 ``` ## 说明 diff --git a/bundle.json b/bundle.json index 6170a0b..868e9c0 100644 --- a/bundle.json +++ b/bundle.json @@ -1,10 +1,10 @@ { - "name": "@ohos/global_resmgr_lite", + "name": "@ohos/global_resource_management_lite", "version": "", "description": "Obtains resource information based on the device type and configuration", "homePage": "https://gitee.com/openharmony", "license": "Apache V2", - "repository": "https://gitee.com/openharmony/global_resmgr_lite", + "repository": "https://gitee.com/openharmony/global_resource_management_lite", "domain": "os", "language": "", "publishAs": "code-segment", @@ -33,10 +33,10 @@ } ], "segment": { - "destPath": "base/global/resmgr_lite" + "destPath": "base/global/resource_management_lite" }, "component": { - "name": "resmgr_lite", + "name": "resource_management_lite", "subsystem": "global", "syscap": [], "features": [], @@ -55,11 +55,11 @@ }, "build": { "sub_component": [ - "//base/global/resmgr_lite/frameworks/resmgr_lite:global_resmgr" + "//base/global/resource_management_lite/frameworks/resource_management_lite:global_resmgr" ], "inner_kits": [], "test": [ - "//base/global/resmgr_lite/frameworks/resmgr_lite/test:unittest" + "//base/global/resource_management_lite/frameworks/resource_management_lite/test:unittest" ] } } diff --git a/frameworks/resmgr_lite/BUILD.gn b/frameworks/resource_management_lite/BUILD.gn similarity index 92% rename from frameworks/resmgr_lite/BUILD.gn rename to frameworks/resource_management_lite/BUILD.gn index 2cbf593..ce7c5b4 100644 --- a/frameworks/resmgr_lite/BUILD.gn +++ b/frameworks/resource_management_lite/BUILD.gn @@ -43,7 +43,7 @@ if (defined(ohos_lite) && ohos_kernel_type == "liteos_a") { config("global_resmgr_config") { include_dirs = [ "include", - "//base/global/resmgr_lite/interfaces/innerkits/include", + "//base/global/resource_management_lite/interfaces/innerkits/include", "//utils/native/lite/include", "//third_party/bounds_checking_function/include", ] @@ -60,8 +60,8 @@ config("global_resmgr_config") { config("global_public_config") { include_dirs = [ - "//base/global/resmgr_lite/frameworks/resmgr_lite/include", - "//base/global/resmgr_lite/interfaces/innerkits/include", + "//base/global/resource_management_lite/frameworks/resource_management_lite/include", + "//base/global/resource_management_lite/interfaces/innerkits/include", ] } diff --git a/frameworks/resmgr_lite/CMakeLists.txt b/frameworks/resource_management_lite/CMakeLists.txt similarity index 72% rename from frameworks/resmgr_lite/CMakeLists.txt rename to frameworks/resource_management_lite/CMakeLists.txt index d561265..4b1e593 100644 --- a/frameworks/resmgr_lite/CMakeLists.txt +++ b/frameworks/resource_management_lite/CMakeLists.txt @@ -13,9 +13,9 @@ cmake_minimum_required(VERSION 3.16.5) -set(GlobalSrc "${PROJECT_SOURCE_DIR}/base/global/resmgr_lite/frameworks/resmgr_lite/src") -set(GlobalInc "${PROJECT_SOURCE_DIR}/base/global/resmgr_lite/frameworks/resmgr_lite/include") -set(GlobalKitInc "${PROJECT_SOURCE_DIR}/base/global/resmgr_lite/interfaces/innerkits/include") +set(GlobalSrc "${PROJECT_SOURCE_DIR}/base/global/resource_management_lite/frameworks/resource_management_lite/src") +set(GlobalInc "${PROJECT_SOURCE_DIR}/base/global/resource_management_lite/frameworks/resource_management_lite/include") +set(GlobalKitInc "${PROJECT_SOURCE_DIR}/base/global/resource_management_lite/interfaces/innerkits/include") include_directories(${PROJECT_SOURCE_DIR}/third_party/bounds_checking_function/include) diff --git a/frameworks/resmgr_lite/include/auto_mutex.h b/frameworks/resource_management_lite/include/auto_mutex.h similarity index 100% rename from frameworks/resmgr_lite/include/auto_mutex.h rename to frameworks/resource_management_lite/include/auto_mutex.h diff --git a/frameworks/resmgr_lite/include/global_utils.h b/frameworks/resource_management_lite/include/global_utils.h similarity index 100% rename from frameworks/resmgr_lite/include/global_utils.h rename to frameworks/resource_management_lite/include/global_utils.h diff --git a/frameworks/resmgr_lite/include/hap_manager.h b/frameworks/resource_management_lite/include/hap_manager.h similarity index 100% rename from frameworks/resmgr_lite/include/hap_manager.h rename to frameworks/resource_management_lite/include/hap_manager.h diff --git a/frameworks/resmgr_lite/include/hap_parser.h b/frameworks/resource_management_lite/include/hap_parser.h similarity index 100% rename from frameworks/resmgr_lite/include/hap_parser.h rename to frameworks/resource_management_lite/include/hap_parser.h diff --git a/frameworks/resmgr_lite/include/hap_resource.h b/frameworks/resource_management_lite/include/hap_resource.h similarity index 100% rename from frameworks/resmgr_lite/include/hap_resource.h rename to frameworks/resource_management_lite/include/hap_resource.h diff --git a/frameworks/resmgr_lite/include/hilog_wrapper.h b/frameworks/resource_management_lite/include/hilog_wrapper.h similarity index 100% rename from frameworks/resmgr_lite/include/hilog_wrapper.h rename to frameworks/resource_management_lite/include/hilog_wrapper.h diff --git a/frameworks/resmgr_lite/include/locale_matcher.h b/frameworks/resource_management_lite/include/locale_matcher.h similarity index 100% rename from frameworks/resmgr_lite/include/locale_matcher.h rename to frameworks/resource_management_lite/include/locale_matcher.h diff --git a/frameworks/resmgr_lite/include/lock.h b/frameworks/resource_management_lite/include/lock.h similarity index 100% rename from frameworks/resmgr_lite/include/lock.h rename to frameworks/resource_management_lite/include/lock.h diff --git a/frameworks/resmgr_lite/include/res_common.h b/frameworks/resource_management_lite/include/res_common.h similarity index 100% rename from frameworks/resmgr_lite/include/res_common.h rename to frameworks/resource_management_lite/include/res_common.h diff --git a/frameworks/resmgr_lite/include/res_config.h b/frameworks/resource_management_lite/include/res_config.h similarity index 100% rename from frameworks/resmgr_lite/include/res_config.h rename to frameworks/resource_management_lite/include/res_config.h diff --git a/frameworks/resmgr_lite/include/res_config_impl.h b/frameworks/resource_management_lite/include/res_config_impl.h similarity index 100% rename from frameworks/resmgr_lite/include/res_config_impl.h rename to frameworks/resource_management_lite/include/res_config_impl.h diff --git a/frameworks/resmgr_lite/include/res_desc.h b/frameworks/resource_management_lite/include/res_desc.h similarity index 100% rename from frameworks/resmgr_lite/include/res_desc.h rename to frameworks/resource_management_lite/include/res_desc.h diff --git a/frameworks/resmgr_lite/include/res_locale.h b/frameworks/resource_management_lite/include/res_locale.h similarity index 100% rename from frameworks/resmgr_lite/include/res_locale.h rename to frameworks/resource_management_lite/include/res_locale.h diff --git a/frameworks/resmgr_lite/include/resource_manager.h b/frameworks/resource_management_lite/include/resource_manager.h similarity index 100% rename from frameworks/resmgr_lite/include/resource_manager.h rename to frameworks/resource_management_lite/include/resource_manager.h diff --git a/frameworks/resmgr_lite/include/resource_manager_impl.h b/frameworks/resource_management_lite/include/resource_manager_impl.h similarity index 100% rename from frameworks/resmgr_lite/include/resource_manager_impl.h rename to frameworks/resource_management_lite/include/resource_manager_impl.h diff --git a/frameworks/resmgr_lite/include/rstate.h b/frameworks/resource_management_lite/include/rstate.h similarity index 100% rename from frameworks/resmgr_lite/include/rstate.h rename to frameworks/resource_management_lite/include/rstate.h diff --git a/frameworks/resmgr_lite/include/utils/common.h b/frameworks/resource_management_lite/include/utils/common.h similarity index 100% rename from frameworks/resmgr_lite/include/utils/common.h rename to frameworks/resource_management_lite/include/utils/common.h diff --git a/frameworks/resmgr_lite/include/utils/date_utils.h b/frameworks/resource_management_lite/include/utils/date_utils.h similarity index 100% rename from frameworks/resmgr_lite/include/utils/date_utils.h rename to frameworks/resource_management_lite/include/utils/date_utils.h diff --git a/frameworks/resmgr_lite/include/utils/errors.h b/frameworks/resource_management_lite/include/utils/errors.h similarity index 100% rename from frameworks/resmgr_lite/include/utils/errors.h rename to frameworks/resource_management_lite/include/utils/errors.h diff --git a/frameworks/resmgr_lite/include/utils/locale_data.h b/frameworks/resource_management_lite/include/utils/locale_data.h similarity index 100% rename from frameworks/resmgr_lite/include/utils/locale_data.h rename to frameworks/resource_management_lite/include/utils/locale_data.h diff --git a/frameworks/resmgr_lite/include/utils/string_utils.h b/frameworks/resource_management_lite/include/utils/string_utils.h similarity index 100% rename from frameworks/resmgr_lite/include/utils/string_utils.h rename to frameworks/resource_management_lite/include/utils/string_utils.h diff --git a/frameworks/resmgr_lite/include/utils/utils.h b/frameworks/resource_management_lite/include/utils/utils.h similarity index 100% rename from frameworks/resmgr_lite/include/utils/utils.h rename to frameworks/resource_management_lite/include/utils/utils.h diff --git a/frameworks/resmgr_lite/src/global.c b/frameworks/resource_management_lite/src/global.c similarity index 100% rename from frameworks/resmgr_lite/src/global.c rename to frameworks/resource_management_lite/src/global.c diff --git a/frameworks/resmgr_lite/src/global.cpp b/frameworks/resource_management_lite/src/global.cpp similarity index 100% rename from frameworks/resmgr_lite/src/global.cpp rename to frameworks/resource_management_lite/src/global.cpp diff --git a/frameworks/resmgr_lite/src/global_utils.c b/frameworks/resource_management_lite/src/global_utils.c similarity index 100% rename from frameworks/resmgr_lite/src/global_utils.c rename to frameworks/resource_management_lite/src/global_utils.c diff --git a/frameworks/resmgr_lite/src/hap_manager.cpp b/frameworks/resource_management_lite/src/hap_manager.cpp similarity index 100% rename from frameworks/resmgr_lite/src/hap_manager.cpp rename to frameworks/resource_management_lite/src/hap_manager.cpp diff --git a/frameworks/resmgr_lite/src/hap_resource.cpp b/frameworks/resource_management_lite/src/hap_resource.cpp similarity index 100% rename from frameworks/resmgr_lite/src/hap_resource.cpp rename to frameworks/resource_management_lite/src/hap_resource.cpp diff --git a/frameworks/resmgr_lite/src/likely_subtags_key_data.cpp b/frameworks/resource_management_lite/src/likely_subtags_key_data.cpp similarity index 100% rename from frameworks/resmgr_lite/src/likely_subtags_key_data.cpp rename to frameworks/resource_management_lite/src/likely_subtags_key_data.cpp diff --git a/frameworks/resmgr_lite/src/likely_subtags_value_data.cpp b/frameworks/resource_management_lite/src/likely_subtags_value_data.cpp similarity index 100% rename from frameworks/resmgr_lite/src/likely_subtags_value_data.cpp rename to frameworks/resource_management_lite/src/likely_subtags_value_data.cpp diff --git a/frameworks/resmgr_lite/src/locale_matcher.cpp b/frameworks/resource_management_lite/src/locale_matcher.cpp similarity index 100% rename from frameworks/resmgr_lite/src/locale_matcher.cpp rename to frameworks/resource_management_lite/src/locale_matcher.cpp diff --git a/frameworks/resmgr_lite/src/lock.cpp b/frameworks/resource_management_lite/src/lock.cpp similarity index 100% rename from frameworks/resmgr_lite/src/lock.cpp rename to frameworks/resource_management_lite/src/lock.cpp diff --git a/frameworks/resmgr_lite/src/res_config_impl.cpp b/frameworks/resource_management_lite/src/res_config_impl.cpp similarity index 100% rename from frameworks/resmgr_lite/src/res_config_impl.cpp rename to frameworks/resource_management_lite/src/res_config_impl.cpp diff --git a/frameworks/resmgr_lite/src/res_desc.cpp b/frameworks/resource_management_lite/src/res_desc.cpp similarity index 100% rename from frameworks/resmgr_lite/src/res_desc.cpp rename to frameworks/resource_management_lite/src/res_desc.cpp diff --git a/frameworks/resmgr_lite/src/res_locale.cpp b/frameworks/resource_management_lite/src/res_locale.cpp similarity index 100% rename from frameworks/resmgr_lite/src/res_locale.cpp rename to frameworks/resource_management_lite/src/res_locale.cpp diff --git a/frameworks/resmgr_lite/src/resource_manager_impl.cpp b/frameworks/resource_management_lite/src/resource_manager_impl.cpp similarity index 100% rename from frameworks/resmgr_lite/src/resource_manager_impl.cpp rename to frameworks/resource_management_lite/src/resource_manager_impl.cpp diff --git a/frameworks/resmgr_lite/src/utils/hap_parser.cpp b/frameworks/resource_management_lite/src/utils/hap_parser.cpp similarity index 100% rename from frameworks/resmgr_lite/src/utils/hap_parser.cpp rename to frameworks/resource_management_lite/src/utils/hap_parser.cpp diff --git a/frameworks/resmgr_lite/src/utils/string_utils.cpp b/frameworks/resource_management_lite/src/utils/string_utils.cpp similarity index 100% rename from frameworks/resmgr_lite/src/utils/string_utils.cpp rename to frameworks/resource_management_lite/src/utils/string_utils.cpp diff --git a/frameworks/resmgr_lite/src/utils/utils.cpp b/frameworks/resource_management_lite/src/utils/utils.cpp similarity index 100% rename from frameworks/resmgr_lite/src/utils/utils.cpp rename to frameworks/resource_management_lite/src/utils/utils.cpp diff --git a/frameworks/resmgr_lite/test/BUILD.gn b/frameworks/resource_management_lite/test/BUILD.gn similarity index 86% rename from frameworks/resmgr_lite/test/BUILD.gn rename to frameworks/resource_management_lite/test/BUILD.gn index 3c66b4d..6f07ed7 100644 --- a/frameworks/resmgr_lite/test/BUILD.gn +++ b/frameworks/resource_management_lite/test/BUILD.gn @@ -35,12 +35,12 @@ if (ohos_kernel_type == "liteos_a") { include_dirs = [ "unittest/lite/common", - "//base/global/resmgr_lite/frameworks/resmgr_lite/include", - "//base/global/resmgr_lite/interfaces/innerkits/include", + "//base/global/resource_management_lite/frameworks/resource_management_lite/include", + "//base/global/resource_management_lite/interfaces/innerkits/include", "//base/global/i18n_lite/interfaces/kits/i18n/include/", ] - deps = [ "//base/global/resmgr_lite/frameworks/resmgr_lite:global_resmgr" ] + deps = [ "//base/global/resource_management_lite/frameworks/resource_management_lite:global_resmgr" ] output_dir = "$root_out_dir/test/unittest/global" } diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/global_test.cpp b/frameworks/resource_management_lite/test/unittest/lite/common/global_test.cpp similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/global_test.cpp rename to frameworks/resource_management_lite/test/unittest/lite/common/global_test.cpp diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/global_test.h b/frameworks/resource_management_lite/test/unittest/lite/common/global_test.h similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/global_test.h rename to frameworks/resource_management_lite/test/unittest/lite/common/global_test.h diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/hap_manager_test.cpp b/frameworks/resource_management_lite/test/unittest/lite/common/hap_manager_test.cpp similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/hap_manager_test.cpp rename to frameworks/resource_management_lite/test/unittest/lite/common/hap_manager_test.cpp diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/hap_manager_test.h b/frameworks/resource_management_lite/test/unittest/lite/common/hap_manager_test.h similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/hap_manager_test.h rename to frameworks/resource_management_lite/test/unittest/lite/common/hap_manager_test.h diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/hap_parser_test.cpp b/frameworks/resource_management_lite/test/unittest/lite/common/hap_parser_test.cpp similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/hap_parser_test.cpp rename to frameworks/resource_management_lite/test/unittest/lite/common/hap_parser_test.cpp diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/hap_parser_test.h b/frameworks/resource_management_lite/test/unittest/lite/common/hap_parser_test.h similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/hap_parser_test.h rename to frameworks/resource_management_lite/test/unittest/lite/common/hap_parser_test.h diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/hap_resource_test.cpp b/frameworks/resource_management_lite/test/unittest/lite/common/hap_resource_test.cpp similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/hap_resource_test.cpp rename to frameworks/resource_management_lite/test/unittest/lite/common/hap_resource_test.cpp diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/hap_resource_test.h b/frameworks/resource_management_lite/test/unittest/lite/common/hap_resource_test.h similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/hap_resource_test.h rename to frameworks/resource_management_lite/test/unittest/lite/common/hap_resource_test.h diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/locale_info_test.cpp b/frameworks/resource_management_lite/test/unittest/lite/common/locale_info_test.cpp similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/locale_info_test.cpp rename to frameworks/resource_management_lite/test/unittest/lite/common/locale_info_test.cpp diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/locale_info_test.h b/frameworks/resource_management_lite/test/unittest/lite/common/locale_info_test.h similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/locale_info_test.h rename to frameworks/resource_management_lite/test/unittest/lite/common/locale_info_test.h diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/res_config_impl_test.cpp b/frameworks/resource_management_lite/test/unittest/lite/common/res_config_impl_test.cpp similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/res_config_impl_test.cpp rename to frameworks/resource_management_lite/test/unittest/lite/common/res_config_impl_test.cpp diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/res_config_impl_test.h b/frameworks/resource_management_lite/test/unittest/lite/common/res_config_impl_test.h similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/res_config_impl_test.h rename to frameworks/resource_management_lite/test/unittest/lite/common/res_config_impl_test.h diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/res_config_test.cpp b/frameworks/resource_management_lite/test/unittest/lite/common/res_config_test.cpp similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/res_config_test.cpp rename to frameworks/resource_management_lite/test/unittest/lite/common/res_config_test.cpp diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/res_config_test.h b/frameworks/resource_management_lite/test/unittest/lite/common/res_config_test.h similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/res_config_test.h rename to frameworks/resource_management_lite/test/unittest/lite/common/res_config_test.h diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/res_desc_test.cpp b/frameworks/resource_management_lite/test/unittest/lite/common/res_desc_test.cpp similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/res_desc_test.cpp rename to frameworks/resource_management_lite/test/unittest/lite/common/res_desc_test.cpp diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/res_desc_test.h b/frameworks/resource_management_lite/test/unittest/lite/common/res_desc_test.h similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/res_desc_test.h rename to frameworks/resource_management_lite/test/unittest/lite/common/res_desc_test.h diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/resource_manager_performance_test.cpp b/frameworks/resource_management_lite/test/unittest/lite/common/resource_manager_performance_test.cpp similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/resource_manager_performance_test.cpp rename to frameworks/resource_management_lite/test/unittest/lite/common/resource_manager_performance_test.cpp diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/resource_manager_performance_test.h b/frameworks/resource_management_lite/test/unittest/lite/common/resource_manager_performance_test.h similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/resource_manager_performance_test.h rename to frameworks/resource_management_lite/test/unittest/lite/common/resource_manager_performance_test.h diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/resource_manager_test.cpp b/frameworks/resource_management_lite/test/unittest/lite/common/resource_manager_test.cpp similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/resource_manager_test.cpp rename to frameworks/resource_management_lite/test/unittest/lite/common/resource_manager_test.cpp diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/resource_manager_test.h b/frameworks/resource_management_lite/test/unittest/lite/common/resource_manager_test.h similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/resource_manager_test.h rename to frameworks/resource_management_lite/test/unittest/lite/common/resource_manager_test.h diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/string_utils_test.cpp b/frameworks/resource_management_lite/test/unittest/lite/common/string_utils_test.cpp similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/string_utils_test.cpp rename to frameworks/resource_management_lite/test/unittest/lite/common/string_utils_test.cpp diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/string_utils_test.h b/frameworks/resource_management_lite/test/unittest/lite/common/string_utils_test.h similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/string_utils_test.h rename to frameworks/resource_management_lite/test/unittest/lite/common/string_utils_test.h diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/test_common.cpp b/frameworks/resource_management_lite/test/unittest/lite/common/test_common.cpp similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/test_common.cpp rename to frameworks/resource_management_lite/test/unittest/lite/common/test_common.cpp diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/test_common.h b/frameworks/resource_management_lite/test/unittest/lite/common/test_common.h similarity index 100% rename from frameworks/resmgr_lite/test/unittest/lite/common/test_common.h rename to frameworks/resource_management_lite/test/unittest/lite/common/test_common.h -- Gitee