[aws-*]Update version (#8832)

* [aws-c-common]Upgrade to 0.4.15 * [aws-c-common]Fix cmake target path. * [aws-c-event-stream]Upgrade to 0.1.4 * [aws-checksums]Upgrade to 0.1.5 [aws-c-event-stream]Fix cmake target path. [aws-lambda-cpp]Upgrade to 0.2.4 [aws-sdk-cpp]Upgrade to 1.7.214 * [aws=sdk-cpp]Set feature AWSMigrationHub to lowercase. * [aws-lambda-cpp] Drop support with OSX
2024-12-26 17:41:09 +08:00 · 2020-01-31 06:43:34 +08:00 · 2020-01-31 06:43:34 +08:00 · cf3e688dda
commit cf3e688dda
parent 8bb07e21ca
17 changed files with 150 additions and 83 deletions
--- a/ports/aws-c-common/CONTROL
+++ b/ports/aws-c-common/CONTROL
@ -1,3 +1,4 @@
 Source: aws-c-common
-Version: 0.4.1
+Version: 0.4.15
+Homepage: https://github.com/awslabs/aws-c-common
 Description: AWS common library for C
--- a/ports/aws-c-common/disable-error-4068.patch
+++ b/ports/aws-c-common/disable-error-4068.patch
@ -1,15 +1,15 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 263d34e..8c699b7 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -122,6 +122,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
-     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
- endif()
- 
-+if (WIN32)
-+    add_compile_options(/wd4068)
-+endif()
-+
- aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
- target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
- 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 79c66c3..f6639d7 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -127,6 +127,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+     #this only gets applied to aws-c-common (not its consumers).
+     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
+ endif()
+ 
+if (WIN32)
+    add_compile_options(/wd4068)
+endif()
+ 
+ aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
+ target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
--- a/ports/aws-c-common/disable-internal-crt-option.patch
+++ b/ports/aws-c-common/disable-internal-crt-option.patch
@ -1,20 +1,20 @@
-diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
-index 0f597d7..1359b8b 100644
--- a/cmake/AwsCFlags.cmake
-+++ b/cmake/AwsCFlags.cmake
-@@ -35,15 +35,6 @@ function(aws_set_common_properties target)
-         # /volatile:iso relaxes some implicit memory barriers that MSVC normally applies for volatile accesses
-         # Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
-         list(APPEND AWS_C_FLAGS /volatile:iso)
-        
-        string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
-        if(STATIC_CRT)
-            string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
-        else()
-            string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
-        endif()
-        string(REPLACE " " ";" _FLAGS "${_FLAGS}")
-        list(APPEND AWS_C_FLAGS "${_FLAGS}")
- 
-     else()
-         list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
+diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
+index 42d146e..813f56d 100644
+--- a/cmake/AwsCFlags.cmake
+++ b/cmake/AwsCFlags.cmake
+@@ -39,15 +39,6 @@ function(aws_set_common_properties target)
+         # Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
+         list(APPEND AWS_C_FLAGS /volatile:iso)
+ 
+-        string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
+-        if(STATIC_CRT)
+-            string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+-        else()
+-            string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+-        endif()
+-        string(REPLACE " " ";" _FLAGS "${_FLAGS}")
+-        list(APPEND AWS_C_FLAGS "${_FLAGS}")
+-
+     else()
+         list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
+ 
--- a/ports/aws-c-common/fix-cmake-target-path.patch
+++ b/ports/aws-c-common/fix-cmake-target-path.patch
@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 433b6c5..41874a0 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -209,7 +209,7 @@ else()
+ endif()
+ 
+ install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
+-    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}"
+    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake"
+     NAMESPACE AWS::
+     COMPONENT Development)
+ 
+diff --git a/cmake/aws-c-common-config.cmake b/cmake/aws-c-common-config.cmake
+index c322b52..6e5daa0 100644
+--- a/cmake/aws-c-common-config.cmake
+++ b/cmake/aws-c-common-config.cmake
+@@ -1,9 +1,5 @@
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
+ 
+-if (BUILD_SHARED_LIBS)
+-    include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
+-else()
+-    include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
+-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
+ 
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@ -1,14 +1,13 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO awslabs/aws-c-common
-    REF b2e7ca47449571beaca4a507c65ac3ee39d8eefc
-    SHA512 c9dc394bf3ef8eb33d36b81bae5a2002a8fccc7d876ad9c631da818aae7d06846615791c2311e8baa6efa7fcd9d565effabfec6f01767ca0099c6fa64d58e2fa
+    REF e3e7ccd35a85f9cd38c67cb1988251f1543b6632 # v0.4.15
+    SHA512 f8be12628bb7503921bf64956697ad60ba1dc10099482515be7157a1f75b14fad716eadcf69af1d77a5f1bbdaf298a7913e678dd143c5b409dd37ce3bf57f023
    HEAD_REF master
    PATCHES
        disable-error-4068.patch # This patch fixes dependency port compilation failure
        disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
+        fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time
 )

 vcpkg_configure_cmake(
@ -29,9 +28,7 @@ file(REMOVE_RECURSE

 vcpkg_copy_pdbs()

-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-c-common RENAME copyright)
+file(REMOVE_RECURSE	${CURRENT_PACKAGES_DIR}/debug/share)

-file(REMOVE_RECURSE
-	${CURRENT_PACKAGES_DIR}/debug/share
-)
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
--- a/ports/aws-c-event-stream/CONTROL
+++ b/ports/aws-c-event-stream/CONTROL
@ -1,4 +1,4 @@
 Source: aws-c-event-stream
-Version: 0.1.1
+Version: 0.1.4
 Description: C99 implementation of the vnd.amazon.event-stream content-type.
 Build-Depends: aws-c-common, aws-checksums
--- a/ports/aws-c-event-stream/fix-cmake-target-path.patch
+++ b/ports/aws-c-event-stream/fix-cmake-target-path.patch
@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a765be0..4ade373 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -101,7 +101,7 @@ else()
+ endif()
+ 
+ install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
+-    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
+    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
+     NAMESPACE AWS::
+     COMPONENT Development)
+ 
+diff --git a/cmake/aws-c-event-stream-config.cmake b/cmake/aws-c-event-stream-config.cmake
+index 7bd3cfc..cb817e4 100644
+--- a/cmake/aws-c-event-stream-config.cmake
+++ b/cmake/aws-c-event-stream-config.cmake
+@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro)
+ find_dependency(aws-c-common)
+ find_dependency(aws-checksums)
+ 
+-if (BUILD_SHARED_LIBS)
+-    include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
+-else()
+-    include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
+-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
+ 
--- a/ports/aws-c-event-stream/portfile.cmake
+++ b/ports/aws-c-event-stream/portfile.cmake
@ -1,11 +1,10 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO awslabs/aws-c-event-stream
-    REF v0.1.1
-    SHA512 974311cdface59bb5a95c7c249ad31cf694ebefd5c7b25f280f6817c6dc8d9ab1fdc8f75030099efe573be41a93676f199fda797d2a7bb41533f7e15f05de120
+    REF 32713d30b479690d199b3f02163a832b09b309a5 #v0.1.4
+    SHA512 c1f776b708cd4a68afbcc60e046dcfa3f7c1d378e7bf49ba7f93b3db3a248218316e5037254709320cd50efd6486996aa09678f41499fcea810adea16463ff4b
    HEAD_REF master
+    PATCHES fix-cmake-target-path.patch
 )

 vcpkg_configure_cmake(
@ -27,9 +26,7 @@ file(REMOVE_RECURSE

 vcpkg_copy_pdbs()

-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-c-event-stream RENAME copyright)
+file(REMOVE_RECURSE	${CURRENT_PACKAGES_DIR}/debug/share)

-file(REMOVE_RECURSE
-	${CURRENT_PACKAGES_DIR}/debug/share
-)
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
--- a/ports/aws-checksums/CONTROL
+++ b/ports/aws-checksums/CONTROL
@ -1,3 +1,3 @@
 Source: aws-checksums
-Version: 0.1.3
+Version: 0.1.5
 Description: Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.
--- a/ports/aws-checksums/fix-cmake-target-path.patch
+++ b/ports/aws-checksums/fix-cmake-target-path.patch
@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2ae2229..c4d0c2d 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -138,7 +138,7 @@ else()
+ endif()
+ 
+ install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
+-    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
+    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
+     NAMESPACE AWS::)
+ 
+ configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
+diff --git a/cmake/aws-checksums-config.cmake b/cmake/aws-checksums-config.cmake
+index f0785bf..1b9b2d2 100644
+--- a/cmake/aws-checksums-config.cmake
+++ b/cmake/aws-checksums-config.cmake
+@@ -1,6 +1 @@
+-if (BUILD_SHARED_LIBS)
+-    include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
+-else()
+-    include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
+-endif()
+-
+include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
--- a/ports/aws-checksums/portfile.cmake
+++ b/ports/aws-checksums/portfile.cmake
@ -1,11 +1,10 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO awslabs/aws-checksums
-    REF v0.1.3
-    SHA512 79bf71a6c4c268b27efe8a6a3c4b90281da4ce7f6e4c1c62fce80b11a4756ecfd4dc2b19624ace3f54137113d0cb56a517de0b91dd6338ee8ca069756bca13f4
+    REF 519d6d9093819b6cf89ffff589a27ef8f83d0f65 # v0.1.5
+    SHA512 3079786d106b98ba3b8c254c26ec4d9accf5fba5bcc13aed30ffa897e17ea7d701e6b6e903b37534e32e1cf0cac3e9a6ff46e1340ed7c530c2fc6262b245e05c
    HEAD_REF master
+    PATCHES fix-cmake-target-path.patch
 )

 if (VCPKG_CRT_LINKAGE STREQUAL static)
@ -32,9 +31,7 @@ file(REMOVE_RECURSE

 vcpkg_copy_pdbs()

-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-checksums RENAME copyright)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

-file(REMOVE_RECURSE
-	${CURRENT_PACKAGES_DIR}/debug/share
-)
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
--- a/ports/aws-lambda-cpp/CONTROL
+++ b/ports/aws-lambda-cpp/CONTROL
@ -1,4 +1,4 @@
 Source: aws-lambda-cpp
-Version: 0.1.0-2
+Version: 0.2.4
 Build-Depends: curl
 Description: C++ Runtime for AWS Lambda.
--- a/ports/aws-lambda-cpp/portfile.cmake
+++ b/ports/aws-lambda-cpp/portfile.cmake
@ -1,15 +1,10 @@
-include(vcpkg_common_functions)
-
-vcpkg_fail_port_install(MESSAGE "aws-lambda-cpp currently only supports Linux and Mac platforms" ON_TARGET "Windows")
-#if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-#    message(FATAL_ERROR "aws-lambda-cpp currently only supports Linux and Mac platforms")
-#endif()
+vcpkg_fail_port_install(ON_TARGET "Windows" "OSX")

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO awslabs/aws-lambda-cpp
-    REF v0.1.0
-    SHA512 78b1ad1dcd88176a954c03b38cbb962c77488da6c75acb37a8b64cde147c030b02c6e51f0a974edb042e59c3c969d110d181ad097ef76f43255500b272a94454
+    REF 681652d9410bb4adb66e5afa9e8a3662a5f7b606 # v0.2.4
+    SHA512 c29ea2b8fb8b99a5d0a49f601406e14682e5133deeb871a750baa792becc91f22dac00c0ee3d8c056871a1f5035cdcd1a3bba3d9464dfa84e1ec00a270a9abd6
    HEAD_REF master
 )

@ -25,5 +20,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 vcpkg_copy_pdbs()

 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-lambda-cpp RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@ -1,5 +1,5 @@
 Source: aws-sdk-cpp
-Version: 1.7.142-1
+Version: 1.7.214
 Homepage: https://github.com/aws/aws-sdk-cpp
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream
@ -51,7 +51,7 @@ Description: C++ SDK for the AWS autoscaling service
 Feature: autoscaling-plans
 Description: C++ SDK for the AWS autoscaling-plans service

-Feature: AWSMigrationHub
+Feature: awsmigrationhub
 Description: C++ SDK for the AWS AWSMigrationHub service

 Feature: awstransfer
--- a/ports/aws-sdk-cpp/compute_build_only.cmake
+++ b/ports/aws-sdk-cpp/compute_build_only.cmake
@ -44,7 +44,7 @@ endif()
 if("autoscaling-plans" IN_LIST FEATURES)
  list(APPEND BUILD_ONLY autoscaling-plans)
 endif()
-if("AWSMigrationHub" IN_LIST FEATURES)
+if("awsmigrationhub" IN_LIST FEATURES)
  list(APPEND BUILD_ONLY AWSMigrationHub)
 endif()
 if("awstransfer" IN_LIST FEATURES)
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@ -1,12 +1,10 @@
-include(vcpkg_common_functions)
-
 vcpkg_buildpath_length_warning(37)

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO aws/aws-sdk-cpp
-    REF d3ee022fea02e8e7e02f3cdd77904dc4c39ab79a
-    SHA512 6f146830f15864bb3770ad50a6ebcbc478235e9c2c59aa044353bbfc297bf26437e07b77b970974cc294782809aaa837a3407cbc846426b04e97447cd7f9e3cf
+    REF e8a7e7263e900983921e95363026efaa494622ab # 1.7.214
+    SHA512 dc4e003ffaebf21410d8d360f8a4602dda99d3ee0c0ab7fb61c97fe8b5f0b38438ed5315fb85d3a435cd5a99724e43c5cf569a7cb365ed8137caeac32c619a86
    HEAD_REF master
 )

@ -83,4 +81,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 endif()

 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-sdk-cpp RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@ -117,6 +117,7 @@ aws-lambda-cpp:x64-uwp=fail
 aws-lambda-cpp:x64-windows=fail
 aws-lambda-cpp:x64-windows-static=fail
 aws-lambda-cpp:x86-windows=fail
+aws-lambda-cpp:x64-osx=fail
 aws-sdk-cpp:x64-linux=ignore
 azure-c-shared-utility:arm-uwp=fail
 azure-c-shared-utility:x64-uwp=fail