[aws-sdk-cpp] update to 1.9.96 (#20033)

* [aws-c-common] Update to 0.6.9

* [aws-checksums] Update to 0.1.11

* [aws-c-event-stream] Upgrade to 0.2.7

* Add aws-c-cal port

* Add s2n port

* Add port aws-c-io

* [aws-c-event-stream] Update port to 0.2.7

* Update aws-sdk-cpp port

* Add aws-c-compression port

* Add aws-c-auth port

* Add aws-c-http port

* Add aws-c-mqtt port

* Add aws-c-s3 port

* Add aws-crt-cpp port

* [aws-sdk-cpp] Update port to 1.9.91 version

* Fix port issues.

* Upgrade aws-sdk-cpp to 1.9.96
Upgrade aws-crt-cpp to 0.15.1

* Support x64-windows

* Fix format issues

* Specify supported triplets for aws libs

* Specify platforms for more aws libs

* Support x64-windows-static triplet.

* Fix format issue for aws-c-common

* Update port versions file

* Use new vcpkg cmake methods and format

* Use new vcpkg cmake methods and format

* update version

* Fix s2n port typo

* Fix s2n port typo

Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

5 files changed, 43 insertions, 93 deletions

diff --git a/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch b/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch
deleted file mode 100644
index f35d1be1c..000000000
--- a/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake
-index c2f643e..4fb4a2f 100644
---- a/cmake/AWSSDKConfig.cmake
-+++ b/cmake/AWSSDKConfig.cmake
-@@ -24,6 +24,10 @@ if(AWSSDK_FOUND)
-     return()
- endif()
- 
-+include(CMakeFindDependencyMacro)
-+find_dependency(OpenSSL)
-+find_dependency(ZLIB)
-+
- include(${CMAKE_CURRENT_LIST_DIR}/AWSSDKConfigVersion.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/sdksCommon.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/platformDeps.cmake)
-@@ -43,7 +47,6 @@ endif()
- 
- # On Windows, dlls are treated as runtime target and installed in bindir
- if (WIN32 AND AWSSDK_INSTALL_AS_SHARED_LIBS)
--    set(AWSSDK_INSTALL_LIBDIR "${AWSSDK_INSTALL_BINDIR}")
-     # If installed CMake scripts are associated with dll library, define USE_IMPORT_EXPORT for customers
-     add_definitions(-DUSE_IMPORT_EXPORT)
- endif()
-@@ -54,7 +57,6 @@ endif()
- get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
- get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH)
- get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH)
--get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH)
- get_filename_component(AWS_NATIVE_SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
- 
- set(CPP_STANDARD "11" CACHE STRING "Flag to upgrade the C++ standard used. The default is 11. The minimum is 11.")
diff --git a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch
index 9c5a5a2c5..828647cc4 100644
--- a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch
+++ b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch
@@ -8,5 +8,5 @@ index a653e38628..76d6067646 100644
  # Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables.
 -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
  
- # build third-party targets
- if (BUILD_DEPS)
+ # build the sdk targets
+ project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX)
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index 2ef408d7a..c9c44a800 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -3,20 +3,14 @@ vcpkg_buildpath_length_warning(37)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO aws/aws-sdk-cpp

-    REF b11ed430fa6a574cc842532192dfeb9bb09e62b4 # 1.8.126

-    SHA512 39e71f85d977b183df6f0d6d61a028db33573026f6abb8856f35e0e71398e2749db6dbdd033818a2c045ec42076fb23cdbae92608117db0a08ca88a05c825683

-    HEAD_REF master

+    REF b0204a7b6a33211f533a175e987a755f714bf7f3 # 1.9.96

+    SHA512 456d3fc256a5a26843ecf16014242514b165ae5fa35f088d57aa54a744d19e2c38bd0bed9b6a4b76948c8a49cf87a06a4c722be5a910ed41dfd9c9b9a66b398d

     PATCHES

         patch-relocatable-rpath.patch

-        fix-AWSSDKCONFIG.patch

 )

 

 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)

 

-set(BUILD_ONLY core)

-

-include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)

-

 set(EXTRA_ARGS)

 if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)

     set(rpath "@loader_path")

@@ -43,26 +37,29 @@ elseif (VCPKG_TARGET_IS_ANDROID)
 else()

     set(rpath "\$ORIGIN")

 endif()

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    DISABLE_PARALLEL_CONFIGURE

-    PREFER_NINJA

-    OPTIONS

-        ${EXTRA_ARGS}

-        -DENABLE_UNITY_BUILD=ON

-        -DENABLE_TESTING=OFF

-        -DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}

-        -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE

-        "-DBUILD_ONLY=${BUILD_ONLY}"

-        -DBUILD_DEPS=OFF

-        -DCMAKE_INSTALL_RPATH=${rpath}

-)

 

-vcpkg_install_cmake()

-

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)

+set(BUILD_ONLY core)

+include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)

 

-vcpkg_copy_pdbs()

+foreach(TARGET IN LISTS BUILD_ONLY)

+    message(STATUS "Building ${TARGET}")

+    vcpkg_cmake_configure(

+        SOURCE_PATH "${SOURCE_PATH}"

+        PREFER_NINJA

+        OPTIONS

+            ${EXTRA_ARGS}

+            "-DENABLE_UNITY_BUILD=ON"

+            "-DENABLE_TESTING=OFF"

+            "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}"

+            "-DBUILD_ONLY=${TARGET}"

+            "-DBUILD_DEPS=OFF"

+            "-DCMAKE_INSTALL_RPATH=${rpath}"

+            "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files

+    )

+    vcpkg_cmake_install()

+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)

+    vcpkg_copy_pdbs()

+endforeach()

 

 file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake")

 foreach(AWS_TARGET IN LISTS AWS_TARGETS)

@@ -82,12 +79,12 @@ foreach(AWS_CONFIG IN LISTS AWS_CONFIGS)
 endforeach()

 

 file(REMOVE_RECURSE

-    ${CURRENT_PACKAGES_DIR}/debug/include

-    ${CURRENT_PACKAGES_DIR}/debug/share

-    ${CURRENT_PACKAGES_DIR}/lib/pkgconfig

-    ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig

-    ${CURRENT_PACKAGES_DIR}/nuget

-    ${CURRENT_PACKAGES_DIR}/debug/nuget

+    "${CURRENT_PACKAGES_DIR}/debug/include"

+    "${CURRENT_PACKAGES_DIR}/debug/share"

+    "${CURRENT_PACKAGES_DIR}/lib/pkgconfig"

+    "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig"

+    "${CURRENT_PACKAGES_DIR}/nuget"

+    "${CURRENT_PACKAGES_DIR}/debug/nuget"

 )

 

 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

@@ -108,4 +105,4 @@ endif()
 configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)

 

 # Handle copyright

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json
deleted file mode 100644
index fdca6ae1e..000000000
--- a/ports/aws-sdk-cpp/vcpkg.in.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "aws-sdk-cpp",
-  "version": "1.8.126",
-  "port-version": 10,
-  "description": "AWS SDK for C++",
-  "homepage": "https://github.com/aws/aws-sdk-cpp",
-  "dependencies": [
-    "aws-c-event-stream",
-    {
-      "name": "curl",
-      "platform": "!uwp & !windows"
-    },
-    {
-      "name": "openssl",
-      "platform": "!uwp & !windows"
-    },
-    "zlib"
-  ],
-  "default-features": [
-    "dynamodb",
-    "kinesis",
-    "s3"
-  ]
-}
diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
index 6446f89ea..cc17dfcb3 100644
--- a/ports/aws-sdk-cpp/vcpkg.json
+++ b/ports/aws-sdk-cpp/vcpkg.json
@@ -1,12 +1,12 @@
 {
   "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
-  "version": "1.8.126",
-  "port-version": 10,
+  "version": "1.9.96",
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
+  "supports": "!arm & !uwp",
   "dependencies": [
-    "aws-c-event-stream",
+    "aws-crt-cpp",
     {
       "name": "curl",
       "platform": "!uwp & !windows"
@@ -15,6 +15,14 @@
       "name": "openssl",
       "platform": "!uwp & !windows"
     },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib"
   ],
   "default-features": [