-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[azure] Update vcpkgs (add new port dependencies) #6511
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| Source: azure-c-shared-utility | ||
| Version: 2019-03-18 | ||
| Version: 2019-03-18-1 | ||
| Description: Azure C SDKs common code | ||
| Build-Depends: curl (linux), openssl (linux) | ||
| Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c | ||
|
|
||
| Feature: public-preview | ||
| Description: Azure C SDKs common code (public preview) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| Source: azure-iot-sdk-c | ||
| Version: 2019-03-18 | ||
| Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c | ||
| Version: 2019-03-18-1 | ||
| Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c | ||
| Description: A C99 SDK for connecting devices to Microsoft Azure IoT services | ||
|
|
||
| Feature: public-preview | ||
| Description: A version of the azure-iot-sdk-c containing public-preview features. | ||
| Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview] | ||
| Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview], azure-macro-utils-c, umock-c |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| Source: azure-macro-utils-c | ||
| Version: 2019-04-11-1 | ||
| Description: A library of macros for the Azure IoT SDK Suite | ||
| Build-Depends: | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| include(vcpkg_common_functions) | ||
|
|
||
| vcpkg_check_linkage(ONLY_STATIC_LIBRARY) | ||
|
|
||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO Azure/azure-macro-utils-c | ||
| REF 38729b4b7ac3ea8b7d71e394782b861ecb25193e | ||
| SHA512 c9c820e74aee403d45f257359318d3435e5d6534afe821da5679bc462e26ad256dd01ed253a80ba1c58343f850ef1026280533a152c4b0465527f6537b3092d3 | ||
| HEAD_REF master | ||
| ) | ||
|
|
||
| vcpkg_configure_cmake( | ||
| SOURCE_PATH ${SOURCE_PATH} | ||
| PREFER_NINJA | ||
| OPTIONS | ||
| -Drun_int_tests=OFF | ||
| ) | ||
|
|
||
| vcpkg_install_cmake() | ||
|
|
||
| vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_macro_utils_c) | ||
|
|
||
| file(COPY ${SOURCE_PATH}/inc/azure_macro_utils/macro_utils.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure_macro_utils_c/include/azure_macro_utils) | ||
|
|
||
| file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug) | ||
|
|
||
| configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-macro-utils-c/copyright COPYONLY) | ||
|
|
||
| vcpkg_copy_pdbs() | ||
|
|
||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| Source: azure-uamqp-c | ||
| Version: 2019-03-18 | ||
| Build-Depends: azure-c-shared-utility | ||
| Version: 2019-03-18-1 | ||
| Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c | ||
| Description: AMQP library for C | ||
|
|
||
| Feature: public-preview | ||
| Description: AMQP library for C (public preview) | ||
| Build-Depends: azure-c-shared-utility[public-preview] | ||
| Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c, umock-c |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| Source: azure-uhttp-c | ||
| Version: 2019-03-18 | ||
| Build-Depends: azure-c-shared-utility | ||
| Version: 2019-03-18-1 | ||
| Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c | ||
| Description: Azure HTTP Library written in C | ||
|
|
||
| Feature: public-preview | ||
| Description: Azure HTTP Library written in C (public preview) | ||
| Build-Depends: azure-c-shared-utility[public-preview] | ||
| Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c, umock-c |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| Source: azure-umqtt-c | ||
| Version: 2019-03-18 | ||
| Build-Depends: azure-c-shared-utility | ||
| Version: 2019-03-18-1 | ||
| Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c | ||
| Description: General purpose library for communication over the mqtt protocol | ||
|
|
||
| Feature: public-preview | ||
| Description: General purpose library for communication over the mqtt protocol (public preview) | ||
| Build-Depends: azure-c-shared-utility[public-preview] | ||
| Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c, umock-c |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| Source: umock-c | ||
| Version: 2019-04-11-1 | ||
| Description: A pure C mocking library | ||
| Build-Depends: azure-macro-utils-c | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| include(vcpkg_common_functions) | ||
|
|
||
| vcpkg_check_linkage(ONLY_STATIC_LIBRARY) | ||
|
|
||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO Azure/umock-c | ||
| REF 92772d9d8317a37dd0b656e95877ffb03bc67e92 | ||
| SHA512 4dd738c7b2c7e1237ad874a7ad90bf81b864aa242af335dcc82d0cfea51bc33fe84de4eebedb6e00944c70d01d1ade4827716dbcf95754165b35981bde4147e7 | ||
| HEAD_REF master | ||
| ) | ||
|
|
||
| vcpkg_configure_cmake( | ||
| SOURCE_PATH ${SOURCE_PATH} | ||
| PREFER_NINJA | ||
| OPTIONS | ||
| -Drun_unittests=OFF | ||
| -Drun_int_tests=OFF | ||
| -Duse_installed_dependencies=ON | ||
| ) | ||
|
|
||
| vcpkg_install_cmake() | ||
|
|
||
| vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/umock_c) | ||
|
|
||
| file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) | ||
|
|
||
| configure_file(${SOURCE_PATH}/readme.md ${CURRENT_PACKAGES_DIR}/share/umock-c/copyright COPYONLY) | ||
|
|
||
| vcpkg_copy_pdbs() | ||
|
|
||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ports must not write to the
/installedfolder directly.Copy the file to
${CURRENT_PACKAGES_DIR}and it will be copied to the/installeddirectory when the installation is complete.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it, thanks for the review. Yes, I fixed it and tested, it works good.
Please feel free to merge if the changes are good.
Thanks.