[aws-sdk-cpp] [openssl] Fix iOS build (#17338)

* Add curl try_compile parameters
Don't set compiler when compiling for iOS

* Update OpenSSL and AWS SDK for C++ port versions

* [vcpkg baseline][marble] Disable find I18n

* update version record

* Update versions/a-/aws-sdk-cpp.json

* Update versions/o-/openssl.json

* Fix port-versions after merging master branch

* Update versions/a-/aws-sdk-cpp.json

* Update versions/o-/openssl.json

* Fix merge conflicts

* Merge master branch

* Refactor OpenSSL's build script

* Refactor OpenSSL's build script

* Fix version

* Fix WASM build

* Fix version

* Fix disabled flags

* Disable treating warnings as errors

* Disable treating warnings as errors

* Fix hashes

* fix indentation

* [aws-sdk-cpp] use the powershell file to generate

* Fix versions after merging

* Fix versions after merging

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

4 files changed, 110 insertions, 8 deletions

diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake
index bd46513e4..05a4649c8 100644
--- a/ports/aws-sdk-cpp/compute_build_only.cmake
+++ b/ports/aws-sdk-cpp/compute_build_only.cmake
@@ -47,9 +47,15 @@ endif()
 if("application-insights" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY application-insights)
 endif()
+if("applicationcostprofiler" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY applicationcostprofiler)
+endif()
 if("appmesh" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY appmesh)
 endif()
+if("apprunner" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY apprunner)
+endif()
 if("appstream" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY appstream)
 endif()
@@ -293,9 +299,18 @@ endif()
 if("events" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY events)
 endif()
+if("finspace" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY finspace)
+endif()
+if("finspace-data" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY finspace-data)
+endif()
 if("firehose" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY firehose)
 endif()
+if("fis" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY fis)
+endif()
 if("fms" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY fms)
 endif()
@@ -449,6 +464,12 @@ endif()
 if("lex-models" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY lex-models)
 endif()
+if("lexv2-models" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY lexv2-models)
+endif()
+if("lexv2-runtime" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY lexv2-runtime)
+endif()
 if("license-manager" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY license-manager)
 endif()
@@ -461,6 +482,12 @@ endif()
 if("logs" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY logs)
 endif()
+if("lookoutequipment" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY lookoutequipment)
+endif()
+if("lookoutmetrics" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY lookoutmetrics)
+endif()
 if("lookoutvision" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY lookoutvision)
 endif()
@@ -512,6 +539,9 @@ endif()
 if("meteringmarketplace" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY meteringmarketplace)
 endif()
+if("mgn" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY mgn)
+endif()
 if("migrationhub-config" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY migrationhub-config)
 endif()
@@ -542,6 +572,9 @@ endif()
 if("networkmanager" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY networkmanager)
 endif()
+if("nimble" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY nimble)
+endif()
 if("opsworks" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY opsworks)
 endif()
@@ -629,6 +662,9 @@ endif()
 if("s3" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY s3)
 endif()
+if("s3-crt" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY s3-crt)
+endif()
 if("s3-encryption" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY s3-encryption)
 endif()
@@ -710,6 +746,12 @@ endif()
 if("ssm" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY ssm)
 endif()
+if("ssm-contacts" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY ssm-contacts)
+endif()
+if("ssm-incidents" IN_LIST FEATURES)
+  list(APPEND BUILD_ONLY ssm-incidents)
+endif()
 if("sso" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY sso)
 endif()
diff --git a/ports/aws-sdk-cpp/generateFeatures.ps1 b/ports/aws-sdk-cpp/generateFeatures.ps1
index 7933e327e..89265ddbd 100644
--- a/ports/aws-sdk-cpp/generateFeatures.ps1
+++ b/ports/aws-sdk-cpp/generateFeatures.ps1
@@ -1,17 +1,34 @@
 [CmdletBinding()]

 param(

-    [Parameter(Mandatory=$true)][string]$ExtractedSources,

-    [Parameter(Mandatory=$true)][string]$ManifestIn,

-    [Parameter(Mandatory=$true)][string]$ManifestOut,

-    [Parameter(Mandatory=$true)][string]$CMakeFragmentFile,

-    [Parameter(Mandatory=$false)][string]$vcpkg = "vcpkg"

+    [Parameter(Mandatory=$true)][string]$SourcesRef,

+    [Parameter(Mandatory=$false)][string]$PortDirectory = $PSScriptRoot,

+    [Parameter(Mandatory=$false)][string]$vcpkg = "$PSScriptRoot/../../vcpkg"

 )

 

 $ErrorActionPreference = "Stop"

 

+$ManifestIn = "$PortDirectory/vcpkg.in.json"

+$ManifestOut = "$PortDirectory/vcpkg.json"

+$CMakeFragmentFile = "$PortDirectory/compute_build_only.cmake"

+

+$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef"

+if (-not (Test-Path $ExtractedSources)) {

+    if (Test-Path "$ExtractedSources.tmp") {

+        Remove-Item -Force "$ExtractedSources.tmp"

+    }

+    git clone "https://github.com/aws/aws-sdk-cpp" "$ExtractedSources.tmp" | Out-Host

+    git -c "$ExtractedSources.tmp" checkout $SourcesRef

+    Move-Item "$ExtractedSources.tmp" "$ExtractedSources"

+}

+Write-Host "Using sources directory: $ExtractedSources"

+

+

 $subfolders = Get-Item $ExtractedSources\aws-cpp-sdk-*

 

 $manifest = Get-Content $ManifestIn | ConvertFrom-Json

+$manifest | Add-Member `

+    -NotePropertyName '$note' `

+    -NotePropertyValue 'Automatically generated by generateFeatures.ps1'

 $manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{}

 

 $cmakefragmenttext = @("# Automatically generated by generateFeatures.ps1")

@@ -53,4 +70,4 @@ foreach ($subfolder in $subfolders)
 Write-Verbose ($cmakefragmenttext -join "`n")

 [IO.File]::WriteAllText($CMakeFragmentFile, ($cmakefragmenttext -join "`n") +"`n")

 

-vcpkg format-manifest --feature-flags=-manifests $ManifestOut

+& $vcpkg format-manifest --feature-flags=-manifests $ManifestOut

diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json
index 5bdb4c441..fdca6ae1e 100644
--- a/ports/aws-sdk-cpp/vcpkg.in.json
+++ b/ports/aws-sdk-cpp/vcpkg.in.json
@@ -1,7 +1,7 @@
 {
   "name": "aws-sdk-cpp",
   "version": "1.8.126",
-  "port-version": 8,
+  "port-version": 10,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "dependencies": [
diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
index 2ebe3c89f..6446f89ea 100644
--- a/ports/aws-sdk-cpp/vcpkg.json
+++ b/ports/aws-sdk-cpp/vcpkg.json
@@ -1,7 +1,8 @@
 {
+  "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
   "version": "1.8.126",
-  "port-version": 9,
+  "port-version": 10,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "dependencies": [
@@ -70,9 +71,15 @@
     "application-insights": {
       "description": "C++ SDK for the AWS application-insights service"
     },
+    "applicationcostprofiler": {
+      "description": "C++ SDK for the AWS applicationcostprofiler service"
+    },
     "appmesh": {
       "description": "C++ SDK for the AWS appmesh service"
     },
+    "apprunner": {
+      "description": "C++ SDK for the AWS apprunner service"
+    },
     "appstream": {
       "description": "C++ SDK for the AWS appstream service"
     },
@@ -316,9 +323,18 @@
     "events": {
       "description": "C++ SDK for the AWS events service"
     },
+    "finspace": {
+      "description": "C++ SDK for the AWS finspace service"
+    },
+    "finspace-data": {
+      "description": "C++ SDK for the AWS finspace-data service"
+    },
     "firehose": {
       "description": "C++ SDK for the AWS firehose service"
     },
+    "fis": {
+      "description": "C++ SDK for the AWS fis service"
+    },
     "fms": {
       "description": "C++ SDK for the AWS fms service"
     },
@@ -472,6 +488,12 @@
     "lex-models": {
       "description": "C++ SDK for the AWS lex-models service"
     },
+    "lexv2-models": {
+      "description": "C++ SDK for the AWS lexv2-models service"
+    },
+    "lexv2-runtime": {
+      "description": "C++ SDK for the AWS lexv2-runtime service"
+    },
     "license-manager": {
       "description": "C++ SDK for the AWS license-manager service"
     },
@@ -484,6 +506,12 @@
     "logs": {
       "description": "C++ SDK for the AWS logs service"
     },
+    "lookoutequipment": {
+      "description": "C++ SDK for the AWS lookoutequipment service"
+    },
+    "lookoutmetrics": {
+      "description": "C++ SDK for the AWS lookoutmetrics service"
+    },
     "lookoutvision": {
       "description": "C++ SDK for the AWS lookoutvision service"
     },
@@ -535,6 +563,9 @@
     "meteringmarketplace": {
       "description": "C++ SDK for the AWS meteringmarketplace service"
     },
+    "mgn": {
+      "description": "C++ SDK for the AWS mgn service"
+    },
     "migrationhub-config": {
       "description": "C++ SDK for the AWS migrationhub-config service"
     },
@@ -565,6 +596,9 @@
     "networkmanager": {
       "description": "C++ SDK for the AWS networkmanager service"
     },
+    "nimble": {
+      "description": "C++ SDK for the AWS nimble service"
+    },
     "opsworks": {
       "description": "C++ SDK for the AWS opsworks service"
     },
@@ -652,6 +686,9 @@
     "s3": {
       "description": "C++ SDK for the AWS s3 service"
     },
+    "s3-crt": {
+      "description": "C++ SDK for the AWS s3-crt service"
+    },
     "s3-encryption": {
       "description": "C++ SDK for the AWS s3-encryption service"
     },
@@ -733,6 +770,12 @@
     "ssm": {
       "description": "C++ SDK for the AWS ssm service"
     },
+    "ssm-contacts": {
+      "description": "C++ SDK for the AWS ssm-contacts service"
+    },
+    "ssm-incidents": {
+      "description": "C++ SDK for the AWS ssm-incidents service"
+    },
     "sso": {
       "description": "C++ SDK for the AWS sso service"
     },