Commit Graph

1943 Commits

Author SHA1 Message Date
lumberyard-employee-dm d3fb2dd68c Removed the add_external_subdirectory and add_gem_cmake python scripts
as well as their remove counterparts.

Updated teh register.py script to be able to register subdirectories to
the o3de_manifest.json
Also added the ability to register external subdirectories to the
project.json if the --external-subdirectory-project-path is supplied
Added the ability to register external subdirectories to the engine.json
if the --external-subdirector-engine-path is supplied
2021-05-24 22:49:37 -05:00
lumberyard-employee-dm 76985602ce Remove commented out logic from the DefaultProject CMakeLists.txt 2021-05-24 15:57:01 -05:00
lumberyard-employee-dm 1a95b96985 Fixed importing of o3de package modules within the o3de.py script when a relative path is used to invoke it 2021-05-24 13:06:43 -05: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
lumberyard-employee-dm 57bdc58c68 Renamed the unit_test_registration.py script to be unit_test_register.py to be inline with the register.py script 2021-05-24 00:49:00 -05:00
lumberyard-employee-dm b99bcea24a Updating the engine.json.in template for the cmake INSTALL target to add the list of external subdirectories to allow the installed layout to access the subdirectories via it's engine.json file 2021-05-24 00:43:21 -05:00
lumberyard-employee-dm 911ad84e53 Updating the exclusion rule for the install folder to only include an install folder at the root of the repo 2021-05-23 23:26:31 -05:00
lumberyard-employee-dm d004365e27 Updating the generation for the
cmake_dependencies.<prefix>.<target>.setreg files to detect the nearest
gem module root for a cmake target that has been marked with the
GEM_MODULE property.
The list of gem module roots are made up of the gem.json location + list
of paths in the gem.json "gem_module_roots" JSON array if it exist
2021-05-23 22:52:10 -05:00
lumberyard-employee-dm 574efd711c Adding a "gem_module_roots" array to the gem.json for the Atom and
AtomLyIntegration gems to allow additional module roots to be checked
when determining the root directory of a GEM_MODULE target
With this change the AtomViewportDisplayInfo gem.json as it is no longer
needed.
2021-05-23 22:51:22 -05:00
lumberyard-employee-dm 98c3660bd9 Correcting the comments in the PAL.cmake file 2021-05-23 22:15:48 -05:00
lumberyard-employee-dm e59b154139 Updated the refactored o3de command scripts to be able to run standalone by adding a main section
Removed the ability to suppress errors in the add-gem-to-cmake and add-external-subdirectory command
Reduced duplicate logic in the download.py, register.py and repo.py scripts
Removed the registration.py script and moved the registration of those comamnds directly to the o3de.py script
Reduced the exception scope in the o3de command scripts to be as constrained as possible.
For example instead of having a block of Exception for catching a dictionary KeyError, the block has been updated to just catch KeyError
Added a python test for validating the "register.py --this-engine" functionality
2021-05-23 22:10:09 -05:00
lumberyard-employee-dm b42cc19f28 Moved the preview.png from the that the o3de engine template script from cmake/Tools directory to the o3de/resources directory 2021-05-23 21:54:56 -05:00
lumberyard-employee-dm 320a06bc19 Merge branch 'ly-as-sdk/LYN-2948-phistere' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/Engine-Gem-Tracking 2021-05-21 11:17:17 -05:00
lumberyard-employee-dm c1efdbb45c Merge pull request #33 from aws-lumberyard-dev/ly-as-sdk/AssetGemCMakeLists
Adding empty CMakeLists to Asset Only gems
2021-05-21 10:49:36 -05:00
lumberyard-employee-dm 530c9a424e Updating the manifest get_registered command to read the engine projects, gems, external_subdirectories, restricted and templates paths from the engine.json 2021-05-21 04:11:02 -05:00
lumberyard-employee-dm d422083faa Merge branch 'ly-as-sdk/LYN-2948-phistere' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/Engine-Gem-Tracking 2021-05-21 03:56:09 -05:00
lumberyard-employee-dm 83c5e5fb97 Merge remote-tracking branch 'origin/ly-as-sdk/LYN-2948-phistere' into ly-as-sdk/AssetGemCMakeLists 2021-05-21 03:24:59 -05:00
lumberyard-employee-dm a424ac63ec Adding empty CMakeLists.txt to Asset only gems to fit the new definition
of a gem.
That defintion is that a gem is a directory with a gem.json and a
CMakeLists.txt in it
2021-05-21 03:24:13 -05:00
lumberyard-employee-dm 0b2a5bad8f Merge branch 'ly-as-sdk/LYN-2948-phistere' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-21 03:20:59 -05:00
lumberyard-employee-dm 7872360e4a Updating the engine.json file with the list of external_subdirectories, projects and template that come with it 2021-05-21 02:53:40 -05:00
lumberyard-employee-dm 7e4070e5f1 Updating the DefaultProject and DefaultGem templates to use the
"restricted_name" key for indicating the identifier of a restricted
directory location instead of "restricted"
2021-05-21 02:50:30 -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
lumberyard-employee-dm e818bfe905 Updating the ProjectManager code to use the new location of the o3de python scripts 2021-05-21 02:39:50 -05:00
lumberyard-employee-dm 470fde461f Removed engine registration from the Jenkins build scripts which builds the Engine in an engine centric manner 2021-05-21 02:04:07 -05:00
lumberyard-employee-dm a9bc8e943d Refactored the o3de registration.py script into several files which each
contains the implementation of a subparser command.

Updated the register command to be not register engine gems, templates,
projects and external subdirectories to the o3de_manifest

Updated the register-show command to be able to read the engine's gems,
templates, projects and external subdirectories from the engine.json
file
2021-05-21 01:58:54 -05:00
phistere a4243f4be3 Temporarily fixes an issue with some Gems where asset paths aren't properly generated for asset processor 2021-05-20 10:42:06 -05:00
phistere 0f4e00e48f Updating the Gems selctions for the DefaultProject template 2021-05-20 10:38:44 -05:00
phistere 7a25a17fae Fixes a few issues when using an engine name different from the default 2021-05-20 09:13:01 -05:00
lumberyard-employee-dm a55edbe910 Merge branch 'ly-as-sdk/LYN-2948-phistere' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-19 21:26:29 -05:00
phistere 4ca30afa9e Updates pip install flags for consistency and installs the o3de module 2021-05-19 14:24:31 -05:00
phistere cef7eacd24 Fixes install of scripts to include o3de folder 2021-05-19 13:25:51 -05:00
phistere 0ba2900fdd Fixes and issue with o3de scripts assuming the wrong directory as the engine directory 2021-05-19 12:27:02 -05:00
lumberyard-employee-dm b5b9f7b7e9 Removing leftover ScriptCanvasDiagnosticLibrary files 2021-05-19 12:14:47 -05:00
phistere 5f82d8e3eb Updates EngineFinder.cmake to correct the key that it's looking for 2021-05-19 11:49:18 -05:00
phistere 77a035f015 Merge branch 'ly-as-sdk/LYN-2948' into ly-as-sdk/LYN-2948-phistere 2021-05-19 10:53: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
lumberyard-employee-dm f3d2642926 Added an installation of the scripts/o3de folder as a local package for the o3de python that is installed through cmake 2021-05-19 00:54:31 -05:00
lumberyard-employee-dm c6b0e3562e Updating the python import paths for the o3de scripts to use the new package o3de package location 2021-05-19 00:52:28 -05:00
lumberyard-employee-dm 703c268e40 Adding a setup.py and a README to the scripts/o3de folder so it can be linked as a package into the engine python runtime when python is installed via python/get_python.bat 2021-05-18 23:48:35 -05:00
lumberyard-employee-dm ec7f4c3fdc Moving the engine template unit test files into the o3de/tests folder 2021-05-18 23:15:50 -05:00
lumberyard-employee-dm 6fc1257f73 Moving the o3de python scripts to be underneath another o3de folder to allow import o3de to succeed.
The path is now scripts/o3de/o3de
2021-05-18 23:13:25 -05:00
lumberyard-employee-dm 5d42b64ff9 Moving the o3de test scripts to the tests subfolder of the package 2021-05-18 23:05:55 -05:00
lumberyard-employee-dm 548219d117 Updated the registration.py script register_engine_path function to add
a key, value mapping of engine name to engine path in the
o3de_manifest.json file

Added a pytest to validate the new engine_name -> engine_path
functionality and registered those test with CTest.

Fixed miscellaneous issues in the registration.py around incorrect
return values for get_*_data functions where some of the returns values
were integers where the return value should have been None
2021-05-18 22:23:07 -05:00
lumberyard-employee-dm f346614917 Adding __init__.py scripts to allow the name of o3de to be structured as a package 2021-05-18 21:47:03 -05:00
lumberyard-employee-dm 680a8e6fbd Moving the o3de UnitTest files to script/o3de/test folder to help with file organization 2021-05-18 21:43:13 -05:00
lumberyard-employee-dm d4a0eb3a24 Moving o3de registration scripts to the scripts/o3de folder 2021-05-17 13:03:37 -05:00
phistere f30b1f2c75 Work in Progress: template changes, getting external projects w/ SDK to work 2021-05-17 11:41:10 -05:00
phistere 0a8621ba0a Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-16 11:51:00 -05:00
phistere 74fda49ca4 Fixes paths to AssetProcessor when being run from SDK. 2021-05-16 11:39:49 -05:00
kberg-amzn e7c1a3098d Merge pull request #771 from aws-lumberyard-dev/MultiplayerComponents
Local prediction and network input bug fixes
2021-05-15 16:44:41 -07:00