Refactor DCCsi to work better with O3DE changes (#4226)
* moving files in refactor/re-org Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * dev env refactor/re-org Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * moving/re-org so we can deprate the SDK nomiclature Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * moving/re-org so we can deprate the SDK nomiclature Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Refactoring env so I can replace SDK with Tools folder Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * re-org and prune, from SKD to Tools Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Removing old .bat files from SDK Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * updated how to retreive PYTHONHOME Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Can't use/set PYTHONHOME with DCC Tools Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * small refactor Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * repaired a missed typo (causes error) Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Added missing EntityId.h include to FocusModeInterface.h Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * refactor additional LY to O3DE tags Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Some design scaffold file stubs Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * stubbing in scaffold file pattern Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Removal of corrupted prefabs Signed-off-by: Benjamin Black <benblac@amazon.com> * refactored config_utils to maintain py2.7 support for maya 2020 Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * refactored config_utils to maintain py2.7 support for maya 2020 Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * pruning and cleanup Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * .env is for local dev overrides Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * .env is for local dev overrides Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * clean up init and logging patterns Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Core refactoring, config.py functional standalone Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * cleaned up some bad logging, fixed up boostrap Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * fixed validation errors Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * fix logging issue, tiddy up Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * tiddy up maya for .bat bootstraping and launch Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * name stub, fix validation Signed-off-by: Jonny Gallowy <gallowj@amazon.com> Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Co-authored-by: Benjamin Black <benblac@amazon.com>
This commit is contained in:
Jonny Galloway
GitHub
+25
-22
@@ -12,7 +12,7 @@ from __future__ import unicode_literals
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
'''
|
||||
Module: <DCCsi>\azpy\shared\common\config_utils.py
|
||||
Module: <DCCsi>\\azpy\\shared\\common\\config_utils.py
|
||||
|
||||
A set of utility functions
|
||||
|
||||
@@ -33,28 +33,31 @@ import logging as _logging
|
||||
# 3rd Party
|
||||
from box import Box
|
||||
from unipath import Path
|
||||
|
||||
# Lumberyard extensions
|
||||
from azpy.constants import *
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
from azpy.env_bool import env_bool
|
||||
# global space
|
||||
import azpy.env_bool as env_bool
|
||||
from azpy.constants import ENVAR_O3DE_DEV
|
||||
from azpy.constants import ENVAR_O3DE_PROJECT
|
||||
from azpy.constants import ENVAR_DCCSI_GDEBUG
|
||||
from azpy.constants import ENVAR_DCCSI_DEV_MODE
|
||||
from azpy.constants import FRMT_LOG_LONG
|
||||
|
||||
# global space
|
||||
_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
_DCCSI_GDEBUG = env_bool.env_bool(ENVAR_DCCSI_GDEBUG, False)
|
||||
_DCCSI_DEV_MODE = env_bool.env_bool(ENVAR_DCCSI_DEV_MODE, False)
|
||||
|
||||
_PACKAGENAME = __name__
|
||||
if _PACKAGENAME is '__main__':
|
||||
_PACKAGENAME = 'azpy.shared.common.envar_utils'
|
||||
_MODULENAME = __name__
|
||||
if _MODULENAME is '__main__':
|
||||
_MODULENAME = 'azpy.shared.common.envar_utils'
|
||||
|
||||
import azpy
|
||||
_LOGGER = azpy.initialize_logger(_PACKAGENAME)
|
||||
_LOGGER.debug('Invoking __init__.py for {0}.'.format({_PACKAGENAME}))
|
||||
# set up module logging
|
||||
for handler in _logging.root.handlers[:]:
|
||||
_logging.root.removeHandler(handler)
|
||||
_LOGGER = _logging.getLogger(_MODULENAME)
|
||||
_logging.basicConfig(format=FRMT_LOG_LONG)
|
||||
_LOGGER.debug('Initializing: {0}.'.format({_MODULENAME}))
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -65,7 +68,7 @@ def get_envar_default(envar, envar_default=None, envar_set=Box(ordered_box=True)
|
||||
Get from the system environment, or the module dictionary (a Box):
|
||||
like the test one in __main__ below,
|
||||
TEST_ENV_VALUES = Box(ordered_box=True)
|
||||
TEST_ENV_VALUES[ENVAR_LY_PROJECT] = '${0}'.format(ENVAR_LY_PROJECT)
|
||||
TEST_ENV_VALUES[ENVAR_O3DE_PROJECT] = '${0}'.format(ENVAR_O3DE_PROJECT)
|
||||
|
||||
This dictionary provides a simple way to pack a default set into a
|
||||
structure and decouple the getter implementation.
|
||||
@@ -88,7 +91,7 @@ def get_envar_default(envar, envar_default=None, envar_set=Box(ordered_box=True)
|
||||
|
||||
|
||||
# -- envar util ----------------------------------------------------------
|
||||
def set_envar_defaults(envar_set, env_root=get_envar_default(ENVAR_LY_DEV)):
|
||||
def set_envar_defaults(envar_set, env_root=get_envar_default(ENVAR_O3DE_DEV)):
|
||||
"""
|
||||
Set each environment variable if not alreay set with value.
|
||||
Must be safe, will not over-write existing.
|
||||
@@ -98,8 +101,8 @@ def set_envar_defaults(envar_set, env_root=get_envar_default(ENVAR_LY_DEV)):
|
||||
env_root = Path(env_root)
|
||||
|
||||
if env_root.exists():
|
||||
os.environ[ENVAR_LY_DEV] = env_root
|
||||
envar_set[ENVAR_LY_DEV] = env_root
|
||||
os.environ[ENVAR_O3DE_DEV] = env_root
|
||||
envar_set[ENVAR_O3DE_DEV] = env_root
|
||||
else:
|
||||
raise ValueError("EnvVar Root is not valid: {0}".format(env_root))
|
||||
|
||||
@@ -107,7 +110,7 @@ def set_envar_defaults(envar_set, env_root=get_envar_default(ENVAR_LY_DEV)):
|
||||
envar = str(envar)
|
||||
value = os.getenv(envar)
|
||||
|
||||
if _G_DEBUG:
|
||||
if _DCCSI_GDEBUG:
|
||||
if not value:
|
||||
_LOGGER.debug('~ EnVar value NOT found: {0}\r'.format(envar))
|
||||
|
||||
@@ -191,8 +194,8 @@ if __name__ == '__main__':
|
||||
# it should be benign but leaving this comment here in case of funk
|
||||
|
||||
# tes envars
|
||||
TEST_ENV_VALUES[ENVAR_LY_PROJECT] = '${0}'.format(ENVAR_LY_PROJECT)
|
||||
TEST_ENV_VALUES[ENVAR_LY_DEV] = Path('${0}'.format(ENVAR_LY_DEV))
|
||||
TEST_ENV_VALUES[ENVAR_O3DE_PROJECT] = '${0}'.format(ENVAR_O3DE_PROJECT)
|
||||
TEST_ENV_VALUES[ENVAR_O3DE_DEV] = Path('${0}'.format(ENVAR_O3DE_DEV))
|
||||
|
||||
# try to fetch and set the base values from the environment
|
||||
# this makes sure all envars set, are resolved on import
|
||||
@@ -204,7 +207,7 @@ if __name__ == '__main__':
|
||||
ensure_ascii=False), '\r')
|
||||
|
||||
# simple tests
|
||||
_ENV_TAG = 'LY_DEV'
|
||||
_ENV_TAG = 'O3DE_DEV'
|
||||
foo = get_envar_default(_ENV_TAG)
|
||||
_LOGGER.info("~ Results of getVar on tag, '{0}':'{1}'\r".format(_ENV_TAG, foo))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user