[azure-iot-sdk] Upgrades

2025-01-18 17:53:03 +08:00 · 2018-04-19 15:04:00 -07:00 · 2018-04-19 15:04:00 -07:00 · 90a50a9502
commit 90a50a9502
parent 9b8245e6de
10 changed files with 33 additions and 54 deletions
--- a/ports/azure-c-shared-utility/CONTROL
+++ b/ports/azure-c-shared-utility/CONTROL
@ -1,3 +1,3 @@
 Source: azure-c-shared-utility
-Version: 1.1.2
+Version: 1.1.3
 Description: Azure C SDKs common code
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Azure/azure-c-shared-utility
-    REF 1.1.2
-    SHA512 23c576efe0cc6c4a47d356f1e0be9e23d2b4e22692d35efa7d0d627a05fad245c55a81d26e60e1f7f7676d547a0e28c357846d2854b31f3f6ae7c39a934cf3d4
+    REF 1.1.3
+    SHA512 8c69f39ccca30d11a7e665a46e3ec33826af062657a87d32f68e80c6182b15d5e02839f9e541f5dc840219e3256ac090452f4873b6a1a62b3fe6682780314056
    HEAD_REF master
 )

--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@ -1,4 +1,4 @@
 Source: azure-iot-sdk-c
-Version: 1.2.2
+Version: 1.2.3
 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson
 Description: A C99 SDK for connecting devices to Microsoft Azure IoT services 
--- a/ports/azure-iot-sdk-c/improve-external-deps-2.patch
+++ b/ports/azure-iot-sdk-c/improve-external-deps-2.patch
@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aa2dfad..f1656ea 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -129,15 +129,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()
+-
+ 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}")
--- a/ports/azure-iot-sdk-c/improve-external-deps.patch
+++ b/ports/azure-iot-sdk-c/improve-external-deps.patch
@ -26,33 +26,6 @@ index 063733a..71bfc7d 100644
 else()
     add_subdirectory(c-utility)
 
-diff --git a/iothub_client/CMakeLists.txt b/iothub_client/CMakeLists.txt
-index e6d000a..70ade26 100644
--- a/iothub_client/CMakeLists.txt
-+++ b/iothub_client/CMakeLists.txt
-@@ -24,22 +24,6 @@ set(install_staticlibs
-     iothub_client
- )
- 
-add_library(parson
-    ../deps/parson/parson.c
-)
-
-if(MSVC)
-    set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232")
-endif()
-
-set(install_staticlibs ${install_staticlibs}
-    parson
-)
-
-set(iothub_client_libs ${iothub_client_libs}
-    parson
-)
-
- if(NOT dont_use_uploadtoblob)
-     set(iothub_client_ll_transport_c_files
-         ${iothub_client_ll_transport_c_files}
 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
 --- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
@ -119,18 +92,3 @@ index 11a9a9a..4097293 100644
 endif()
 
 if (NOT ${ARCHITECTURE} STREQUAL "ARM")
-diff --git a/serializer/CMakeLists.txt b/serializer/CMakeLists.txt
-index 0f6dc74..b4f784c 100644
--- a/serializer/CMakeLists.txt
-+++ b/serializer/CMakeLists.txt
-@@ -87,10 +87,6 @@ else()
- endif()
- setSdkTargetBuildProperties(serializer)
- 
-target_link_libraries(serializer
-    parson
-)
-
- if (NOT ${skip_samples})
- if(WIN32)
-     if (NOT ${ARCHITECTURE} STREQUAL "ARM")
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Azure/azure-iot-sdk-c
-    REF 1.2.2
-    SHA512 1542f8347e5efc3104eacf1696b84739299bedb4f50dce3869b3a53072b5c016aadf34223658c18fe28e87eab775a0687b5bf18b5629a7a87b8709b123b3599a
+    REF 1.2.3
+    SHA512 6192d454bb2ecb01989f7636751acd6919021b55b772f4ea25a6d0ddd263e7f988275f7fb0b1c304d4ebd30418c9f870eb1c504a4a504f2faeb712ef8e669d5a
    HEAD_REF master
 )

@ -17,6 +17,7 @@ vcpkg_apply_patches(
    SOURCE_PATH ${SOURCE_PATH}
    PATCHES
        ${CMAKE_CURRENT_LIST_DIR}/improve-external-deps.patch
+        ${CMAKE_CURRENT_LIST_DIR}/improve-external-deps-2.patch
 )

 file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/)
--- a/ports/azure-uamqp-c/CONTROL
+++ b/ports/azure-uamqp-c/CONTROL
@ -1,4 +1,4 @@
 Source: azure-uamqp-c
-Version: 1.2.2
+Version: 1.2.3
 Build-Depends: azure-c-shared-utility
 Description: AMQP library for C
--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Azure/azure-uamqp-c
-    REF 1.2.2
-    SHA512 66d4169ecfa1f0bc37c1b61de34908703d1f2d49d5b6edf5aa0c208795117b614a3c0afbba95df3ffc5364f4fd45debe2c95ac7a5be86fbd42d997b4db2aaf9c
+    REF 1.2.3
+    SHA512 18fc978517371fcb19e1c078f07d06b3bf8ec046c5cba955dd3cfe0a364d8775542acc970d81fa42384942ea4db7fb60d8939e80e90baf582c9d9e6ff0b577b5
    HEAD_REF master
 )

--- a/ports/azure-umqtt-c/CONTROL
+++ b/ports/azure-umqtt-c/CONTROL
@ -1,4 +1,4 @@
 Source: azure-umqtt-c
-Version: 1.1.2
+Version: 1.1.3
 Build-Depends: azure-c-shared-utility
 Description: General purpose library for communication over the mqtt protocol
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Azure/azure-umqtt-c
-    REF 1.1.2
-    SHA512 e99b1292d6acdefef43b13cb2ad5b5972ed9e65fb3b2b3eacf06486e88f65fdb1e119fd0cf7dadddb1b1dffaef1aa30edda68fa5dc8aa2b22bcdad2d56e1de63
+    REF 1.1.3
+    SHA512 5c57fe40dce8166e1e138db45b642152a337dbbbc4d85998ac99b016627c0135b99bd7b189d249c6278837ef4af5ba4e4f964a9b65788acef37d7b37ae125b16
    HEAD_REF master
 )