Commit Graph

275 Commits

Author SHA1 Message Date
jonawals b00f569090 Address PR comments 2021-06-06 19:09:24 +01:00
jonawals ac42a9a748 Changes for read-only runs and new test suites 2021-06-04 19:33:26 +01:00
jonawals 7eb6e0e7d5 Merge branch 'main' into TIF/Runtime 2021-06-03 12:36:34 +01:00
Esteban Papp f1dbeb584a LYN-4206 CMake bakes install prefix during configure (#1100) 2021-06-02 16:50:18 -07:00
Esteban Papp 1f65c3ba3a LYN-4134 Automatically add --project-path=<project> to debugging parameters in Editor/AP for engine-centric (#1081) 2021-06-02 09:13:04 -07:00
Nicholas Lawson 01f69acc5f Cleans up remaining 3p package todos (#1080)
Removes Clang
Adds a required LICENSE.TXT to the folder of glad in atom.
2021-06-02 07:38:39 -07:00
Steve Pham bf0df4b369 Add Android 'gradle' job as a default job (#1082)
* Add Android 'gradle' job as a default job

* Replace warning about version checking type with string preprocessing of the captured version before comparisons
2021-06-01 16:37:30 -07:00
Esteban Papp 7d1fedc10c LYN-4128 EditorPythonBindings.Editor in debug does not load (missing python_d.dll) 2021-06-01 08:29:35 -07:00
Steve Pham 74ec7a362b Update Android Project Generation to support AGP 4.2.0, Cmake 3.20, and newer versions of NDK&SDK
- build.gradle format updates for newer Android Gradle Plugin
- Remove hard coded Android Gradle Plugin version 3.6.4 to be passed in from command args
- Set Android Gradle Plugin min version 4.2.0 in order to support Min CMake version 3.20
- Add ability to use the android sdk to install missing components if needed rather than doing it externally
- Removed argument to pass in the NDK folder to use the android, use the android-sdk instead. Can request specific NDK versions if possible
- Android Gradle Plugin has dependencies by version and is being managed
- More defaults based on tools on path, agp version made possible so they are no longer needed in the command args
2021-05-28 23:24:51 -07:00
Esteban Papp ff9a052ce6 Merge pull request #1011 from aws-lumberyard-dev/ly-as-sdk/LYN-2948
Integration of the LY as an SDK work
2021-05-28 11:30:13 -07:00
moudgils b80e5c3e1f Merge pull request #1029 from aws-lumberyard-dev/FixIosApp
Fix ios app
2021-05-28 10:43:19 -07:00
moudgils 2b35ed1d7f Fixes to get monolithic builds working for ios 2021-05-28 08:50:27 -07:00
pappeste 8b9f5230f6 Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-28 00:16:26 -07:00
pappeste 69e79867be Making imported targets global, fixing identiation of the enabled_gems.cmake file 2021-05-27 20:12:48 -07:00
pappeste 32b620501d Fix some cross dependencies between client and non-client gems 2021-05-27 18:33:28 -07:00
pappeste d1a2eed40c Fix identiation issues 2021-05-27 17:26:25 -07:00
lumberyard-employee-dm fee4bbdd5f Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 18:41:42 -05:00
lumberyard-employee-dm da147f273d Adding VERBOSE messages to the SettingsRegistry.cmake 'ly_get_gem_load_dependencies()' function which logs the gem target to it's load dependencies 2021-05-27 18:41:28 -05:00
lumberyard-employee-dm c67cd2dc4e Renaming the TargetCMakeLists.txt.in to InstalledTarget.in to get avoid it being picked up by the CopyrightValidator 2021-05-27 17:35:08 -05:00
pappeste d6cfa68333 Reverting error check and comment 2021-05-27 15:04:17 -07:00
Scott Romero 3198e50c72 [main] post install hook to configure cmake and python
Merge pull request #971 from aws-lumberyard-dev/cpack_installer
2021-05-27 14:14:12 -07:00
lumberyard-employee-dm f6568f5c63 Re-added back an ly_setup_target function which configures the CMakeLists.txt template for a single target 2021-05-27 13:10:54 -07:00
lumberyard-employee-dm 18e479589d Updating the Install_common.cmake ly_setup_o3de_install() function to be
able forward all the ly_add_targets calls within a single source Engine
CMakeLists.txt to a single installed Engine CMakeLists.txt
2021-05-27 12:19:49 -07:00
pappeste 01933f45b1 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json
2021-05-27 10:39:37 -07:00
pappeste cba5c35de5 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-27 10:30:28 -07:00
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
Steve Pham 600f97a46c Updating DirectXShaderCompiler 3P Packages to use built-from-source version (#976) 2021-05-27 09:41:45 -07:00
scottr 301bfe3486 [cpack_installer] replaced raw file(DOWNLOAD ...) for download_file() utility 2021-05-26 22:03:46 -07:00
lumberyard-employee-dm 5b8e759c2d Implemented changes in the ly_setup_target() command to forward the ly_create_alias() command calls to the configured CMakeLists.txt per installed target 2021-05-26 23:59:49 -05:00
scottr 86035104b9 Merge branch 'main' into cpack_installer 2021-05-26 20:20:47 -07:00
scottr 883ddf667e [cpack_installer] removed static cmake package in favor of using file(DOWNLOAD ...) 2021-05-26 20:19:42 -07:00
lumberyard-employee-dm 84cf3bffde Updating the Install_common.cmake script to copy over the source engine.json templates array to the generated installed engine.json 2021-05-26 20:49:52 -05:00
Terry Michaels 9b1be43367 Renamed osx_gl to mac and es3 to android for cache folders (#949) 2021-05-26 19:17:17 -05:00
scottr cccb68fa38 [cpack_installer] revert accidental debug change committed 2021-05-26 16:21:04 -07:00
scottr ba2da96cdb Merge branch 'main' into cpack_installer 2021-05-26 16:16:37 -07:00
scottr 2ba645c264 [cpack_installer] post install hooks to install cmake and python 2021-05-26 16:13:14 -07:00
pappeste 2c4ab59ee5 clearing variable 2021-05-26 14:38:26 -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
SJ 8ca3b078a2 Remove bootstrap.cfg and some references to it.
Merge pull request #836 from aws-lumberyard-dev/LYN-2461
2021-05-26 09:32:57 -07:00
pappeste c3e605e6c2 Fixing call to ly_de_alias_target 2021-05-26 09:12:08 -07: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
Steve Pham 6136bc270e Remove flaky test from AzNetwork instead of using retry
- Remove '--repeat until-pass' from profile test ctest argument
- Moved flaky TCP tests from main googletest suite to sandbox
- Added 'TARGET' to 'ly_add_googletest' to support adding the same module to multiple tests or adding a test that is not named the same as the module
- Fix minor bug in ly_add_googletest
2021-05-25 16:05:40 -07:00
lumberyard-employee-dm d536a9438d Revert "Fixes an issue with RUNTIME_DEPENDENCIES including too many targets during install"
This reverts commit f972edee01.
2021-05-25 17:36:16 -05:00
lumberyard-employee-dm d3835699ea Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-25 17:17:55 -05:00
pappeste 19adbf2f41 Removing adding runtime dependencies for gems that are in the BUILD_DEPENDENCIES 2021-05-25 15:12:17 -07:00
Scott Romero e765a43eda [main] fixes #871 - external project configure failure
Merge pull request #895 from aws-lumberyard-dev/ext_project_packaging_fix
2021-05-25 09:26:21 -07: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
pappeste bff7d39f68 passing imported for executables 2021-05-24 16:21:29 -07:00
lumberyard-employee-dm 21285809bf Adding back gem.json files to the Atom and AtomLyIntegration folders
which are to be seen as sub gem roots as a workaround for detecting the
location of the "gem" root for the Atom/AtomLyIntegration GEM_MODULE targets

Removed the logic in the SettingsRegistry.cmake for reading a
"gem_module_roots" key from the gem.json file in order to determine the
root of the Atom and Atom LyIntegration sub gem modules
2021-05-24 13:02:23 -05:00