Commit Graph

34 Commits

Author SHA1 Message Date
pappeste f1b688f435 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
#	Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
#	cmake/LYWrappers.cmake
#	cmake/SettingsRegistry.cmake
#	scripts/o3de/tests/unit_test_current_project.py
2021-05-27 10:29:19 -07:00
lumberyard-employee-dm 9a0b93c9ff Fixed generation of Monolithic builds StaticModules.inl (#947)
* Fixed generation of Monolithic builds StaticModules.inl
A project's gem module RUNTIME_DEPENDENCIES were not visited to
determine any dependent gem modules that needed to load.
Therefore the CreateStaticModules function were missing
CreateModuleClass_* function calls required initialize the gem's AZ::Module
derived class in monolithic builds

* Removed the logic to strip the Gem:: and Project:: prefix from the Server Launcher gem dependencies

When associating gem dependencies with the server target there was CMake logic left over in it to strip the beginning of the target name if it began with "Gem::" or "Project::"
2021-05-26 12:18:26 -05:00
lumberyard-employee-dm 4652d47fb3 Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere 2021-05-26 00:38:51 -05:00
lumberyard-employee-dm 76fe7f3666 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-25 23:48:55 -05:00
lumberyard-employee-dm d2a15de668 Adding support to read an "external_subdirectories" key from the
project.json when building a project.
This allows the project to build additional gems via adding the external
subdirectory in the project.json file manually
or using the `o3de.py register --external-subdirectory-path=<path>
--external_subdirectory-project-path-<project-path>` command
2021-05-24 22:56:35 -05:00
lumberyard-employee-dm c90d446735 Removing the o3de_manifest.cmake file
Removed the EngineFinder.cmake file from the Engine cmake directory as it is only needed in a Project
Added an EngineJson.cmake which reads the "external_subdirectories" list from the engine.json file and calls add_subdirectory on it
Re-ordered the population of the generated gem dependency list to prepend the dependencies before the dependent targets
2021-05-21 02:49:09 -05:00
Nicholas Lawson c9d5d7fb77 The new gem registration and usage system
Merge from mainline (Rebase)
2021-05-20 10:47:03 -07:00
lumberyard-employee-dm 73335c7160 Fixed AZ::Utils::GetHomeDirectory function for non-Windows platforms (#821)
* Fixed AZ::Utils::GetHomeDirectory function for non-Windows platforms

* Adding back missing path variable

* Fix typo in homePath variable
2021-05-19 18:05:29 -05:00
phistere f972edee01 Fixes an issue with RUNTIME_DEPENDENCIES including too many targets during install 2021-05-19 10:49:17 -05:00
pappeste 03bde5c244 getting CMakeTestbed to build again 2021-05-10 15:05:17 -07:00
pappeste 5838436e31 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
2021-05-10 14:36:20 -07:00
Colin Byrne 43b474a4b2 O3de updates restricted download (#229)
* fix project centric set current
* Adding newline to project.json template
* Adding newline to engine.json
* Changed register -this-engine to be data driven
* adding build server support
* fix log dir
* fix add remove
* fix template creation for restricted
* fix typos and descriptions
* Add newline to the end of template.json
* Adding newline to the end of assets_scan_folders.seteg
* current_project in global project that creates/edits the .o3de/Registry/bootstrap.setreg
* fix the build server flags
* fix the o3de manifest server portion
* disable project manager tests for now. Its changed too much and lytestools is not working at the moment. I will get back to this later.
* fix the Mac build config
* disable project_test, this is the project manager. It has changed too much for these tests to work at the moment. I'll get back to them

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-05-10 12:03:36 -07:00
pappeste 988daaef0b Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
2021-05-05 12:33:47 -07:00
Esteban Papp edf8ab4822 Renaming CPack.cmake to Packaging.cmake to avoid infinite recursion (Packaging.cmake includes CPack.cmake) (#533) 2021-05-03 18:55:42 -07:00
pappeste ed17d01028 making the runtime_dependencies a function so we can reuse internal functions for the install 2021-05-03 17:10:40 -07:00
Eric Phister 4485edf77d LYN-2578: Updates cmake install for 'scripts' directory. (#518)
* LYN-2578: Updates cmake install for 'scripts' directory.  Updates destination of certain binaries.
* LYN-2578: Updates to cmake install based on feedback.
2021-05-03 17:46:54 -05:00
pappeste 22b3cd6d1b Merge branch 'main' into ly-as-sdk/LYN-2948 2021-04-29 18:30:20 -07:00
pappeste 4630c82df0 Preventing certain projects from showing up in the project's solution 2021-04-28 14:05:36 -07:00
Esteban Papp 01f9d7bdc1 SPEC-6565 Cleanup paths to Tools/Python 2021-04-28 13:33:37 -07:00
Esteban Papp 5d13ad963a SPEC-6437 Dlls should go to bin instead of profile (#287)
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed

* putting dlls/exe in the right place, with the right output subdirectory

* setting runtime dependencies for the dlls that we link against

* singular target location

* code review comments/fixes

* Fixing identation
2021-04-23 14:41:18 -07:00
Scott Romero 59ccaa9495 LYN-2421: Initial CPackIFW support for Windows
Merge pull request #224 from aws-lumberyard-dev/cpack_installer
2021-04-23 10:48:09 -07:00
Esteban Papp 1c13b301fe SPEC-5070 Move ctest_scripts to scripts/ctest
* removing unused function and moving ctest_scripts to scripts/ctest

* Re-adding ebp-test

* Fixing typo that is making this test run in parallel with other tests

* Fixing hang when parameters are passed

* passing absolute path as a project

* small tweak to not print out during Python execution

* Moving the timeout to be in the build step

* Disable ebo_sanity_smoke_no_gpu

Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
2021-04-23 09:43:11 -07:00
scottr 5c354868ec [cpack_installer] moved inclusion of CPack.cmake to be for engine local builds only 2021-04-22 13:56:39 -07:00
scottr 11b2141a37 [cpack_installer] added missing trailing newline to select modified files 2021-04-21 16:36:22 -07:00
scottr 22f34d953a Merge branch 'main' into cpack_installer 2021-04-21 14:26:03 -07:00
Esteban Papp 92c77dca11 LYN-3069 Revert some 3rdparty changes and address issue (#185)
* renaming and organizing files

* removed unused files

* Removing unnecessary file

* moved file

* reverting movement of 3rdparty associations from gems to global

* removing unnecessary calls to ly_add_external_target_path

* fixing install prefix of ci_build

* Fixes to get 3rdparties declared in gems to be installed

* Allowing to install just one configuration

* Adding empty line at the end

* removing commented code

* setting IMPORETD_LOCATION_<CONFIG> and defaulting IMPORTED_LOCATION to the profile config in case other configs are not installed
2021-04-21 11:16:27 -07:00
scottr 8784314b7b Merge branch 'main' into cpack_installer 2021-04-20 14:19:26 -07:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
scottr 23c9f7ab78 [cpack_installer] initial CPack IFW support 2021-04-16 10:18:36 -07:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00