birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,058 Commits 3 Branches 3 Tags
3d1b30dedaaf3587f8b6d8a12d33db7d448fa866
Commit Graph

173 Commits

Author SHA1 Message Date
amzn-phist 2a9990ead3 Fix engine template issue (#6927) 
* fix get_enabled_gem_cmake_file to work with "Dem" or "Code" or "Gem/Code" folder in a project
fix o3de_restricted_path to make the past paramter optional

Signed-off-by: byrcolin <byrcolin@amazon.com>

* Fix resolution of variables in `cmake_path(COMPARE)` calls in PAL.cmake

The documentation for `cmake_path(COMPARE)` states that parameters marked as [<input>](https://cmake.org/cmake/help/latest/command/cmake_path.html#conventions) are string literals.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

Co-authored-by: byrcolin <byrcolin@amazon.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-01-18 08:27:06 -08:00
AMZN-byrcolin c778606c89 Templates restricted (#6498) 
* Templates/Restricted upgrade/fixes:
Fixed template storage format: templates now only store true relative paths and no longer save "origin" paths and "optional" has been removed, it was never used.
Upgraded all templates to new standard
Template system now correctly handles child objects: Child objects no longer have to specify restricted they inherit from parent
Restricted now operates at the object level and makes no assumptions about parent
Restricted templates can now be combined and seperated on creation
ly_get_list_relative_filename has been deprecated for o3de_pal_dir
All Gems/Projects/Templates updated to use new code

Signed-off-by: byrcolin <byrcolin@amazon.com>
 2022-01-14 10:27:20 -08:00
Alex Peterson 73419387c5 Check engines_path in get_registered (#6828) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2022-01-11 16:49:59 -08:00
nggieber 3cf85bb562 Fix project properties test 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-10 14:12:14 -08:00
nggieber 88b78c0d16 Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-10 06:32:14 -08:00
lumberyard-employee-dm 003727ca57 Fixed the get_registration.py script to print the manifest data (#6236) 
Added a --project-engine-name/-pen argument to print_registration.py to
output the engine registered with the project.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-12-08 18:08:51 -06:00
Alex Peterson 3405cee2ef GUI for engine force registration and renaming (#6184) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-12-07 10:46:30 -08:00
amzn-phist 72b5539259 Add verbosity option to some o3de.py sub-commands (#6079) 
* Add verbosity option to some o3de.py sub-commands

- Added the -v/-vv option to the most commonly used o3de sub-commands
- Adds a custom argparse Action to make it easy to add verbosity option
  to other commands as needed.
- Sets up parent-child loggers so that when verbosity is changed in a
  sub-command it will be applied globally to all logger instances.

Also:
- Fixes up many warnings, PEP8 improvements

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Update the log format in o3de script modules

- Use a bit nicer format than the default, which was harder to read.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
 2021-12-07 12:28:17 -06:00
nggieber 2c1f0220ec Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-06 09:42:33 -08:00
lumberyard-employee-dm 83cb085a28 Fixed the register.py command with a --project-path to check against a (#6158) 
supplied --engine-path parameter to determine if it should update the
project.json if one has been provided.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-12-06 11:24:04 -06:00
nggieber 15237af23c Refactored ProjectManagerSettings, added tests, changed project built successful to be tracked by project path, added project ids, changed project settings path to use project id and name 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-06 09:22:03 -08:00
Esteban Papp 7c30adb66c Removes _vs2019 from jenkins jobs and documentation (#5855) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-30 11:10:02 -08:00
Esteban Papp ccb5336843 Reading 3rdparty from manifest if it exists (#5840) 
* Reading 3rdparty from manifest if it exists, removnig the need to pass it across the board, updated jenkins paths so 3rdparty is put into the workspace

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes unneded space

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changes how we get the NDK folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* needs delayed expansion

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Ninja is in the path, is not needed for Android

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-22 14:21:02 -08:00
puvvadar 0c1a0391fa Merge commit '77279bfd55396524d3ba00c7b4407237e546035d' into puvvadar/gitflow_211118_o3de 2021-11-19 09:19:22 -08:00
puvvadar d056555388 Merge commit 'd30fdb759d07e54d36309680ffa4247f1481ceb2' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:45 -08:00
puvvadar 89235fb546 Merge commit '76d2e125c294e1183ef55320417fa34a6f9d5e27' into puvvadar/gitflow_211118_o3de 2021-11-19 09:15:56 -08:00
lumberyard-employee-dm 77279bfd55 Prevent updates to o3de_manifests.json if it is corrupted. (#5776) 
This behavior can be overridden using the --force option.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-19 11:04:53 -06:00
Alex Peterson d30fdb759d Gem repo template (#5774) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-18 21:27:43 -08:00
AMZN-Phil 83f42fed5f Change warn to warning to remove deprecation messages from Python 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-18 09:49:05 -08:00
puvvadar 5aee691cd8 Merge commit '78263b7f13bf5d0fac824a4c025c46c88138a59c' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:33 -08:00
puvvadar c192a7e3bb Merge commit 'fc805594d02967474c2e31cd228e925d73310fee' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:55 -08:00
AMZN-Phil 6819a1956d Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/CLIDisplayLastError 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-17 10:01:00 -08:00
Alex Peterson fc805594d0 Fixes for misc gem download issues (#5665) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-16 14:51:28 -08:00
AMZN-Phil 808c783109 Show python errors in Project Manager for adding repos and downloading gems 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-16 14:24:02 -08:00
Tommy Walton 6080801c55 Merge commit '0b211d3743f612177cf529de9dbd30e5ae5216b2' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:35 -08:00
Tommy Walton 830c10b8b0 Merge commit '08848ac7817a704135014f222f156003c4a16832' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:18 -08:00
nggieber 3d21a9f4bd Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI 2021-11-11 11:52:49 -08:00
Nicholas Van Sickle 8d5dd4e35f Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-11-11 10:15:52 -08:00
AMZN-Phil c07b666bec Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/AdditionalProgressFixes 2021-11-11 08:19:21 -08:00
nggieber d9443ec42c Addressed some PR feedback and continue filtering with same search string even after refresh 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-10 15:29:20 -08:00
nggieber f470351d0c Hook up Gem Updating and Uninstallation and fix lots of minor bugs between gem catalog and gem repos 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-10 12:33:24 -08:00
AMZN-Phil f2e191ea77 Fix trying to remove a cache file 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-10 10:28:32 -08:00
AMZN-Phil 0102894a83 Handle servers with no content length and make downloading more obvious 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-10 08:44:24 -08:00
AMZN-Phil e9c3a453c5 Merge pull request #5341 from aws-lumberyard-dev/Prism/CheckGemUpdates 
Add ability to overwrite o3de object when downloading
 2021-11-09 10:41:35 -08:00
AMZN-Phil 81515b922f Additional readability 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-04 17:10:44 -07:00
AMZN-Phil 31382d080e Remove duplication, additional readability and added missed file 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-04 17:07:02 -07:00
AMZN-Phil 047c5f2231 Add ability to overwrite o3de object when downloading, and to check the last_updated field to check for updates. 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-11-04 15:09:11 -07:00
Chris Burel d942c90c56 Merge branch stabilization/2110 into development 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-11-04 13:44:22 -07:00
AMZN-nggieber 4721ef8298 License Info is Displayed as Clickable Link in Gem Catalog + Other Inspector Improvements (#5272) 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-04 13:04:06 -07:00
Mike Balfour 6d7be70133 Merge pull request #5202 from aws-lumberyard-dev/mbalfour/gitflow_211102_o3de 
Merging stabilization/2110 to development
 2021-11-02 13:33:14 -05:00
lumberyard-employee-dm 6a6d8e6b39 Fixed unit_test_regiser.py test on Linux/Mac (#5031) 
Added pathlib.Path.resolve() calls to make sure the compared paths were both absolute

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-02 10:57:31 -05:00
AMZN-Phil d355942e8b Fix an additional location 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-28 16:36:54 -07:00
AMZN-Phil 5971f1176e Fix thrown exceptions if repos does not exist in the manifest 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-28 16:17:28 -07:00
AMZN-Phil bec24a85bf Fix old references to gem_list 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-10-25 15:59:30 -07:00
nggieber 182a7b98b7 Always convert gem_path to pathlib.Path and check it isFile() in case it is a str 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 17:33:30 -07:00
nggieber 06f893edf1 Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 17:28:28 -07:00
AMZN-Phil e8a7743aec Merge pull request #4911 from aws-lumberyard-dev/Prism/RefreshGemRepos 
Gem Repos can be Refreshed through Project Manager
 2021-10-22 17:23:35 -07:00
nggieber 88f7f66b04 Removed fullPathGiven and instead check if path is a file when getting gem json data 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 17:19:54 -07:00
nggieber 78e556e5ff Changed gem_list to gem_set 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-10-22 16:36:34 -07:00
nggieber 500ac030a3 Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 16:30:02 -07:00