Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AWS C++ SDK 1.11.144 (Sans Android) #218

Merged
merged 15 commits into from
Nov 2, 2023
Merged

AWS C++ SDK 1.11.144 (Sans Android) #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
74c7a46
AWS C++ SDK upgrade 1.9->1.11 in order to support GameLift 5.1.1
AMZN-Gene Sep 14, 2023
af00f27
Updated for Linux/Android/iOS
AMZN-Gene Sep 18, 2023
1997edd
Turn off AWS c++ sdk legacy cmake for linux
AMZN-Gene Sep 19, 2023
22ccbfb
Pointing Linux AWS SDK to 1.11
AMZN-Gene Sep 19, 2023
1f52879
Fix linux errors related to the new AWS SDK's handling of Find* libra…
spham-amzn Sep 19, 2023
50ee1bc
Turn off RTTI for Linux
spham-amzn Sep 19, 2023
eb6f6b7
Update Mac/iOS configurations
spham-amzn Sep 19, 2023
6789ead
Disabling RTTI for Mac
spham-amzn Sep 19, 2023
2b9e659
ENABLE_RTTI=OFF for Windows AWSSDK
AMZN-Gene Sep 20, 2023
39aedaa
Re-enable RTTI for Linux
spham-amzn Sep 20, 2023
f1e741b
Update AWS SDK package to 1.11 for linux aarch64
spham-amzn Sep 20, 2023
67b4dea
Keeping Android at AWS SDK 1.9.50 due to bug: https://github.com/aws/…
AMZN-Gene Sep 21, 2023
194b447
Enable RTTI
AMZN-Gene Sep 21, 2023
b90ae82
Leaving a cmake code comment where AWS Mobile Analytics used to exist…
AMZN-Gene Oct 9, 2023
5538268
Properly use variable refernce inside cmake using instead of .
AMZN-Gene Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-ios.patch
View file
Open in desktop

This file was deleted.

125 changes: 0 additions & 125 deletions package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-linux-openssl3.patch
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions package-system/AWSNativeSDK/AWSNativeSDK-1.9.50-windows.patch
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions package-system/AWSNativeSDK/FindAWSNativeSDK.cmake.Linux
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading