diff --git a/modbus/BUILD.gn b/modbus/BUILD.gn
index 7c89fc001df289eb7baf5d9b571b92588dd743a5..8573b1f4b2b79eb96c108f7bc0fe54bafbeda3c8 100755
--- a/modbus/BUILD.gn
+++ b/modbus/BUILD.gn
@@ -4,13 +4,13 @@
import("//build/ohos.gni")
-modbus_path = "//third_party/modbus"
modbus_part_name = "modbus"
modbus_subsystem_name = "thirdparty"
modbus_includes = [
- "${modbus_path}",
- "${modbus_path}/src",
+ "adapted/src",
+ "libmodbus",
+ "libmodbus/src",
]
config("modbus_config") {
@@ -33,10 +33,10 @@ ohos_shared_library("modbus") {
install_enable = true
include_dirs = modbus_includes
sources = [
- "${modbus_path}/src/modbus-data.c",
- "${modbus_path}/src/modbus-rtu.c",
- "${modbus_path}/src/modbus-tcp.c",
- "${modbus_path}/src/modbus.c",
+ "libmodbus/src/modbus-data.c",
+ "libmodbus/src/modbus-rtu.c",
+ "libmodbus/src/modbus-tcp.c",
+ "libmodbus/src/modbus.c",
]
configs = [ ":modbus_config" ]
part_name = "${modbus_part_name}"
@@ -46,7 +46,10 @@ ohos_shared_library("modbus") {
template("swanlink_modbus_test") {
ohos_executable(target_name) {
use_exceptions = true
- include_dirs = [ "tests" ]
+ include_dirs = [
+ "libmodbus/tests",
+ "adapted/tests",
+ ]
include_dirs += modbus_includes
deps = [ ":modbus" ]
configs = [ ":modbus_config" ]
@@ -57,31 +60,31 @@ template("swanlink_modbus_test") {
}
swanlink_modbus_test("unit-test-client") {
- sources = [ "tests/unit-test-client.c" ]
+ sources = [ "libmodbus/tests/unit-test-client.c" ]
}
swanlink_modbus_test("unit-test-server") {
- sources = [ "tests/unit-test-server.c" ]
+ sources = [ "libmodbus/tests/unit-test-server.c" ]
}
swanlink_modbus_test("random-test-client") {
- sources = [ "tests/random-test-client.c" ]
+ sources = [ "libmodbus/tests/random-test-client.c" ]
}
swanlink_modbus_test("random-test-server") {
- sources = [ "tests/random-test-server.c" ]
+ sources = [ "libmodbus/tests/random-test-server.c" ]
}
swanlink_modbus_test("bandwidth-client") {
- sources = [ "tests/bandwidth-client.c" ]
+ sources = [ "libmodbus/tests/bandwidth-client.c" ]
}
swanlink_modbus_test("bandwidth-server-one") {
- sources = [ "tests/bandwidth-server-one.c" ]
+ sources = [ "libmodbus/tests/bandwidth-server-one.c" ]
}
swanlink_modbus_test("bandwidth-server-many-up") {
- sources = [ "tests/bandwidth-server-many-up.c" ]
+ sources = [ "libmodbus/tests/bandwidth-server-many-up.c" ]
}
group("modbus_tests") {
@@ -95,3 +98,14 @@ group("modbus_tests") {
":bandwidth-server-many-up",
]
}
+
+declare_args() {
+ enable_modbus_test = false
+}
+
+group("libmodbus") {
+ deps = [ ":modbus" ]
+ if (enable_modbus_test) {
+ deps += [ ":modbus_tests" ]
+ }
+}
\ No newline at end of file
diff --git a/modbus/bundle.json b/modbus/bundle.json
index fc41954f69975f6b1a4f961c50fab1d90b192874..46c36a44aeb181dd5ec66c6b87696e279eb0ea22 100755
--- a/modbus/bundle.json
+++ b/modbus/bundle.json
@@ -23,7 +23,7 @@
},
"build": {
"sub_component": [
- "//third_party/modbus:modbus"
+ "//third_party/modbus:libmodbus"
],
"inner_kits": [],
"test": []
diff --git a/modbus/docs/rom_integrate.md b/modbus/docs/rom_integrate.md
index 36165d8cd02bac6b00df20a98586d2baa584937c..2997177bfe4f60b0a2c46ae84320458fc5a3925e 100755
--- a/modbus/docs/rom_integrate.md
+++ b/modbus/docs/rom_integrate.md
@@ -43,7 +43,7 @@
- 三方库源码下载
- modbus-3.1.10源码下载到modbus目录并将代码拷贝出来。
+ modbus-3.1.10源码下载到modbus目录。
```shell
cd ~/OpenHarmony/third_party/modbus
@@ -54,7 +54,7 @@
准备完三方库代码后,我们需要将三方库加入到编译构建体系中。标准系统编译构建可以参考文档[编译构建指导](https://gitee.com/openharmony/docs/blob/OpenHarmony-3.2-Beta4/zh-cn/device-dev/subsystems/subsys-build-all.md)。
我们默认三方库是属于OpenHarmony的thirdparty子系统,如果需要自己定义子系统参考文档[如何为三方库组件中添加一个三方库](https://gitee.com/openharmony-sig/knowledge/blob/master/docs/openharmony_getstarted/port_thirdparty/README.md)。
-新增需要编译的组件,在OpenHarmony源码的vendor/hihope/rk3568/config.json文件中,新增需要编译的组件,如下代码段所示,在thirdparty子系统下面新增modbus组件
+新增需要编译的组件,在OpenHarmony源码的productdefine/common/inherit/rich.json文件中,新增需要编译的组件,如下代码段所示,在thirdparty子系统下面新增modbus组件
```json
{
@@ -74,7 +74,7 @@
## 系统Rom中引入三方库测试程序
-如果需要编译测试用例,在OpenHarmony源码的vendor/hihope/rk3568/config.json文件,在对应组件的features中打开编译选项,如下
+如果需要编译测试用例,在OpenHarmony源码的productdefine/common/inherit/rich.json文件,在对应组件的features中打开编译选项,如下
```json
{
@@ -86,7 +86,7 @@
},
{
"component": "modbus",
- "features": []
+ "features": [ "enable_modbus_test=true" ]
}
]
}