From d82378b904ec1b59750df7f2296337f09601c0cf Mon Sep 17 00:00:00 2001 From: AMZN-Gene Date: Tue, 13 Feb 2024 16:25:47 -0800 Subject: [PATCH] Update to AWSSDK 1.11.264 Signed-off-by: AMZN-Gene --- package-system/AWSNativeSDK/build_config.json | 17 ++++++++--------- package_build_list_host_darwin.json | 8 ++++---- package_build_list_host_linux-aarch64.json | 4 ++-- package_build_list_host_linux.json | 8 ++++---- package_build_list_host_windows.json | 8 ++++---- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/package-system/AWSNativeSDK/build_config.json b/package-system/AWSNativeSDK/build_config.json index 864cc479..1e1c84fc 100644 --- a/package-system/AWSNativeSDK/build_config.json +++ b/package-system/AWSNativeSDK/build_config.json @@ -1,8 +1,8 @@ { "git_url":"https://github.com/aws/aws-sdk-cpp.git", - "git_tag":"1.11.144", + "git_tag":"1.11.264", "package_name":"AWSNativeSDK", - "package_version":"1.11.144-rev1", + "package_version":"1.11.264-rev1", "package_url":"https://github.com/aws/aws-sdk-cpp", "package_license":"Apache-2.0", "package_license_file":"LICENSE", @@ -12,7 +12,7 @@ "Platforms":{ "Windows":{ "Windows":{ - "package_version":"1.11.144-rev1", + "package_version":"1.11.264-rev1", "cmake_find_source":"FindAWSNativeSDK.cmake.Windows", "custom_build_cmd": [ "build_AWSNativeSDK_windows.cmd" @@ -22,12 +22,11 @@ ] }, "Android":{ - "package_version":"1.9.50-rev2", + "package_version":"1.11.264-rev1", "depends_on_packages": [ [ "OpenSSL-1.1.1m-rev1-android", "b11fe493af5d6b03ebbf1a2c97fea443b125e88def5cd1c32b854220b3ad4681", "" ], [ "zlib-1.2.11-rev5-android", "73c9e88892c237a3fc6eafc04268ccd9d479e6d55f9df2ed58b236c8f9cf2cae", "" ] ], - "patch_file":"AWSNativeSDK-1.9.50-android.patch", "cmake_find_source":"FindAWSNativeSDK.cmake.Android", "custom_build_cmd": [ "build_AWSNativeSDK_android.cmd" @@ -63,11 +62,11 @@ [ "OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", "" ], [ "zlib-1.2.11-rev5-linux", "9be5ea85722fc27a8645a9c8a812669d107c68e6baa2ca0740872eaeb6a8b0fc", "" ] ], - "package_version":"1.11.144-rev1", + "package_version":"1.11.264-rev1", "cmake_find_source":"FindAWSNativeSDK.cmake.Linux", "custom_build_cmd": [ "./build-linux.sh", - "aws_native_sdk_1_11_144", + "aws_native_sdk_1_11_264", "20.04", "curl-7_68_0", "x86_64" @@ -81,11 +80,11 @@ [ "OpenSSL-1.1.1t-rev1-linux-aarch64", "f32721bec9c82d1bd7fb244d78d5dc4e2a47e7b808bb36027236ad377e241ea5", "" ], [ "zlib-1.2.11-rev5-linux-aarch64", "ce9d1ed2883d77ffc69c7982c078595c1f89ca55ec19d89fe7e6beb05f774775", "" ] ], - "package_version":"1.11.144-rev1", + "package_version":"1.11.264-rev1", "cmake_find_source":"FindAWSNativeSDK.cmake.Linux", "custom_build_cmd": [ "./build-linux.sh", - "aws_native_sdk_1_11_144", + "aws_native_sdk_1_11_264", "20.04", "curl-7_68_0", "aarch64" diff --git a/package_build_list_host_darwin.json b/package_build_list_host_darwin.json index bbb90e24..2db9c2f6 100644 --- a/package_build_list_host_darwin.json +++ b/package_build_list_host_darwin.json @@ -5,8 +5,8 @@ "comment4" : "Note: Build from source occurs before build_from_folder", "build_from_source": { "assimp-5.2.5-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Mac --package-root ../../package-system --clean", - "AWSNativeSDK-1.11.144-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean", - "AWSNativeSDK-1.11.144-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean", + "AWSNativeSDK-1.11.264-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean", + "AWSNativeSDK-1.11.264-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean", "Lua-5.4.4-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Mac --package-root ../../package-system/Lua/temp --clean", "Lua-5.4.4-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name iOS --package-root ../../package-system/Lua/temp --clean", "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Mac --package-root ../../package-system --clean", @@ -56,8 +56,8 @@ }, "build_from_folder": { "assimp-5.2.5-rev1-mac": "package-system/assimp-mac", - "AWSNativeSDK-1.11.144-rev1-mac": "package-system/AWSNativeSDK-mac", - "AWSNativeSDK-1.11.144-rev1-ios": "package-system/AWSNativeSDK-ios", + "AWSNativeSDK-1.11.264-rev1-mac": "package-system/AWSNativeSDK-mac", + "AWSNativeSDK-1.11.264-rev1-ios": "package-system/AWSNativeSDK-ios", "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "package-system/AwsIotDeviceSdkCpp-mac", "Lua-5.4.4-rev1-mac": "package-system/Lua/temp/Lua-mac", "Lua-5.4.4-rev1-ios": "package-system/Lua/temp/Lua-ios", diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json index 3d79eaa6..7e9bfc16 100644 --- a/package_build_list_host_linux-aarch64.json +++ b/package_build_list_host_linux-aarch64.json @@ -8,7 +8,7 @@ "astc-encoder-3.2-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Linux-aarch64 --clean", "AWSGameLiftServerSDK-5.1.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux-aarch64 --clean", "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux-aarch64 --clean", - "AWSNativeSDK-1.11.144-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean", + "AWSNativeSDK-1.11.264-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean", "azslc-1.8.19-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Linux-aarch64 --clean", "cityhash-1.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/cityhash --platform-name Linux-aarch64 --clean", "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux-aarch64 --clean", @@ -49,7 +49,7 @@ "astc-encoder-3.2-rev3-linux-aarch64": "package-system/astc-encoder/temp/astc-encoder-linux-aarch64", "AWSGameLiftServerSDK-5.1.1-rev1-linux-aarch64": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux-aarch64", "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "package-system/AwsIotDeviceSdkCpp/temp/AwsIotDeviceSdkCpp-linux-aarch64", - "AWSNativeSDK-1.11.144-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64", + "AWSNativeSDK-1.11.264-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64", "azslc-1.8.19-rev1-linux-aarch64": "package-system/azslc/temp/azslc-linux-aarch64", "cityhash-1.1-rev1-linux-aarch64": "package-system/cityhash/temp/cityhash-linux-aarch64", "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-linux-aarch64": "package-system/DirectXShaderCompiler/temp/DirectXShaderCompilerDxc-linux-aarch64", diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json index cb3b08cb..62a896a8 100644 --- a/package_build_list_host_linux.json +++ b/package_build_list_host_linux.json @@ -7,8 +7,8 @@ "assimp-5.2.5-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Linux --package-root ../../package-system --clean", "AWSGameLiftServerSDK-5.1.1-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux --clean", "AWSGameLiftServerSDK-5.1.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux-aarch64 --clean", - "AWSNativeSDK-1.11.144-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --clean", - "AWSNativeSDK-1.11.144-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean", + "AWSNativeSDK-1.11.264-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --clean", + "AWSNativeSDK-1.11.264-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-aarch64 --clean", "cityhash-1.1-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/cityhash --platform-name Linux --clean", "Lua-5.4.4-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Linux --package-root ../../package-system/Lua/temp --clean", "AwsIotDeviceSdkCpp-1.15.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux --package-root ../../package-system --clean", @@ -54,8 +54,8 @@ "assimp-5.2.5-rev1-linux": "package-system/assimp-linux", "AWSGameLiftServerSDK-5.1.1-rev1-linux": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux", "AWSGameLiftServerSDK-5.1.1-rev1-linux-aarch64": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux-aarch64", - "AWSNativeSDK-1.11.144-rev1-linux": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux", - "AWSNativeSDK-1.11.144-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64", + "AWSNativeSDK-1.11.264-rev1-linux": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux", + "AWSNativeSDK-1.11.264-rev1-linux-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-aarch64", "cityhash-1.1-rev1-linux": "package-system/cityhash/temp/cityhash-linux", "Lua-5.4.4-rev1-linux": "package-system/Lua/temp/Lua-linux", "AwsIotDeviceSdkCpp-1.15.2-rev1-linux": "package-system/AwsIotDeviceSdkCpp-linux", diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json index 9ddd3a75..9873b290 100644 --- a/package_build_list_host_windows.json +++ b/package_build_list_host_windows.json @@ -9,8 +9,8 @@ "azslc-1.8.19-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Windows --package-root ../../package-system/azslc/temp --clean", "AWSGameLiftServerSDK-5.1.1-rev1-windows": "package-system/AWSGameLiftServerSDK/build_package_image.py --platform-name windows", "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Windows --package-root ../../package-system --clean", - "AWSNativeSDK-1.9.50-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean", - "AWSNativeSDK-1.11.144-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean", + "AWSNativeSDK-1.11.264-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean", + "AWSNativeSDK-1.11.264-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean", "Blast-v1.1.7_rc2-9-geb169fe-rev2-windows": "package-system/Blast/build_package_image.py --platform-name windows", "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad/build_package_image.py", "DirectXShaderCompilerDxc-1.7.2308-o3de-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean", @@ -71,8 +71,8 @@ "azslc-1.8.19-rev1-windows": "package-system/azslc/temp/azslc-windows", "AWSGameLiftServerSDK-5.1.1-rev1-windows": "package-system/AWSGameLiftServerSDK-windows", "AwsIotDeviceSdkCpp-1.15.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows", - "AWSNativeSDK-1.9.50-rev2-android": "package-system/AWSNativeSDK-android", - "AWSNativeSDK-1.11.144-rev1-windows": "package-system/AWSNativeSDK-windows", + "AWSNativeSDK-1.11.264-rev1-android": "package-system/AWSNativeSDK-android", + "AWSNativeSDK-1.11.264-rev1-windows": "package-system/AWSNativeSDK-windows", "Blast-v1.1.7_rc2-9-geb169fe-rev1-windows": "package-system/Blast-windows", "cityhash-1.1-multiplatform": "package-system/cityhash-multiplatform", "civetweb-1.8-rev1-windows": "package-system/civetweb-windows",