Skip to content

Commit

Permalink
AWS C++ SDK 1.11.144 (Sans Android) (o3de#218)
Browse files Browse the repository at this point in the history
AWS C++ SDK upgrade from 1.9 to 1.11 in order to support GameLift 5.1.1
Leaving Android back at 1.9 due to a bug: [Errors when building for
Android · Issue #2452 · aws/aws-sdk-cpp
(github.com)](aws/aws-sdk-cpp#2452)

AWS MobileAnalytics no longer exists and was replaced by AWS Pinpoint.
Removing MobileAnalytics and can bring back AWS Pinpoint at a later date
if desired.

Pass AWSCore.Tests
Pass AWSClientAuth.Tests
Pass AWSGameLift.Client.Tests
Pass AWSGameLift.Server.Tests
Pass AWSMetrics.Tests

Deployed GameLift server on Windows and Linux
  • Loading branch information
AMZN-Gene authored Nov 2, 2023
2 parents a8019a5 + 5538268 commit 7901137
Show file tree
Hide file tree
Showing 17 changed files with 44 additions and 249 deletions.
40 changes: 0 additions & 40 deletions package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-ios.patch

This file was deleted.

125 changes: 0 additions & 125 deletions package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-linux-openssl3.patch

This file was deleted.

26 changes: 0 additions & 26 deletions package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-windows.patch

This file was deleted.

8 changes: 2 additions & 6 deletions package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Linux
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ set(CORE_STATIC_LIBS
${AWSNATIVE_SDK_LIB_PATH}/libaws-c-compression.a
${AWSNATIVE_SDK_LIB_PATH}/libaws-c-cal.a
${AWSNATIVE_SDK_LIB_PATH}/libaws-c-common.a
${AWSNATIVE_SDK_LIB_PATH}/libaws-c-sdkutils.a
${AWSNATIVE_SDK_LIB_PATH}/libs2n.a
${AWSNATIVE_SDK_LIB_PATH}/libcurl.a
)
Expand Down Expand Up @@ -188,12 +189,7 @@ ly_declare_aws_library(
)

#### MobileAnalytics ####
ly_declare_aws_library(
NAME
MobileAnalytics
LIB_FILE
aws-cpp-sdk-mobileanalytics
)
# MobileAnalytics library no longer exists and should be replaced with AWS PinPoint or other equivalent API

#### Queues ####
ly_declare_aws_library(
Expand Down
7 changes: 1 addition & 6 deletions package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Mac
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,7 @@ ly_declare_aws_library(
)

#### MobileAnalytics ####
ly_declare_aws_library(
NAME
MobileAnalytics
LIB_FILE
aws-cpp-sdk-mobileanalytics
)
# MobileAnalytics library no longer exists and should be replaced with AWS PinPoint or other equivalent API

#### Queues ####
ly_declare_aws_library(
Expand Down
9 changes: 3 additions & 6 deletions package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Windows
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ set(CORE_STATIC_LIBS
${AWSNATIVE_SDK_LIB_PATH}/aws-c-compression.lib
${AWSNATIVE_SDK_LIB_PATH}/aws-c-cal.lib
${AWSNATIVE_SDK_LIB_PATH}/aws-c-common.lib
${AWSNATIVE_SDK_LIB_PATH}/aws-c-sdkutils.lib
Ncrypt
Secur32
Shlwapi
Expand All @@ -120,6 +121,7 @@ set(CORE_SHARED_LIBS
${AWSNATIVE_SDK_LIB_PATH}/aws-c-compression.dll
${AWSNATIVE_SDK_LIB_PATH}/aws-c-cal.dll
${AWSNATIVE_SDK_LIB_PATH}/aws-c-common.dll
${AWSNATIVE_SDK_LIB_PATH}/aws-c-sdkutils.dll
)

if(LY_MONOLITHIC_GAME)
Expand Down Expand Up @@ -217,12 +219,7 @@ ly_declare_aws_library(
)

#### MobileAnalytics ####
ly_declare_aws_library(
NAME
MobileAnalytics
LIB_FILE
aws-cpp-sdk-mobileanalytics
)
# MobileAnalytics library no longer exists and should be replaced with AWS PinPoint or other equivalent API

#### Queues ####
ly_declare_aws_library(
Expand Down
7 changes: 1 addition & 6 deletions package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.iOS
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,7 @@ ly_declare_aws_library(
)

#### MobileAnalytics ####
ly_declare_aws_library(
NAME
MobileAnalytics
LIB_FILE
aws-cpp-sdk-mobileanalytics
)
# MobileAnalytics library no longer exists and should be replaced with AWS PinPoint or other equivalent API

#### Queues ####
ly_declare_aws_library(
Expand Down
4 changes: 2 additions & 2 deletions package-system/AWSNativeSDK/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Modify AWSNativeSDK build script by adding ElasticSearch as a build target. The
-DTARGET_ARCH=WINDOWS ^
-DCMAKE_CXX_STANDARD=17 ^
-DCPP_STANDARD=17 ^
- -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" ^
+ -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;es;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" ^
- -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" ^
+ -DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;es;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" ^
-DENABLE_TESTING=OFF ^
-DENABLE_RTTI=ON ^
-DCUSTOM_MEMORY_MANAGEMENT=ON ^
Expand Down
2 changes: 1 addition & 1 deletion package-system/AWSNativeSDK/build_AWSNativeSDK_ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ configure_and_build_static() {
-DENABLE_TESTING=OFF \
-DENABLE_RTTI=ON \
-DCUSTOM_MEMORY_MANAGEMENT=ON \
-DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" \
-DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_BUILD_TYPE=$build_type \
-DCURL_LIBRARY="temp/curl_install/lib/libcurl.a" \
Expand Down
4 changes: 2 additions & 2 deletions package-system/AWSNativeSDK/build_AWSNativeSDK_mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ configure_and_build() {
fi

echo "CMake Configure $build_type $lib_type"
CFLAGS="-Wno-deprecated-declarations -fPIC" CXXFLAGS="-Wno-deprecated-declarations -fPIC" cmake -S "$src_path" -B "$bld_path/${build_type}_${lib_type}" \
CFLAGS="-Wno-deprecated-declarations -Wno-shorten-64-to-32 -fPIC" CXXFLAGS="-Wno-deprecated-declarations -Wno-shorten-64-to-32 -fPIC" cmake -S "$src_path" -B "$bld_path/${build_type}_${lib_type}" \
-G "Xcode" \
-DTARGET_ARCH=APPLE \
-DCMAKE_OSX_ARCHITECTURES="x86_64" \
Expand All @@ -33,7 +33,7 @@ configure_and_build() {
-DENABLE_TESTING=OFF \
-DENABLE_RTTI=ON \
-DCUSTOM_MEMORY_MANAGEMENT=ON \
-DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" \
-DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" \
-DBUILD_SHARED_LIBS=$build_shared \
-DCMAKE_BUILD_TYPE=$build_type \
-DCMAKE_INSTALL_BINDIR="bin" \
Expand Down
7 changes: 4 additions & 3 deletions package-system/AWSNativeSDK/build_AWSNativeSDK_windows.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,21 @@ IF %LIB_TYPE% EQU Shared (
)
ECHO "CMake Configure %BUILD_TYPE% %LIB_TYPE%"
call cmake -S %SRC_PATH% -B %BLD_PATH%\%BUILD_TYPE%_%LIB_TYPE% ^
-G "Visual Studio 16 2019" ^
-G "Visual Studio 17 2022" ^
-A x64 ^
-DTARGET_ARCH=WINDOWS ^
-DCMAKE_CXX_STANDARD=17 ^
-DCPP_STANDARD=17 ^
-DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;mobileanalytics;queues;s3;sns;sqs;sts;transfer" ^
-DBUILD_ONLY="access-management;cognito-identity;cognito-idp;core;devicefarm;dynamodb;gamelift;identity-management;kinesis;lambda;queues;s3;sns;sqs;sts;transfer" ^
-DENABLE_TESTING=OFF ^
-DENABLE_RTTI=ON ^
-DCUSTOM_MEMORY_MANAGEMENT=ON ^
-DFORCE_SHARED_CRT=ON ^
-DBUILD_SHARED_LIBS=%BUILD_SHARED% ^
-DCMAKE_BUILD_TYPE="%BUILD_TYPE%" ^
-DCMAKE_INSTALL_BINDIR="bin" ^
-DCMAKE_INSTALL_LIBDIR="lib"
-DCMAKE_INSTALL_LIBDIR="lib" ^
-DLEGACY_MODE=OFF
IF %ERRORLEVEL% NEQ 0 (
ECHO "CMake Configure %BUILD_TYPE% %LIB_TYPE% failed"
exit /b 1
Expand Down
18 changes: 7 additions & 11 deletions package-system/AWSNativeSDK/build_config.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"git_url":"https://github.com/aws/aws-sdk-cpp.git",
"git_tag":"1.9.50",
"git_tag":"1.11.144",
"package_name":"AWSNativeSDK",
"package_version":"1.9.50-rev1",
"package_version":"1.11.144-rev1",
"package_url":"https://github.com/aws/aws-sdk-cpp",
"package_license":"Apache-2.0",
"package_license_file":"LICENSE",
Expand All @@ -12,8 +12,7 @@
"Platforms":{
"Windows":{
"Windows":{
"package_version":"1.9.50-rev2",
"patch_file":"AWSNativeSDK-1.9.50-windows.patch",
"package_version":"1.11.144-rev1",
"cmake_find_source":"FindAWSNativeSDK.cmake.Windows",
"custom_build_cmd": [
"build_AWSNativeSDK_windows.cmd"
Expand Down Expand Up @@ -49,7 +48,6 @@
]
},
"iOS":{
"patch_file":"AWSNativeSDK-1.9.50-ios.patch",
"cmake_find_source":"FindAWSNativeSDK.cmake.iOS",
"custom_build_cmd": [
"./build_AWSNativeSDK_ios.sh"
Expand All @@ -65,12 +63,11 @@
[ "OpenSSL-1.1.1t-rev1-linux", "63aea898b7afe8faccd0c7261e62d2f8b7b870f678a4520d5be81e5815542b39", "" ],
[ "zlib-1.2.11-rev5-linux", "9be5ea85722fc27a8645a9c8a812669d107c68e6baa2ca0740872eaeb6a8b0fc", "" ]
],
"package_version":"1.9.50-rev4",
"patch_file":"AWSNativeSDK-1.9.50-linux-openssl3.patch",
"package_version":"1.11.144-rev1",
"cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
"custom_build_cmd": [
"./build-linux.sh",
"aws_native_sdk_1_9_50",
"aws_native_sdk_1_11_144",
"20.04",
"curl-7_68_0",
"x86_64"
Expand All @@ -84,12 +81,11 @@
[ "OpenSSL-1.1.1t-rev1-linux-aarch64", "f32721bec9c82d1bd7fb244d78d5dc4e2a47e7b808bb36027236ad377e241ea5", "" ],
[ "zlib-1.2.11-rev5-linux-aarch64", "ce9d1ed2883d77ffc69c7982c078595c1f89ca55ec19d89fe7e6beb05f774775", "" ]
],
"package_version":"1.9.50-rev4",
"patch_file":"AWSNativeSDK-1.9.50-linux-openssl3.patch",
"package_version":"1.11.144-rev1",
"cmake_find_source":"FindAWSNativeSDK.cmake.Linux",
"custom_build_cmd": [
"./build-linux.sh",
"aws_native_sdk_1_9_50",
"aws_native_sdk_1_11_144",
"20.04",
"curl-7_68_0",
"aarch64"
Expand Down
Loading

0 comments on commit 7901137

Please sign in to comment.