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

Added pdbs for python windows in order to allow python/c++ debugging on VS (#3661)

Browse Source 
* Added pdbs for python windows in order to allow python/c++ debugging on VS

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Modified other places where rev1 was used

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
monroegm-disable-blank-issue-2
AMZN-AlexOteiza 4 years ago committed by GitHub
parent 102c321e56
commit 9752fb009a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
Gems/AWSClientAuth/cdk/README.md
Unescape Escape View File

@ -13,7 +13,7 @@ Run from cdk directory within gem.
Optional set up python path to LY Python Optional set up python path to LY Python
``` ```
set PATH="..\..\..\python\runtime\python-3.7.10-rev1-windows\python\";%PATH% set PATH="..\..\..\python\runtime\python-3.7.10-rev2-windows\python\";%PATH%
``` ```
This project is set up like a standard Python project. Use python interpreter from Open3d to setup python dependencies This project is set up like a standard Python project. Use python interpreter from Open3d to setup python dependencies

2
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_PyCharm.bat
Unescape Escape View File

@ -34,7 +34,7 @@ CALL %~dp0\Env_Python.bat
CALL %~dp0\Env_Qt.bat CALL %~dp0\Env_Qt.bat
:: Wing and other IDEs probably prefer access directly to the python.exe :: Wing and other IDEs probably prefer access directly to the python.exe
set DCCSI_PY_IDE = %DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev1-windows\python set DCCSI_PY_IDE = %DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev2-windows\python
echo DCCSI_PY_IDE = %DCCSI_PY_IDE% echo DCCSI_PY_IDE = %DCCSI_PY_IDE%
:: ide and debugger plug :: ide and debugger plug

2
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Python.bat
Unescape Escape View File

@ -67,7 +67,7 @@ echo DCCSI_PY_BASE = %DCCSI_PY_BASE%
set DCCSI_PY_DEFAULT=%DCCSI_PY_BASE% set DCCSI_PY_DEFAULT=%DCCSI_PY_BASE%
:: Wing and other IDEs probably prefer access directly to the python.exe :: Wing and other IDEs probably prefer access directly to the python.exe
set DCCSI_PY_IDE=%DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev1-windows\python set DCCSI_PY_IDE=%DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev2-windows\python
echo DCCSI_PY_IDE = %DCCSI_PY_IDE% echo DCCSI_PY_IDE = %DCCSI_PY_IDE%
set DCCSI_PY_IDE_PACKAGES=%DCCSI_PY_IDE%\Lib\site-packages set DCCSI_PY_IDE_PACKAGES=%DCCSI_PY_IDE%\Lib\site-packages

2
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_WingIDE.bat
Unescape Escape View File

@ -28,7 +28,7 @@ CALL %~dp0\Env_Python.bat
CALL %~dp0\Env_Qt.bat CALL %~dp0\Env_Qt.bat
:: Wing and other IDEs probably prefer access directly to the python.exe :: Wing and other IDEs probably prefer access directly to the python.exe
set DCCSI_PY_IDE = %DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev1-windows\python set DCCSI_PY_IDE = %DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev2-windows\python
echo DCCSI_PY_IDE = %DCCSI_PY_IDE% echo DCCSI_PY_IDE = %DCCSI_PY_IDE%
:: ide and debugger plug :: ide and debugger plug

2
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_MayaPy_PyCharmPro.bat
Unescape Escape View File

@ -63,7 +63,7 @@ set DCCSI_PYTHON_INSTALL=%LY_DEV%\Python
echo DCCSI_PYTHON_INSTALL = %DCCSI_PYTHON_INSTALL% echo DCCSI_PYTHON_INSTALL = %DCCSI_PYTHON_INSTALL%
:: Wing and other IDEs probably prefer access directly to the python.exe :: Wing and other IDEs probably prefer access directly to the python.exe
set DCCSI_PY_IDE = %DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev1-windows\python set DCCSI_PY_IDE = %DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev2-windows\python
echo DCCSI_PY_IDE = %DCCSI_PY_IDE% echo DCCSI_PY_IDE = %DCCSI_PY_IDE%
:: ide and debugger plug :: ide and debugger plug

2
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_VScode.bat
Unescape Escape View File

@ -68,7 +68,7 @@ set DCCSI_PYTHON_INSTALL=%LY_DEV%\Python
echo DCCSI_PYTHON_INSTALL = %DCCSI_PYTHON_INSTALL% echo DCCSI_PYTHON_INSTALL = %DCCSI_PYTHON_INSTALL%
:: Wing and other IDEs probably prefer access directly to the python.exe :: Wing and other IDEs probably prefer access directly to the python.exe
set DCCSI_PY_IDE = %DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev1-windows\python set DCCSI_PY_IDE = %DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev2-windows\python
echo DCCSI_PY_IDE = %DCCSI_PY_IDE% echo DCCSI_PY_IDE = %DCCSI_PY_IDE%
:: ide and debugger plug :: ide and debugger plug

2
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_WingIDE-7-1.bat
Unescape Escape View File

@ -62,7 +62,7 @@ set DCCSI_PYTHON_INSTALL=%LY_DEV%\Python
echo DCCSI_PYTHON_INSTALL = %DCCSI_PYTHON_INSTALL% echo DCCSI_PYTHON_INSTALL = %DCCSI_PYTHON_INSTALL%
:: Wing and other IDEs probably prefer access directly to the python.exe :: Wing and other IDEs probably prefer access directly to the python.exe
set DCCSI_PY_IDE = %DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev1-windows\python set DCCSI_PY_IDE = %DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev2-windows\python
echo DCCSI_PY_IDE = %DCCSI_PY_IDE% echo DCCSI_PY_IDE = %DCCSI_PY_IDE%
:: ide and debugger plug :: ide and debugger plug

2
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Launch_mayapy_WingIDE-7-1.bat
Unescape Escape View File

@ -62,7 +62,7 @@ set DCCSI_PYTHON_INSTALL=%LY_DEV%\Python
echo DCCSI_PYTHON_INSTALL = %DCCSI_PYTHON_INSTALL% echo DCCSI_PYTHON_INSTALL = %DCCSI_PYTHON_INSTALL%
:: Wing and other IDEs probably prefer access directly to the python.exe :: Wing and other IDEs probably prefer access directly to the python.exe
set DCCSI_PY_IDE = %DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev1-windows\python set DCCSI_PY_IDE = %DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev2-windows\python
echo DCCSI_PY_IDE = %DCCSI_PY_IDE% echo DCCSI_PY_IDE = %DCCSI_PY_IDE%
:: ide and debugger plug :: ide and debugger plug

2
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Setuo_copy_oiio.bat
Unescape Escape View File

@ -18,7 +18,7 @@ set LY_DEV=..\..\..\..\..\..
:: shared location for default O3DE python location :: shared location for default O3DE python location
set DCCSI_PYTHON_INSTALL=%LY_DEV%\Python set DCCSI_PYTHON_INSTALL=%LY_DEV%\Python
set PY_SITE=%DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev1-windows\python\Lib\site-packages set PY_SITE=%DCCSI_PYTHON_INSTALL%\runtime\python-3.7.10-rev2-windows\python\Lib\site-packages
set PACKAGE_LOC=C:\Depot\3rdParty\packages\openimageio-2.1.16.0-rev1-windows\OpenImageIO\2.1.16.0\win_x64\bin set PACKAGE_LOC=C:\Depot\3rdParty\packages\openimageio-2.1.16.0-rev1-windows\OpenImageIO\2.1.16.0\win_x64\bin

4
cmake/LYPython.cmake
Unescape Escape View File

@ -29,8 +29,8 @@ elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin" )
ly_set(LY_PYTHON_PACKAGE_HASH 3f65801894e4e44b5faa84dd85ef80ecd772dcf728cdd2d668a6e75978a32695) ly_set(LY_PYTHON_PACKAGE_HASH 3f65801894e4e44b5faa84dd85ef80ecd772dcf728cdd2d668a6e75978a32695)
elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows" ) elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows" )
ly_set(LY_PYTHON_VERSION 3.7.10) ly_set(LY_PYTHON_VERSION 3.7.10)
ly_set(LY_PYTHON_PACKAGE_NAME python-3.7.10-rev1-windows) ly_set(LY_PYTHON_PACKAGE_NAME python-3.7.10-rev2-windows)
ly_set(LY_PYTHON_PACKAGE_HASH 851383addea5c54b7c6398860d04606c1053f1157c2edd801ec3d47394f73136) ly_set(LY_PYTHON_PACKAGE_HASH 06d97488a2dbabe832ecfa832a42d3e8a7163ba95e975f032727331b0f49d280)
endif() endif()
# settings and globals # settings and globals

2
python/python.cmd
Unescape Escape View File

@ -17,7 +17,7 @@ SETLOCAL
SET CMD_DIR=%~dp0 SET CMD_DIR=%~dp0
SET CMD_DIR=%CMD_DIR:~0,-1% SET CMD_DIR=%CMD_DIR:~0,-1%
SET PYTHONHOME=%CMD_DIR%\runtime\python-3.7.10-rev1-windows\python SET PYTHONHOME=%CMD_DIR%\runtime\python-3.7.10-rev2-windows\python
IF EXIST "%PYTHONHOME%" GOTO PYTHONHOME_EXISTS IF EXIST "%PYTHONHOME%" GOTO PYTHONHOME_EXISTS

2
python/python.sh
Unescape Escape View File

@ -19,7 +19,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
if [[ "$OSTYPE" == *"darwin"* ]]; then if [[ "$OSTYPE" == *"darwin"* ]]; then
PYTHON=$DIR/runtime/python-3.7.10-rev1-darwin/Python.framework/Versions/3.7/bin/python3 PYTHON=$DIR/runtime/python-3.7.10-rev1-darwin/Python.framework/Versions/3.7/bin/python3
elif [[ "$OSTYPE" == "msys" ]]; then elif [[ "$OSTYPE" == "msys" ]]; then
PYTHON=$DIR/runtime/python-3.7.10-rev1-windows/python/python.exe PYTHON=$DIR/runtime/python-3.7.10-rev2-windows/python/python.exe
else else
PYTHON=$DIR/runtime/python-3.7.10-rev2-linux/python/bin/python PYTHON=$DIR/runtime/python-3.7.10-rev2-linux/python/bin/python
fi fi

Write Preview
Loading…
Cancel
Save