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

Merge branch 'ly-as-sdk/LYN-2948-phistere' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948-phistere

Browse Source
This commit is contained in:
lumberyard-employee-dm
2021-05-19 21:26:29 -05:00
parent b5b9f7b7e9 4ca30afa9e
commit a55edbe910
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/LYPython.cmake
+1 -1
View File
@@ -81,7 +81,7 @@ function(update_pip_requirements requirements_file_path unique_name)
set(ENV{PYTHONNOUSERSITE} 1)
execute_process(COMMAND
${LY_PYTHON_CMD} -m pip install --no-deps -r "${requirements_file_path}" --disable-pip-version-check --no-warn-script-location
${LY_PYTHON_CMD} -m pip install -r "${requirements_file_path}" --disable-pip-version-check --no-warn-script-location
WORKING_DIRECTORY ${Python_BINFOLDER}
RESULT_VARIABLE PIP_RESULT
OUTPUT_VARIABLE PIP_OUT
cmake/Platform/Common/Install_common.cmake
+1
View File
@@ -385,6 +385,7 @@ function(ly_setup_others)
install(DIRECTORY
${LY_ROOT_FOLDER}/scripts/bundler
${LY_ROOT_FOLDER}/scripts/project_manager
${LY_ROOT_FOLDER}/scripts/o3de
DESTINATION ./scripts
COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
PATTERN "__pycache__" EXCLUDE
python/get_python.bat
+4 -2
View File
@@ -25,7 +25,8 @@ call python.cmd --version > NUL
IF !ERRORLEVEL!==0 (
echo get_python.bat: Python is already installed:
call python.cmd --version
call "%CMD_DIR%\pip.cmd" install -r "%CMD_DIR%/requirements.txt" --quiet --disable-pip-version-check
call "%CMD_DIR%\pip.cmd" install -r "%CMD_DIR%/requirements.txt" --quiet --disable-pip-version-check --no-warn-script-location
call "%CMD_DIR%\pip.cmd" install -e "%CMD_DIR%/../scripts/o3de" --quiet --disable-pip-version-check --no-warn-script-location --no-deps
exit /B 0
)
@@ -65,6 +66,7 @@ if ERRORLEVEL 1 (
)
echo calling PIP to install requirements...
call "%CMD_DIR%\pip.cmd" install -r "%CMD_DIR%/requirements.txt" --disable-pip-version-check
call "%CMD_DIR%\pip.cmd" install -r "%CMD_DIR%/requirements.txt" --disable-pip-version-check --no-warn-script-location
call "%CMD_DIR%\pip.cmd" install -e "%CMD_DIR%/../scripts/o3de" --disable-pip-version-check --no-warn-script-location --no-deps
exit /B %ERRORLEVEL%
scripts/o3de/o3de/registration.py
+4 -4
View File
@@ -55,7 +55,7 @@ def backup_folder(folder: str or pathlib.Path) -> None:
def get_this_engine_path() -> pathlib.Path:
return pathlib.Path(os.path.realpath(__file__)).parents[2].resolve()
return pathlib.Path(os.path.realpath(__file__)).parents[3].resolve()
override_home_folder = None
@@ -123,9 +123,9 @@ def get_o3de_restricted_folder() -> pathlib.Path:
def get_o3de_logs_folder() -> pathlib.Path:
restricted_folder = get_o3de_folder() / 'Logs'
restricted_folder.mkdir(parents=True, exist_ok=True)
return restricted_folder
logs_folder = get_o3de_folder() / 'Logs'
logs_folder.mkdir(parents=True, exist_ok=True)
return logs_folder
def register_shipped_engine_o3de_objects(force: bool = False) -> int: