From ba7b323c3efdda04204e2a5859eb1f6ef70f4ce5 Mon Sep 17 00:00:00 2001 From: Liu Linyan Date: Wed, 8 Nov 2023 09:57:57 +0800 Subject: [PATCH] fix(ble_mesh): Use submodule for mesh 1.1 lib files --- .gitlab/ci/rules.yml | 1 + .gitmodules | 4 ++++ components/bt/CMakeLists.txt | 24 +++++++++---------- .../bt/esp_ble_mesh/{v1.1 => lib}/ext.c | 0 .../{v1.1 => lib}/include/mesh_v1.1/utils.h | 0 components/bt/esp_ble_mesh/lib/lib | 1 + tools/ci/astyle-rules.yml | 1 + 7 files changed, 19 insertions(+), 12 deletions(-) rename components/bt/esp_ble_mesh/{v1.1 => lib}/ext.c (100%) rename components/bt/esp_ble_mesh/{v1.1 => lib}/include/mesh_v1.1/utils.h (100%) create mode 160000 components/bt/esp_ble_mesh/lib/lib diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 9202f59ddc..d4c15755bf 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -197,6 +197,7 @@ - "components/unity/unity" - "components/heap/tlsf" - "components/bt/controller/lib_esp32c6/esp32c6-bt-lib" + - "components/bt/esp_ble_mesh/lib/lib" - ".gitmodules" .patterns-danger-npm: &patterns-danger-npm diff --git a/.gitmodules b/.gitmodules index e944b5da37..7f360584a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -143,3 +143,7 @@ [submodule "components/esp_coex/lib"] path = components/esp_coex/lib url = ../../espressif/esp-coex-lib.git + +[submodule "components/bt/esp_ble_mesh/lib/lib"] + path = components/bt/esp_ble_mesh/lib/lib + url = ../../espressif/esp-ble-mesh-lib.git diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index 80395ed029..a1a02cb41a 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -45,10 +45,10 @@ set(ble_mesh_include_dirs "esp_ble_mesh/api/core/include" "esp_ble_mesh/api/models/include" "esp_ble_mesh/api" + "esp_ble_mesh/lib/include" "esp_ble_mesh/v1.1/api/core/include" "esp_ble_mesh/v1.1/api/models/include" "esp_ble_mesh/v1.1/btc/include" - "esp_ble_mesh/v1.1/include" ) set(bluedroid_include_dirs host/bluedroid/api/include/api) @@ -550,7 +550,7 @@ if(CONFIG_BT_ENABLED) "esp_ble_mesh/v1.1/btc/btc_ble_mesh_rpr_model.c" "esp_ble_mesh/v1.1/btc/btc_ble_mesh_sar_model.c" "esp_ble_mesh/v1.1/btc/btc_ble_mesh_srpl_model.c" - "esp_ble_mesh/v1.1/ext.c") + "esp_ble_mesh/lib/ext.c") if(CONFIG_BLE_MESH_SAR_ENHANCEMENT) list(APPEND srcs "esp_ble_mesh/core/transport.enh.c") @@ -826,20 +826,20 @@ endif() if(CONFIG_BLE_MESH) if(CONFIG_IDF_TARGET_ESP32) - add_prebuilt_library(mesh_v11 "esp_ble_mesh/v1.1/lib/esp32/libmesh_v1.1.a") - target_link_libraries(${COMPONENT_LIB} PRIVATE mesh_v11) + add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/esp32/libble_mesh.a") + target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh) elseif(CONFIG_IDF_TARGET_ESP32S3) - add_prebuilt_library(mesh_v11 "esp_ble_mesh/v1.1/lib/esp32s3/libmesh_v1.1.a") - target_link_libraries(${COMPONENT_LIB} PRIVATE mesh_v11) + add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/esp32s3/libble_mesh.a") + target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh) elseif(CONFIG_IDF_TARGET_ESP32C3) - add_prebuilt_library(mesh_v11 "esp_ble_mesh/v1.1/lib/esp32c3/libmesh_v1.1.a") - target_link_libraries(${COMPONENT_LIB} PRIVATE mesh_v11) + add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/esp32c3/libble_mesh.a") + target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh) elseif(CONFIG_IDF_TARGET_ESP32C6) - add_prebuilt_library(mesh_v11 "esp_ble_mesh/v1.1/lib/esp32c6/libmesh_v1.1.a") - target_link_libraries(${COMPONENT_LIB} PRIVATE mesh_v11) + add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/esp32c6/libble_mesh.a") + target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh) elseif(CONFIG_IDF_TARGET_ESP32H2) - add_prebuilt_library(mesh_v11 "esp_ble_mesh/v1.1/lib/esp32h2/libmesh_v1.1.a") - target_link_libraries(${COMPONENT_LIB} PRIVATE mesh_v11) + add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/esp32h2/libble_mesh.a") + target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh) endif() endif() diff --git a/components/bt/esp_ble_mesh/v1.1/ext.c b/components/bt/esp_ble_mesh/lib/ext.c similarity index 100% rename from components/bt/esp_ble_mesh/v1.1/ext.c rename to components/bt/esp_ble_mesh/lib/ext.c diff --git a/components/bt/esp_ble_mesh/v1.1/include/mesh_v1.1/utils.h b/components/bt/esp_ble_mesh/lib/include/mesh_v1.1/utils.h similarity index 100% rename from components/bt/esp_ble_mesh/v1.1/include/mesh_v1.1/utils.h rename to components/bt/esp_ble_mesh/lib/include/mesh_v1.1/utils.h diff --git a/components/bt/esp_ble_mesh/lib/lib b/components/bt/esp_ble_mesh/lib/lib new file mode 160000 index 0000000000..73b3b96db9 --- /dev/null +++ b/components/bt/esp_ble_mesh/lib/lib @@ -0,0 +1 @@ +Subproject commit 73b3b96db91d170d96e0f3e901a47f51e749e75b diff --git a/tools/ci/astyle-rules.yml b/tools/ci/astyle-rules.yml index 98ff84a0f6..ba24f97d86 100644 --- a/tools/ci/astyle-rules.yml +++ b/tools/ci/astyle-rules.yml @@ -14,6 +14,7 @@ submodules: - "/components/bt/controller/lib_esp32c6/esp32c6-bt-lib/" - "/components/bt/controller/lib_esp32h2/esp32h2-bt-lib/" - "/components/bt/host/nimble/nimble/" + - "/components/bt/esp_ble_mesh/lib/lib/" - "/components/cmock/CMock/" - "/components/esp_coex/lib/" - "/components/esp_phy/lib/"