openharmony/global_resmgr_standard
1
0
Fork 0
mirror of https://github.com/openharmony/global_resmgr_standard.git synced 2026-07-01 22:44:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

!144 资源resource_management部件名修改

Browse Source 
Merge pull request !144 from maoziduanl/master
This commit is contained in:
openharmony_ci
2022-05-05 07:34:26 +00:00
committed by Gitee
parent 0b68fd4459 a8aba436ad
commit 7743a83c18
8 changed files with 56 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -16,7 +16,7 @@ The directory structure of the Resmgr module is as follows:
```
/base/global/
├── resmgr_standard # Code repository for the Resmgr module
├── resource_management # Code repository for the Resmgr module
│ ├── frameworks # Core code
│ │ ├── resmgr # Resource parsing code
│ │ │ ├── include # Header files
README_zh.md
+1 -1
View File
@@ -16,7 +16,7 @@
```
/base/global/
├── resmgr_standard # 资源管理代码仓
├── resource_management # 资源管理代码仓
│ ├── frameworks # 资源管理核心代码
│ │ ├── resmgr # 资源解析核心代码
│ │ │ ├── include # 资源管理头文件
bundle.json
+15 -15
View File
@@ -1,10 +1,10 @@
{
"name": "@ohos/global_resmgr_standard",
"name": "@ohos/global_resource_management",
"version": "",
"description": "根据当前configuration（语言，区域，横竖屏，mccmnc）和device capability（设备类型，分辨率）获取应用资源信息读取接口",
"homePage": "https://gitee.com/openharmony",
"license": "Apache V2",
"repository": "https://gitee.com/openharmony/global_resmgr_standard",
"repository": "https://gitee.com/openharmony/global_resource_management",
"domain": "os",
"language": "",
"publishAs": "code-segment",
@@ -33,13 +33,13 @@
}
],
"segment": {
"destPath": "base/global/resmgr_standard"
"destPath": "base/global/resource_management"
},
"component": {
"name": "resmgr_standard",
"name": "resource_management",
"subsystem": "global",
"syscap": [ "SystemCapability.Global.ResourceManager" ],
"features": ["resmgr_standard_support_icu"],
"features": ["resource_management_support_icu"],
"adapted_system_type": [
"standard"
],
@@ -54,16 +54,16 @@
},
"build": {
"sub_component": [
"//base/global/resmgr_standard/interfaces/js/kits:resourcemanager",
"//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
"//base/global/resmgr_standard/frameworks/resmgr:librawfile",
"//base/global/resmgr_standard/frameworks/resmgr:win_resmgr",
"//base/global/resmgr_standard/frameworks/resmgr:mac_resmgr"
"//base/global/resource_management/interfaces/js/kits:resourcemanager",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//base/global/resource_management/frameworks/resmgr:librawfile",
"//base/global/resource_management/frameworks/resmgr:win_resmgr",
"//base/global/resource_management/frameworks/resmgr:mac_resmgr"
],
"inner_kits": [
{
"header": {
"header_base": "//base/global/resmgr_standard/interfaces/innerkits/include/",
"header_base": "//base/global/resource_management/interfaces/innerkits/include/",
"header_files": [
"res_common.h",
"res_config.h",
@@ -71,20 +71,20 @@
"rstate.h"
]
},
"name": "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr"
"name": "//base/global/resource_management/frameworks/resmgr:global_resmgr"
},
{
"header": {
"header_base": "//base/global/resmgr_standard/interfaces/js/innerkits/core/include/",
"header_base": "//base/global/resource_management/interfaces/js/innerkits/core/include/",
"header_files": [
"resource_manager_addon.h"
]
},
"name": "//base/global/resmgr_standard/interfaces/js/innerkits/core:resmgr_napi_core"
"name": "//base/global/resource_management/interfaces/js/innerkits/core:resmgr_napi_core"
}
],
"test": [
"//base/global/resmgr_standard/frameworks/resmgr/test:unittest"
"//base/global/resource_management/frameworks/resmgr/test:unittest"
]
}
}
frameworks/resmgr/BUILD.gn
+23 -25
View File
@@ -11,18 +11,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/global/resmgr_standard/resmgr.gni")
import("//base/global/resource_management/resmgr.gni")
import("//build/ohos.gni")
config("resmgr_config") {
include_dirs = [
"include",
"//third_party/zlib/contrib/minizip",
"//base/global/resmgr_standard/interfaces/innerkits/include",
"//base/global/resource_management/interfaces/innerkits/include",
"//third_party/bounds_checking_function/include",
]
if (resmgr_standard_support_icu) {
if (resource_management_support_icu) {
include_dirs += [
"//third_party/icu/icu4c/source",
"//third_party/icu/icu4c/source/common",
@@ -50,9 +50,9 @@ config("resmgr_public_config") {
visibility = [ ":*" ]
include_dirs =
[ "//base/global/resmgr_standard/interfaces/innerkits/include" ]
[ "//base/global/resource_management/interfaces/innerkits/include" ]
if (resmgr_standard_support_icu) {
if (resource_management_support_icu) {
include_dirs += [ "//third_party/icu/icu4c/source/common" ]
defines = [ "SUPPORT_GRAPHICS" ]
}
@@ -72,7 +72,7 @@ ohos_shared_library("global_resmgr") {
"//third_party/zlib:libz",
]
if (resmgr_standard_support_icu) {
if (resource_management_support_icu) {
deps += [
"//third_party/icu/icu4c:shared_icui18n",
"//third_party/icu/icu4c:shared_icuuc",
@@ -86,11 +86,11 @@ ohos_shared_library("global_resmgr") {
]
subsystem_name = "global"
part_name = "resmgr_standard"
part_name = "resource_management"
}
ohos_shared_library("global_resmgr_win") {
if (resmgr_standard_support_icu) {
if (resource_management_support_icu) {
defines = [
"__WINNT__",
"__EXPORT_MGR__",
@@ -116,11 +116,11 @@ ohos_shared_library("global_resmgr_win") {
libs = [ "shlwapi" ]
}
subsystem_name = "global"
part_name = "resmgr_standard"
part_name = "resource_management"
}
group("win_resmgr") {
if (resmgr_standard_support_icu) {
if (resource_management_support_icu) {
if (host_os != "mac") {
deps = [ ":global_resmgr_win(//build/toolchain/mingw:mingw_x86_64)" ]
}
@@ -128,7 +128,7 @@ group("win_resmgr") {
}
ohos_shared_library("global_resmgr_mac") {
if (resmgr_standard_support_icu) {
if (resource_management_support_icu) {
defines = [ "__IDE_PREVIEW__" ]
cflags = [
"-std=c++17",
@@ -151,11 +151,11 @@ ohos_shared_library("global_resmgr_mac") {
}
}
subsystem_name = "global"
part_name = "resmgr_standard"
part_name = "resource_management"
}
group("mac_resmgr") {
if (resmgr_standard_support_icu) {
if (resource_management_support_icu) {
if (host_os == "mac") {
deps = [ ":global_resmgr_mac(//build/toolchain/mac:clang_x64)" ]
}
@@ -167,25 +167,23 @@ ohos_shared_library("librawfile") {
sources = [ "src/raw_file_manager.cpp" ]
include_dirs = [
"//base/global/resmgr_standard/frameworks/resmgr/include",
"//base/global/resmgr_standard/interfaces/native/resource/include",
"//base/global/resmgr_standard/interfaces/innerkits/include",
"//base/global/resmgr_standard/interfaces/js/innerkits/core/include",
"//base/global/resource_management/frameworks/resmgr/include",
"//base/global/resource_management/interfaces/native/resource/include",
"//base/global/resource_management/interfaces/innerkits/include",
"//base/global/resource_management/interfaces/js/innerkits/core/include",
"//third_party/node/src",
]
if (resmgr_standard_support_icu) {
if (resource_management_support_icu) {
include_dirs += [ "//third_party/icu/icu4c/source/i18n" ]
}
cflags = [ "-Wno-error=inconsistent-missing-override" ]
deps = [
"//base/global/resmgr_standard/interfaces/native/resource:librawfile_ndk",
]
deps = [ "//base/global/resource_management/interfaces/native/resource:librawfile_ndk" ]
public_deps = [
"//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/arkui/napi:ace_napi",
]
@@ -196,11 +194,11 @@ ohos_shared_library("librawfile") {
]
version_script = get_label_info(
"//base/global/resmgr_standard/interfaces/native/resource:librawfile_ndk",
"//base/global/resource_management/interfaces/native/resource:librawfile_ndk",
"target_gen_dir") + "/" + get_label_info(
"//base/global/resmgr_standard/interfaces/native/resource:librawfile_ndk",
"//base/global/resource_management/interfaces/native/resource:librawfile_ndk",
"name") + version_script_suffix
subsystem_name = "global"
part_name = "resmgr_standard"
part_name = "resource_management"
}
frameworks/resmgr/test/BUILD.gn
+7 -7
View File
@@ -11,11 +11,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/global/resmgr_standard/resmgr.gni")
import("//base/global/resource_management/resmgr.gni")
import("//build/test.gni")
ohos_unittest("resmgr_test") {
module_out_path = "resmgr_standard/test"
module_out_path = "resource_management/test"
defines = [ "CONFIG_HILOG" ]
@@ -35,11 +35,11 @@ ohos_unittest("resmgr_test") {
include_dirs = [
"unittest/common",
"//base/global/resmgr_standard/frameworks/resmgr/include",
"//base/global/resmgr_standard/interfaces/innerkits/include",
"//base/global/resource_management/frameworks/resmgr/include",
"//base/global/resource_management/interfaces/innerkits/include",
]
if (resmgr_standard_support_icu) {
if (resource_management_support_icu) {
include_dirs += [
"//third_party/icu/icu4c/source",
"//third_party/icu/icu4c/source/common",
@@ -49,13 +49,13 @@ ohos_unittest("resmgr_test") {
}
deps = [
"//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//third_party/googletest:gtest_main",
]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
resource_config_file =
"//base/global/resmgr_standard/test/resource/ohos_test.xml"
"//base/global/resource_management/test/resource/ohos_test.xml"
}
group("unittest") {
interfaces/js/innerkits/core/BUILD.gn
+4 -4
View File
@@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/global/resmgr_standard/resmgr.gni")
import("//base/global/resource_management/resmgr.gni")
import("//build/ohos.gni")
config("resmgr_napi_core_public_config") {
@@ -26,7 +26,7 @@ ohos_shared_library("resmgr_napi_core") {
public_configs = [ ":resmgr_napi_core_public_config" ]
public_deps = [
"//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//foundation/arkui/napi:ace_napi",
]
@@ -35,10 +35,10 @@ ohos_shared_library("resmgr_napi_core") {
"ipc:ipc_core",
]
if (resmgr_standard_support_icu) {
if (resource_management_support_icu) {
defines = [ "SUPPORT_GRAPHICS" ]
}
subsystem_name = "global"
part_name = "resmgr_standard"
part_name = "resource_management"
}
interfaces/js/kits/BUILD.gn
+4 -4
View File
@@ -15,7 +15,7 @@ import("//build/ohos.gni")
ohos_shared_library("resourcemanager") {
include_dirs = [
"//base/global/resmgr_standard/interfaces/innerkits/include",
"//base/global/resource_management/interfaces/innerkits/include",
"//base/hiviewdfx/interfaces/native/innerkits/include",
"//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context",
"//third_party/node/src",
@@ -24,7 +24,7 @@ ohos_shared_library("resourcemanager") {
sources = [ "src/resource_manager_napi.cpp" ]
public_deps = [
"//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
"//base/global/resource_management/frameworks/resmgr:global_resmgr",
"//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
"//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
"//foundation/arkui/napi:ace_napi",
@@ -38,10 +38,10 @@ ohos_shared_library("resourcemanager") {
"eventhandler:libeventhandler",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"resmgr_standard:resmgr_napi_core",
"resource_management:resmgr_napi_core",
]
relative_install_dir = "module"
subsystem_name = "global"
part_name = "resmgr_standard"
part_name = "resource_management"
}
resmgr.gni
+1 -1
View File
@@ -12,5 +12,5 @@
# limitations under the License.
declare_args() {
resmgr_standard_support_icu = true
resource_management_support_icu = true
}