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

Updates pip install flags for consistency and installs the o3de module

Browse Source
This commit is contained in:
phistere
2021-05-19 14:24:31 -05:00
parent cef7eacd24
commit 4ca30afa9e
2 changed files with 5 additions and 3 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
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%