From 88d16b23d4bd712b8e269a6df4e513f627f1886d Mon Sep 17 00:00:00 2001 From: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Date: Wed, 9 Jun 2021 18:50:28 -0500 Subject: [PATCH] Fixing the enable_gem.py and disable_gem.py commands (#1207) (#1220) * Fixing the enable_gem.py and disable_gem.py commands (#1207) * Fixing the enable_gem.py and disable_gem.py commands The project path wasn't taking into account when querying for gems, templates and restricted directories registered with the project Fixing the cmake.py add_gem_dependency and remove_gem_dependency methods to properly detect a gem within a `set(ENABLED_GEM ...)` cmake variable Also updated the add_gem_dependency to add the gem right before the end marker of ')' Updated the remove_gem_dependency to remove each instance of a gem with a content that is in between in the `set(ENABLED_GEM ...)` cmake variable * Correct Typo in manifest.get_registered doc string * Removing second get_all_restricted() method --- scripts/o3de/o3de/manifest.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/o3de/o3de/manifest.py b/scripts/o3de/o3de/manifest.py index 074e7f5a9e..8255946cfb 100644 --- a/scripts/o3de/o3de/manifest.py +++ b/scripts/o3de/o3de/manifest.py @@ -401,13 +401,6 @@ def get_templates_for_generic_creation(): # temporary until we have a better wa return list(filter(filter_project_and_gem_templates_out, get_all_templates())) -def get_all_restricted() -> list: - engine_restricted = get_engine_restricted() - restricted_data = get_restricted() - restricted_data.extend(engine_restricted) - return restricted_data - - def find_engine_data(json_data: dict, engine_path: str or pathlib.Path = None) -> dict or None: if not engine_path: