birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating latest from github/staging

Browse Source 
Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/CMakeLists.txt
-1
View File
@@ -27,7 +27,6 @@ ly_add_target(
ly_add_target(
NAME DccScriptingInterface.Editor ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.Atom_DccScriptingInterface.Editor.7bf5a77dacd8438bb4966a66b5a678d8.v0.1.0
FILES_CMAKE
dccscriptinginterface_shared_files.cmake
INCLUDE_DIRECTORIES
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py
+2 -2
View File
@@ -85,7 +85,7 @@ from pathlib import Path
# get/set the project name
_LY_DEV = os.getenv(constants.ENVAR_LY_DEV,
config_utils.get_stub_check_path(in_path=os.getcwd(),
check_stub='engineroot.txt'))
check_stub='engine.json'))
# get/set the project name
_LY_PROJECT_TAG = os.getenv(constants.ENVAR_LY_PROJECT,
@@ -94,8 +94,8 @@ _LY_PROJECT_TAG = os.getenv(constants.ENVAR_LY_PROJECT,
# project cache log dir path
_DCCSI_LOG_PATH = Path(os.getenv(constants.ENVAR_DCCSI_LOG_PATH,
Path(_LY_DEV,
_LY_PROJECT_TAG,
'Cache',
_LY_PROJECT_TAG,
'pc', 'user', 'log', 'logs')))
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
+1 -21
View File
@@ -30,7 +30,7 @@ _LOGGER = _logging.getLogger(_PACKAGENAME)
_LOGGER.debug('Initializing: {0}.'.format({_PACKAGENAME}))
__all__ = ['get_os', 'return_stub', 'get_stub_check_path',
'get_dccsi_config', 'get_current_project']
'get_dccsi_config']
# note: this module should reamin py2.7 compatible (Maya) so no f'strings
# -------------------------------------------------------------------------
@@ -135,23 +135,6 @@ def get_dccsi_config(dccsi_dirpath=return_stub_dir()):
return None
# -------------------------------------------------------------------------
# -------------------------------------------------------------------------
def get_current_project(dev_folder=get_stub_check_path()):
"""Uses regex in lumberyard Dev\\bootstrap.cfg to retreive project tag str"""
boostrap_filepath = Path(dev_folder, "bootstrap.cfg")
if boostrap_filepath.exists():
bootstrap = open(str(boostrap_filepath), "r")
game_project_regex = re.compile(r"^sys_game_folder\s*=\s*(.*)")
for line in bootstrap:
game_folder_match = game_project_regex.match(line)
if game_folder_match:
_LOGGER.debug('Project is: {}'.format(game_folder_match.group(1)))
return game_folder_match.group(1)
return None
# -------------------------------------------------------------------------
# -------------------------------------------------------------------------
def bootstrap_dccsi_py_libs(dccsi_dirpath=return_stub_dir()):
"""Builds and adds local site dir libs based on py version"""
@@ -192,9 +175,6 @@ if __name__ == '__main__':
_LOGGER.info('DCCSI_CONFIG_PATH: {}'.format(_config))
_LOGGER.info('LY_DEV: {}'.format(get_stub_check_path('engineroot.txt')))
_LOGGER.info('LY_PROJECT: {}'.format(get_current_project(get_stub_check_path('engineroot.txt'))))
_LOGGER.info('DCCSI_PYTHON_LIB_PATH: {}'.format(bootstrap_dccsi_py_libs(return_stub_dir('dccsi_stub'))))