Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[azure-iot-sdk-c] LTS_08_2023 #33016

Merged
merged 8 commits into from
Aug 10, 2023
Merged

[azure-iot-sdk-c] LTS_08_2023 #33016

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fd20317
LTS 08-2023 Commit
RLeclair Aug 4, 2023
e8fd32d
Changing control version
RLeclair Aug 7, 2023
4d67b9f
Updating control version 2
RLeclair Aug 7, 2023
6070cab
Adding versions
RLeclair Aug 7, 2023
13a55c7
Removing date update
RLeclair Aug 8, 2023
16f5adb
Removing changes to umock-c
RLeclair Aug 8, 2023
ad7046c
Removing azure macro utils c
RLeclair Aug 8, 2023
b02f80b
Changes to port version
RLeclair Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 20 additions & 24 deletions ports/azure-c-shared-utility/improve-dependencies.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,37 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46334c1..aaeea20 100644
index 6eb607f0..5b0f60f6 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,7 +115,6 @@ if(${use_openssl})
if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR})
find_package(OpenSSL REQUIRED)
endif()
- include_directories(${OPENSSL_INCLUDE_DIR})
endif()

if(${use_applessl})
@@ -521,8 +520,7 @@ if(${use_http})
@@ -553,8 +553,7 @@ if(${use_http})
set(CURL_FIND_REQUIRED 1)
find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES)

- include_directories(${CURL_INCLUDE_DIRS})
- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES})
+ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} CURL::libcurl)
endif(NOT use_builtin_httpapi)
endif()
endif(${use_http})
@@ -561,7 +559,7 @@ if(${use_bearssl})
@@ -593,7 +592,7 @@ if(${use_bearssl})
endif()

if(${use_openssl})
- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES})
+ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} OpenSSL::SSL)
if (WIN32)
set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32)
endif()
@@ -703,7 +701,7 @@ write_basic_package_version_file(
@@ -743,7 +742,7 @@ write_basic_package_version_file(

configure_file("configs/${PROJECT_NAME}Config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
- COPYONLY
+ @ONLY
)

install(EXPORT aziotsharedutilTargets
@@ -715,7 +713,7 @@ install(EXPORT aziotsharedutilTargets
@@ -755,7 +754,7 @@ install(EXPORT aziotsharedutilTargets

install(
FILES
- "configs/${PROJECT_NAME}Config.cmake"
Expand All @@ -48,20 +40,24 @@ index 46334c1..aaeea20 100644
"configs/azure_iot_build_rules.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
diff --git a/configs/azure_c_shared_utilityConfig.cmake b/configs/azure_c_shared_utilityConfig.cmake
index 416dd1c..0e1e4d4 100644
index 2d7c733e..0e1e4d41 100644
--- a/configs/azure_c_shared_utilityConfig.cmake
+++ b/configs/azure_c_shared_utilityConfig.cmake
@@ -1,8 +1,11 @@
@@ -1,11 +1,12 @@
#Copyright (c) Microsoft. All rights reserved.
#Licensed under the MIT license. See LICENSE file in the project root for full license information.

-if(UNIX)
- include(CMakeFindDependencyMacro)
- if(${use_http})
- include(CMakeFindDependencyMacro)
- find_dependency(CURL)
- endif()
+include(CMakeFindDependencyMacro)
+if("@use_openssl@")
+ find_dependency(OpenSSL)
+endif()
+if(UNIX AND NOT "@use_builtin_httpapi@")
find_dependency(CURL)
+ find_dependency(CURL)
endif()


include("${CMAKE_CURRENT_LIST_DIR}/azure_c_shared_utilityTargets.cmake")
4 changes: 2 additions & 2 deletions ports/azure-c-shared-utility/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-c-shared-utility
REF 4f1b7cd6bf48833fe4b9e23e2ff07510753faee5
SHA512 5374585bd05ad2b55d2aa183d65b0b371d52b7f3145bcc9486e92d306d172109a8a6b13e14b56073426c3b02541044864d63fc728a9006a8dcd7ab552002be79
REF 8ee0e5d88d1771d33e36d38d392ec9d9ae13ea55
SHA512 d57730c294340093b80108c55280ab089fa851a68c6f9df53b55823920fce25f5f1daa7ff3eeb2f8ea76bc10603aa7096931caa608c49f86e515b96477fbc81d
HEAD_REF master
PATCHES
fix-install-location.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/azure-c-shared-utility/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "azure-c-shared-utility",
"version-date": "2023-01-18",
"version-date": "2023-08-07",
"port-version": 1,
"description": "Azure C SDKs common code",
"homepage": "https://github.com/Azure/azure-c-shared-utility",
Expand Down
4 changes: 2 additions & 2 deletions ports/azure-iot-sdk-c/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-iot-sdk-c
REF LTS_01_2023_Ref02
SHA512 7527beda68485701a0f5579b8b9e943bba0468856d469dd3b60a366cf46b45242290548f95d09163f4c0291d66d4cd4e1b821af2d19a3f139189740544c0b89c
REF 97fef570416467598100b782ef27ceadad9ca796
SHA512 faec54b97164c778ef3cd6accfbd5181381f6ab488c06900a096be5338563581552b8d8314d6ce91cb4db82c936490d3b435cdf9a3e50383e1d7bb643859a40c
HEAD_REF master
PATCHES
fix-install-location.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/azure-iot-sdk-c/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "azure-iot-sdk-c",
"version-date": "2023-08-06",
"version-date": "2023-08-07",
"description": "A C99 SDK for connecting devices to Microsoft Azure IoT services",
"homepage": "https://github.com/Azure/azure-iot-sdk-c",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions ports/azure-uamqp-c/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-uamqp-c
REF b7bdf307a0db8840156d9f6e40f704c1d5924306
SHA512 a23ddab35caa6f9303072f235591d64f5cfe3c2f4a16e9f317380a9d887f47f146b0bca5afcb2e3a199b146e8092192ede2ec68685edb8a7fb11cfe5641815b8
REF efd1b1b8b1e85d471ebd3aa1be062fb1cc6a10a1
SHA512 1303183cf1830be0cd52ccb67eebe2055343979d788f8c7eddde30343cc2c334035a1f4767bf404b1432277f7a4846317e14fb0da3a05114e8befb91562fa8f3
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/azure-uamqp-c/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "azure-uamqp-c",
"version-date": "2023-01-18",
"version-date": "2023-08-07",
"description": "AMQP library for C",
"homepage": "https://github.com/Azure/azure-uamqp-c",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions ports/azure-uhttp-c/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-uhttp-c
REF 33485e2e43f9c8f186dfff8afda7efd905b636f1
SHA512 ad9c8f21cee431ac39a5ffc5f1007b76c5ba1768dca6cebf8fceda33747c3accbce48ace72173cfe746316a0a136a7e770005ba98b8f99e5bb3889b5bdc2e973
REF ff321c8158b53b18557b0224dfd32a4bf0ebb77a
SHA512 47c03d550561580155c56e4a35734c453d6df64feac7aa39ec777cfa420aa142e596e32c19c9847654f5f02c75335314ad20d1b64c4a60a8189641c305938b19
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/azure-uhttp-c/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "azure-uhttp-c",
"version-date": "2023-01-18",
"version-date": "2023-08-07",
"description": "Azure HTTP Library written in C",
"homepage": "https://github.com/Azure/azure-uhttp-c",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions ports/azure-umqtt-c/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-umqtt-c
REF 9201d60bbc12a02ac5456b6105bb50919d392105
SHA512 97d5383184c99186783738613d00e77041fe4ff3af4c14fe775e4be8b38a77a69d093ed8636a67ee85e8e09c8732b8839375aa178128f1ae58792d7c8698f829
REF 457e5af5e08ce72cee4c3c32d13ef274ab23c0d3
SHA512 f95c3f8a207d34cdb5fe686f86421e4c8a584f3d506c82055e320133f8a346e67ffcdaa872d70d3ac7be67ae9f24d14dac852a95e0c1f98b7d2012805083f587
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/azure-umqtt-c/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "azure-umqtt-c",
"version-date": "2023-01-18",
"version-date": "2023-08-03",
"description": "General purpose library for communication over the mqtt protocol",
"homepage": "https://github.com/Azure/azure-umqtt-c",
"license": "MIT",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/azure-c-shared-utility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ae2cd1418fa9f6d28a8e515d972c1eb982ed7df8",
"version-date": "2023-08-07",
"port-version": 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"port-version": 1
"port-version": 0

Need to delete the port-version field in the vcpkg.json, and use the command ./vcpkg x-add-version

Copy link
Member Author

@RLeclair RLeclair Aug 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @FrankXie05, I removed port-version

},
{
"git-tree": "7fed72b2797511395842d94efefa040e0fd1f65a",
"version-date": "2023-01-18",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/azure-iot-sdk-c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2761c8c3302243693aaa2877b54a904d5cbed96f",
"version-date": "2023-08-07",
"port-version": 0
},
{
"git-tree": "197034166d7fc06ba2ed5562d8548c9404a736ae",
"version-date": "2023-08-06",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/azure-uamqp-c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0ca3c3ded9e4bfee0d22f68201e4bf89462d4cff",
"version-date": "2023-08-07",
"port-version": 0
},
{
"git-tree": "c4183ed8c03559df3b5821d0149192a95dba5b50",
"version-date": "2023-01-18",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/azure-uhttp-c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "70faa0f3e0eb5d1f3aa0c3fed59147515404c5bf",
"version-date": "2023-08-07",
"port-version": 0
},
{
"git-tree": "6076f8569c54a752f30d97f3b5654190a716722a",
"version-date": "2023-01-18",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/azure-umqtt-c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f6b50934a467b9bf7a494290ebc34ff8d036937f",
"version-date": "2023-08-03",
"port-version": 0
},
{
"git-tree": "e484fe484d0feac8170d1dc7a3f2a3a72bd262fb",
"version-date": "2023-01-18",
Expand Down
10 changes: 5 additions & 5 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@
"port-version": 0
},
"azure-c-shared-utility": {
"baseline": "2023-01-18",
"baseline": "2023-08-07",
"port-version": 1
},
"azure-core-amqp-cpp": {
Expand All @@ -421,7 +421,7 @@
"port-version": 0
},
"azure-iot-sdk-c": {
"baseline": "2023-08-06",
"baseline": "2023-08-07",
"port-version": 0
},
"azure-kinect-sensor-sdk": {
Expand Down Expand Up @@ -477,15 +477,15 @@
"port-version": 0
},
"azure-uamqp-c": {
"baseline": "2023-01-18",
"baseline": "2023-08-07",
"port-version": 0
},
"azure-uhttp-c": {
"baseline": "2023-01-18",
"baseline": "2023-08-07",
"port-version": 0
},
"azure-umqtt-c": {
"baseline": "2023-01-18",
"baseline": "2023-08-03",
"port-version": 0
},
"b64": {
Expand Down