[azure-iot-sdk-c] LTS release 2022-01-21 (#22696)

* [azure-iot-sdk-c] LTS release 2022-01-21

* bot instructions

* bot 2 instructions

* Update patches per cmake changes

* bot instructions fix

* update version

* bot instructions

Co-authored-by: Mollie Munoz <momuno@microsoft.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
This commit is contained in:
Mollie Munoz 2022-01-26 12:06:01 -08:00 committed by GitHub
parent f1dfd6581c
commit c76e5f092a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 174 additions and 120 deletions

View File

@ -0,0 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index deeaae7d..c0c84275 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -675,7 +675,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
set(CMAKE_INSTALL_LIBDIR "lib")
endif()
-set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+set(package_location "cmake")
if(${build_as_dynamic})
set(targets aziotsharedutil aziotsharedutil_dll)
@@ -689,7 +689,7 @@ install (TARGETS ${targets} EXPORT aziotsharedutilTargets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot
)
-install (FILES ${source_h_files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azure_c_shared_utility)
+install (FILES ${source_h_files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot/azure_c_shared_utility)
install (FILES ${micromock_h_files_full_path} ${INSTALL_H_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot)

View File

@ -8,6 +8,7 @@ if("public-preview" IN_LIST FEATURES)
SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789
HEAD_REF master
PATCHES
fix-install-location.patch
fix-utilityFunctions-conditions-preview.patch
disable-error.patch
)
@ -15,10 +16,11 @@ else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-c-shared-utility
REF 73a2039cc0de5ececf5755ebe731a6b5b98f85da
SHA512 6374b7b175a5c0206bee148c35eb6a3a79f1b149e87d2b51981a9fd1446809134a1aa0f28f4acf1318719ac5554f7bd8de225a5dca63eb6537012aed6b10e4cc
REF 1a27846886a74702d409a8f0e2d77a38163cefc7
SHA512 c30cba73692691fe1310b6180e3aeaf4d86b6276981c680cac31d605634e5dedbce3f823142dfebba4ae2f76ccead965a527d95df0e52af638a30ddec9818fbd
HEAD_REF master
PATCHES
fix-install-location.patch
fix-utilityFunctions-conditions.patch
disable-error.patch
)

View File

@ -1,7 +1,6 @@
{
"name": "azure-c-shared-utility",
"version-date": "2021-09-09",
"port-version": 1,
"version-date": "2022-01-21",
"description": "Azure C SDKs common code",
"homepage": "https://github.com/Azure/azure-c-shared-utility",
"supports": "!uwp",

View File

@ -1,8 +1,21 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b72bd41ed..02d964fc6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -388,7 +387,7 @@ endif()
########## Add install components ##########
if (${use_installed_dependencies})
# Install azure_iot_sdks
- set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+ set(package_location "cmake")
include(CMakePackageConfigHelpers)
diff --git a/provisioning_client/CMakeLists.txt b/provisioning_client/CMakeLists.txt
index c39188dca..d4ef43cb3 100644
index 39f269d51..ff53ca32d 100644
--- a/provisioning_client/CMakeLists.txt
+++ b/provisioning_client/CMakeLists.txt
@@ -359,7 +359,7 @@ if(${use_installed_dependencies})
@@ -357,7 +357,7 @@ if(${use_installed_dependencies})
set(CMAKE_INSTALL_LIBDIR "lib")
endif()
@ -10,8 +23,8 @@ index c39188dca..d4ef43cb3 100644
+ install(TARGETS ${provisioning_libs} EXPORT azure_iot_sdksTargets
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/../bin
@@ -374,26 +374,6 @@ if(${use_installed_dependencies})
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -372,26 +372,6 @@ if(${use_installed_dependencies})
VERSION ${PROV_SDK_VERSION}
COMPATIBILITY SameMajorVersion
)

View File

@ -1,25 +1,3 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8011fb..9fc05c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,17 +155,6 @@ endif()
# Use solution folders.
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-# build the parson library for json parsing
-add_library(parson
- ./deps/parson/parson.c
- ./deps/parson/parson.h
-)
-if (MSVC)
- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232")
-endif()
-set(parson_h_install_files ./deps/parson/parson.h)
-set(parson_install_libs parson)
-
if (IN_OPENWRT)
ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake
index b9c62e8..edf5847 100644
--- a/configs/azure_iot_sdksConfig.cmake
@ -35,48 +13,16 @@ index b9c62e8..edf5847 100644
include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake")
diff --git a/dependencies.cmake b/dependencies.cmake
index fd06df6..c0e06fa 100644
--- a/dependencies.cmake
+++ b/dependencies.cmake
@@ -18,6 +18,9 @@ if(${use_installed_dependencies})
endif ()
endif ()
+ find_package(unofficial-parson REQUIRED)
+ link_libraries(unofficial::parson::parson)
+
else ()
add_subdirectory(c-utility)
diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
index 161872a..d53e111 100644
index 33b5b8709..45ef7b87a 100644
--- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
+++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files
@@ -22,11 +22,9 @@ set(${theseTestsName}_c_files
set(${theseTestsName}_c_files
../../../certs/certs.c
- ../../../deps/parson/parson.c
)
set(${theseTestsName}_h_files
../../../certs/certs.h
- ../../../deps/parson/parson.h
../common_dt_e2e/iothubclient_common_dt_e2e.h
)
diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt
index d472161..b0291e8 100644
--- a/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt
+++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt
@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files
set(${theseTestsName}_c_files
../../../certs/certs.c
- ../../../deps/parson/parson.c
)
set(${theseTestsName}_h_files
../../../certs/certs.h
- ../../../deps/parson/parson.h
@ -100,18 +46,25 @@ index d05d654..5872c8d 100644
../common_dt_e2e/iothubclient_common_dt_e2e.h
)
diff --git a/iothub_service_client/CMakeLists.txt b/iothub_service_client/CMakeLists.txt
index e47473e..b073513 100644
--- a/iothub_service_client/CMakeLists.txt
+++ b/iothub_service_client/CMakeLists.txt
@@ -81,9 +81,7 @@ endif()
setSdkTargetBuildProperties(iothub_service_client)
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index 22e24f851..7dc30beba 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -37,5 +37,4 @@ endif()
if(NOT ${use_installed_dependencies})
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/parson)
else()
- find_package(parson REQUIRED CONFIG)
endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b72bd41ed..b2812f1fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,7 +242,6 @@ endif()
if(NOT ${nuget_e2e_tests})
- target_link_libraries(iothub_service_client uamqp parson)
-else()
- target_link_libraries(iothub_service_client parson)
+ target_link_libraries(iothub_service_client uamqp)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/deps)
if(${use_installed_dependencies})
- find_package(parson REQUIRED CONFIG)
endif()
if (NOT ${ARCHITECTURE} STREQUAL "ARM")
include_directories(${MACRO_UTILS_INC_FOLDER})

View File

@ -8,20 +8,20 @@ if("public-preview" IN_LIST FEATURES)
SHA512 6798b17d6768b3ccbd0eb66719b50f364cd951736eb71110e2dc9deca054a1566ff88b9e8c5e9b52536e4308cad6cd3cbebff3282c123083e3afaee5535e724b
HEAD_REF public-preview
PATCHES
fix-install-location.patch
improve-external-deps.patch
fix-cmake.patch
remove-werror.patch
)
else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-iot-sdk-c
REF 808a5595f98853a5f2eae2c67dd9b3608a2338ea
SHA512 29cb04679b75a48a8a69713045465c7c416755764ec80781405c8528abd8225654c3262ed3816fb03a13f7505f6c811afbdc5dabc79b676b4f727feaf11e0583
REF 5805fb669ffe2adff021d68c62725d0bd783ac49
SHA512 8f1aa1020f3bb8b3e801f3977d11be50fd07d961c89ac921f795ef8a99312f12e1ddb2268ce3d2fb84b6a42bb5806cde410e6b51c7c4539a9a11a9ae512dbcd1
HEAD_REF master
PATCHES
fix-install-location.patch
improve-external-deps.patch
fix-cmake.patch
remove-werror.patch
)
endif()

View File

@ -1,18 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b72bd41ed..e916728a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,14 +34,11 @@
if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4232")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4232")
# Make warning as error
- add_definitions(/WX)
else()
# Make warning as error
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
@@ -123,11 +123,8 @@ if (${warnings_as_errors})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4232")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4232")
# Make warning as error
- add_definitions(/WX)
else()
# Make warning as error
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
endif()
endif()
IF(WIN32)
# windows needs this define
add_definitions(-D_CRT_SECURE_NO_WARNINGS)

View File

@ -1,6 +1,6 @@
{
"name": "azure-iot-sdk-c",
"version-date": "2021-09-09",
"version-date": "2022-01-21",
"description": "A C99 SDK for connecting devices to Microsoft Azure IoT services",
"homepage": "https://github.com/Azure/azure-iot-sdk-c",
"dependencies": [

View File

@ -1,7 +1,6 @@
{
"name": "azure-macro-utils-c",
"version-string": "2020-06-17",
"port-version": 3,
"version-date": "2022-01-21",
"description": "A library of macros for the Azure IoT SDK Suite",
"features": {
"public-preview": {

View File

@ -12,8 +12,8 @@ else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-uamqp-c
REF b75cdb7e1736a388fe3e9fc2a99493aa1db6f43f
SHA512 a13da2bc8a471329cbcd63aaa6fb94265388f709bf8977d55017a6cdd5af21e3b08935498ff8bfebfa63791dfa04552806684fae82b664045a12d14a91df3183
REF 85aae56beb717dddaf5512845de537d2926afb02
SHA512 3d9e7788c784169e6d1d9abd233e00a4c1e6525d67cbc25f8ba42292b6d66d0179a742833a0c00a3a0df6498bf88dc8b12a40c183e7141f7290cbb4eceb67dbe
HEAD_REF master
)
endif()

View File

@ -1,6 +1,6 @@
{
"name": "azure-uamqp-c",
"version-date": "2021-09-09",
"version-date": "2022-01-21",
"description": "AMQP library for C",
"homepage": "https://github.com/Azure/azure-uamqp-c",
"dependencies": [

View File

@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c63adc0..9ba6007 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,8 +145,8 @@ endif()
# Set CMAKE_INSTALL_LIBDIR if not defined
include(GNUInstallDirs)
-# Install umqtt
-set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+# Install uhttp
+set(package_location "cmake")
if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
set(CMAKE_INSTALL_LIBDIR "lib")

View File

@ -7,14 +7,18 @@ if("public-preview" IN_LIST FEATURES)
REF d84a20609a2b5a555920389451fb3c9a2ed3656c
SHA512 4eadd7e120082cc3bcf696d6cd16bc7ee8e1082380dd7583fba7fad1bb95109f3456890495e25ae7675e656ef721fa12eff22eeb96d8a4cf359be5c96889cbd6
HEAD_REF master
PATCHES
fix-install-location.patch
)
else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-uhttp-c
REF db8ac9c1353fe05cf6917e8ec8bcb866bf4a6f11
SHA512 4c9b053bcdc1086dbba6883a887e5af1f6aa4572bfb1e36c3b07c9bb93c35b188cb31f510fca5c4b2a0557df446dd965eafda993eab7c04b4502ed07b269c148
REF 1cc70f4d21ad69768cafb9551b1b512118fba995
SHA512 6604e82b347a1a4eb5072ab762fde7bd5ae9b32848a78da9103e0eb528b9ccd420a12dbc237dc0b5fe6db271d5cdcd24eedf1cde8ac058102fdd24c5a5a33f26
HEAD_REF master
PATCHES
fix-install-location.patch
)
endif()

View File

@ -1,6 +1,6 @@
{
"name": "azure-uhttp-c",
"version-date": "2021-09-09",
"version-date": "2022-01-21",
"description": "Azure HTTP Library written in C",
"homepage": "https://github.com/Azure/azure-uhttp-c",
"dependencies": [

View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0dcf186..1d9bc8a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,7 +155,7 @@ endif ()
include(GNUInstallDirs)
# Install umqtt
-set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+set(package_location "cmake")
if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
set(CMAKE_INSTALL_LIBDIR "lib")

View File

@ -7,14 +7,18 @@ if("public-preview" IN_LIST FEATURES)
REF 7557db6de094b67818d3c410dc95a3cf07cd86a6
SHA512 f2577379f711e2576fdd6dfecbc4d8a0b26c7670a77bc468238e8dd5fa43f208db85eddd06dd570fde4219ba19304338c712f671c059c6cc10abb4892d58ae40
HEAD_REF master
PATCHES
fix-install-location.patch
)
else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-umqtt-c
REF 12cb55ee5a926a124f22ad737c7cec35f6af7165
SHA512 ed7d5c5132cfaa46574e70a99ce0181208b772fa2dca9122c8d16918af29240a2060705a25b121785c210eb5a4b917588a1623aedfd0bf9a4cf39df601b05dea
REF 09558f380a314ea89b28f406cc810f47718cea49
SHA512 7fc1b3d4ed6bd7401b764e27755270dd97caeb09f3bdede90e2e8c554acd13b5c24f9c7343e642bcb62d2937b8169d900fa46a1b97a8c439733c8cdcac19d548
HEAD_REF master
PATCHES
fix-install-location.patch
)
endif()

View File

@ -1,6 +1,6 @@
{
"name": "azure-umqtt-c",
"version-date": "2021-09-09",
"version-date": "2022-01-21",
"description": "General purpose library for communication over the mqtt protocol",
"homepage": "https://github.com/Azure/azure-umqtt-c",
"dependencies": [

View File

@ -36,5 +36,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR
configure_file(${SOURCE_PATH}/readme.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
vcpkg_copy_pdbs()

View File

@ -1,7 +1,6 @@
{
"name": "umock-c",
"version-string": "2020-06-17",
"port-version": 2,
"version-date": "2022-01-21",
"description": "A pure C mocking library",
"homepage": "https://github.com/Azure/umock-c",
"dependencies": [

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1d0590ad121eefc3af9ff13f67996ca8c3e39508",
"version-date": "2022-01-21",
"port-version": 0
},
{
"git-tree": "f2f3f9c6b03d02268920eee133f660bf2fe5d946",
"version-date": "2021-09-09",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "77b1d419b740dd9738f237a6d52b1c161e99ee9d",
"version-date": "2022-01-21",
"port-version": 0
},
{
"git-tree": "3d6dc98460c69e8690f9b20f62cf75e9e3ef7f2d",
"version-date": "2021-09-09",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0c90715278e5ab77af983254bdf17571bf69c55b",
"version-date": "2022-01-21",
"port-version": 0
},
{
"git-tree": "a951ed2a9b24f8778b7c2fb2ff4e6a6577ac6472",
"version-string": "2020-06-17",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a2c6897e3392683dcce93a846b98b2c95dc41a55",
"version-date": "2022-01-21",
"port-version": 0
},
{
"git-tree": "4748ea8df9903436ad4b2b6462ca3ffdf74465d4",
"version-date": "2021-09-09",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f614a1ac990dd4189b292fa0e6e31897ee4b7ae8",
"version-date": "2022-01-21",
"port-version": 0
},
{
"git-tree": "8dfc1d65397c35c27df08f42b2f77caf27661a9b",
"version-date": "2021-09-09",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f5b18f17519b9de8a2ab956eebc7dff6e7bf7a05",
"version-date": "2022-01-21",
"port-version": 0
},
{
"git-tree": "2a208bf94bfaf91cc20716d7ba0caac0023324b0",
"version-date": "2021-09-09",

View File

@ -313,8 +313,8 @@
"port-version": 1
},
"azure-c-shared-utility": {
"baseline": "2021-09-09",
"port-version": 1
"baseline": "2022-01-21",
"port-version": 0
},
"azure-core-cpp": {
"baseline": "1.3.1",
@ -325,7 +325,7 @@
"port-version": 0
},
"azure-iot-sdk-c": {
"baseline": "2021-09-09",
"baseline": "2022-01-21",
"port-version": 0
},
"azure-kinect-sensor-sdk": {
@ -333,8 +333,8 @@
"port-version": 4
},
"azure-macro-utils-c": {
"baseline": "2020-06-17",
"port-version": 3
"baseline": "2022-01-21",
"port-version": 0
},
"azure-security-keyvault-certificates-cpp": {
"baseline": "4.0.0-beta.1",
@ -373,15 +373,15 @@
"port-version": 0
},
"azure-uamqp-c": {
"baseline": "2021-09-09",
"baseline": "2022-01-21",
"port-version": 0
},
"azure-uhttp-c": {
"baseline": "2021-09-09",
"baseline": "2022-01-21",
"port-version": 0
},
"azure-umqtt-c": {
"baseline": "2021-09-09",
"baseline": "2022-01-21",
"port-version": 0
},
"b64": {
@ -7033,8 +7033,8 @@
"port-version": 2
},
"umock-c": {
"baseline": "2020-06-17",
"port-version": 2
"baseline": "2022-01-21",
"port-version": 0
},
"unicorn": {
"baseline": "2020-09-14",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "67f2fda1636719281706ebef0314a388ba5c8d15",
"version-date": "2022-01-21",
"port-version": 0
},
{
"git-tree": "b34153650a29eb81f88e48f53bd06ca05d4383c4",
"version-string": "2020-06-17",