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 GameLift Server SDK 5.1.1 Package #228

Merged
merged 26 commits into from
Dec 19, 2023
Merged

AWS GameLift Server SDK 5.1.1 Package #228

merged 26 commits into from
Dec 19, 2023

Conversation

AMZN-Gene
Copy link
Contributor

Upgrading from GameLift Server C++ SDK 5.0.0 -> 5.1.1
Fixed the build.py to work with the latest SDK's folder layout.

AMZN-Gene and others added 8 commits September 22, 2023 16:45
@AMZN-Gene
WiP. Windows upgrading to GameLift Server SDK 5.1.1
7e381c7 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@AMZN-Gene
Updating GameLift Server SDK build script to extract the entire zip. …
b93b67e 
…The GameLift download zips no longer contain all the languages (Go, etc) and just has C++ so there's no need to optimize what is extracted. Also, the GameLift cmake will download necessary 3rd parties which will be missing if we only extract sub-folders. Updating Windows script to use the recommended generator VS 2022; will need to test if building o3de using 2019 breaks

Signed-off-by: Gene Walters <genewalt@amazon.com>
@AMZN-Gene
Upgrade Linux GameLift 5.0 -> 5.1.1
9d71cf4 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@spham-amzn
Updating AWSGameLiftServerSDK linux builder to pull the correct packa…
b4230ac 
…ge name

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
@AMZN-Gene
Update Linux GameLift SDK 5.0.0 -> 5.1.1
c50d41e 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@AMZN-Gene
Copy AWSGameLift license from the proper folder
6936cb8 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@AMZN-Gene
Update GameLiftServer SDK C++ download zip package sha
665885b 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@AMZN-Gene
Copy AWSGameLift license from the proper folder
cc2ad40 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@AMZN-Gene
Merging main latest
757df11 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@AMZN-Gene
Merge lastest upstream/main
30cfbab 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@AMZN-Gene
Removed overkill type hint when creating a string in python
a633108 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@AMZN-Gene
Wrap the grep inside an if-statement to avoid exiting script upon non…
642741c 
…-zero exitcode.

Signed-off-by: Gene Walters <genewalt@amazon.com>
amzn-changml
amzn-changml approved these changes Dec 8, 2023
View reviewed changes
Copy link
Contributor

@amzn-changml amzn-changml left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you want to make Github Actions changes a separate PR? No worries otherwise, but might make it easier for people to find this change

test.sh Outdated Show resolved Hide resolved
@AMZN-Gene
Copy link
Contributor Author

Did you want to make Github Actions changes a separate PR? No worries otherwise, but might make it easier for people to find this change

Yes! #233

@AMZN-Gene
remove rogue test script
46027fe 
Signed-off-by: Gene Walters <genewalt@amazon.com>
@AMZN-Gene
Removing AWSGameLiftServerSDK-5.1.1 ARM from Linux x86 build from sou…
3e70b03 
…rce list. Building ARM on x86 is supported, but only if Docker+QEMU is setup. The QEMU step is currently being skipped

Signed-off-by: Gene Walters <genewalt@amazon.com>
@AMZN-Gene @spham-amzn
Update package_build_list_host_linux.json
c9333f9 
Co-authored-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Signed-off-by: Gene Walters <32776221+AMZN-Gene@users.noreply.github.com>
@AMZN-Gene
Copy link
Contributor Author

AMZN-Gene commented Dec 11, 2023 •
edited
Loading

Validation is failing to build a test project on linux x86
Investigating...

The error occurs while linking libaws-cpp-sdk-gamelift-server.so from inside the package-system/AWSGameLiftServerSDK/temp/build_test folder due to undefined reference to 'pthread'

libaws-cpp-sdk-gamelift-server.so is built successfully in other places up to this point.

I cannot reproduce this on my personal Linux machine this doesn't happen. libaws-cpp-sdk-gamelift-server.so builds fine in all cases. Running dependency check on libaws-cpp-sdk-gamelift-server.so (using ldd libaws-cpp-sdk-gamelift-server.so) shows
/lib/x86_64-linux-gnu/libgcc_s.so.1 which contains 'pthread'.

3p-package-source\package-system\AWSGameLiftServerSDK\test-linux.sh is what's requesting to build and run temp/build_test

Update:
Added find_package(Threads) to the test project, and it was found
Found Threads: TRUE

@AMZN-Gene
Adding cmake find_package(Threads) to (hopefully) bring in pthreads
181ae86 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@AMZN-Gene AMZN-Gene marked this pull request as draft December 12, 2023 00:57
@AMZN-Gene
Merging latest upstream main
4895876 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@AMZN-Gene AMZN-Gene marked this pull request as ready for review December 12, 2023 00:59
@AMZN-Gene
WiP. cmake stores a CMAKE_THREAD_LIBS_INIT variable for which thread …
f76ec73 
…library to use. I think this might be required higher up, in the GameLiftSDK, and not in the test, but the test is failing here (starting small)

Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@AMZN-Gene
Target lib after the exe is defined
2cebd13 
Signed-off-by: AMZN-Gene <genewalt@amazon.com>
@AMZN-Gene
Still not seeing pthreads making it into the compiler commandline. Ad…
aa2d5f1 
…ding explicit threads flag and printing a warning

Signed-off-by: Gene Walters <genewalt@amazon.com>
@AMZN-Gene
Still not seeing pthreads making it into the compiler commandline... …
045da6c 
…explicit add Threads::Threads

Signed-off-by: Gene Walters <genewalt@amazon.com>
@AMZN-Gene
oops, forgot the dep type
ac3fa54 
Signed-off-by: Gene Walters <genewalt@amazon.com>
@AMZN-Gene
Pulling in -pThread commandline arg so anyone using 3rdParty::AWSGame…
bf1f0c7 
…LiftServerSDK will pull in -pThread

Signed-off-by: Gene Walters <genewalt@amazon.com>
@AMZN-Gene
Fixed wrong target
b66c514 
Signed-off-by: Gene Walters <genewalt@amazon.com>
@AMZN-Gene
Dont duplicate target
1bc3e24 
Signed-off-by: Gene Walters <genewalt@amazon.com>
@AMZN-Gene
github workflows doesn't have native linux-arm. allow building aarch …
2a8cd40 
…on linux x86

Signed-off-by: Gene Walters <genewalt@amazon.com>
@AMZN-Gene AMZN-Gene merged commit 51bc93b into o3de:main Dec 19, 2023
8 checks passed
@AMZN-Gene AMZN-Gene deleted the AWSGameLiftServerSDK-5.1.1 branch December 19, 2023 18:50
@AMZN-Gene AMZN-Gene mentioned this pull request Jan 22, 2024
Merged
@amzn-changml amzn-changml restored the AWSGameLiftServerSDK-5.1.1 branch January 23, 2024 02:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spham-amzn spham-amzn spham-amzn approved these changes

@amzn-changml amzn-changml amzn-changml approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AMZN-Gene @amzn-changml @spham-amzn