Modified python 3rdparty to include python pdbs

Signed-off-by: Garcia Ruiz <[email protected]>

SPDX-Licenses.csv

@@ -31,6 +31,8 @@ OpenSSL-1.1.1b-rev2-windows,https://github.com/openssl/openssl,OpenSSL,OpenSSL/L
 PhysX-4.1.0.25992954-rev1-windows,https://github.com/NVIDIAGameWorks/PhysX,LicenseRef-custom,license.txt
 poly2tri-0.3.3-rev2-multiplatform,https://github.com/jhasse/poly2tri,BSD-3-Clause,poly2tri/LICENSE
 PVRTexTool-4.24.0-rev4-multiplatform,https://www.imaginationtech.com/developers/powervr-sdk-tools/pvrtextool/,LicenseRef-custom,PVRTexTool/LICENSE_POWERVR_TOOLS.txt
+python-3.7.10-rev1-multiplatform,https://python.org,PSF-2.0,python/LICENSE.txt
+python-3.7.10-rev2-multiplatform,https://python.org,PSF-2.0,python/LICENSE.txt
 pybind11-2.4.3-rev2-multiplatform,https://github.com/pybind/pybind11,BSD-3-Clause,pybind11/LICENSE
 pyside2-qt-5.15.1-rev2-windows,https://download.qt.io/official_releases/QtForPython/pyside2,LicenseRef-custom,pyside2/LICENSES.txt
 qt-5.15.2-rev2-windows,https://code.qt.io/cgit/qt/qt5.git/,LGPL-3.0-only,qt/LICENSE

SPDX-Licenses.txt

@@ -185,6 +185,18 @@
     "SPDX-License-Identifier": "LicenseRef-custom",
     "LicenseFile" : "PVRTexTool/LICENSE_POWERVR_TOOLS.txt"
 },
+{
+    "PackageName" : "python-3.7.10-rev1-multiplatform",
+    "URL"         : "https://python.org",
+    "SPDX-License-Identifier": "PSF-2.0",
+    "LicenseFile" : "python/LICENSE.txt"
+},
+{
+    "PackageName" : "python-3.7.10-rev2-multiplatform",
+    "URL"         : "https://python.org",
+    "SPDX-License-Identifier": "PSF-2.0",
+    "LicenseFile" : "python/LICENSE.txt"
+},
 {
     "PackageName" : "pybind11-2.4.3-rev2-multiplatform",
     "URL"         : "https://github.com/pybind/pybind11",

package-system/python/win_x64/PackageInfo.json

@@ -1,6 +1,6 @@
 {
-    "PackageName" : "python-3.7.10-rev1-windows",
+    "PackageName" : "python-3.7.10-rev2-windows",
     "URL"         : "https://python.org",
-    "License"     : "python-2.0",
+    "License"     : "PSF-2.0",
     "LicenseFile" : "python/LICENSE.txt"
 }

package-system/python/win_x64/build_python.bat

@@ -83,7 +83,7 @@ if %ERRORLEVEL% NEQ 0 (
 echo creating the installation image...
 rem We'll actually use the real python dist builder to do this:
 cd /d %python_src%
-.\PCBuild\amd64\python.exe .\PC\layout\main.py --copy %outputdir%\python -v -d --include-stable --include-pip --include-distutils --include-tcltk --include-idle --include-tools --include-venv --include-dev --include-launchers
+.\PCBuild\amd64\python.exe .\PC\layout\main.py --copy %outputdir%\python -v -d --include-stable --include-pip --include-distutils --include-tcltk --include-idle --include-tools --include-venv --include-dev --include-launchers 
 if %ERRORLEVEL% NEQ 0 (
   echo "Failed to call python's layout script (debug)"
   exit /B 1
@@ -99,6 +99,7 @@ echo copying package metadata and cmake files...
 rem But we do add our own few things...
 set ROBOCOPY_OPTIONS=/NJH /NJS /NP /NDL
 robocopy %ScriptDir% %outputdir% *.cmake PackageInfo.json %ROBOCOPY_OPTIONS%
+robocopy %python_src%\PCbuild\amd64 %outputdir%\python Python*.pdb %ROBOCOPY_OPTIONS%
 
 cd /d %ScriptDir%
 

package-system/python/win_x64/python-config.cmake

@@ -40,8 +40,10 @@ if (${PAL_PLATFORM_NAME} STREQUAL "Windows" )
     set(${MY}_LIBRARY_DEBUG   ${CMAKE_CURRENT_LIST_DIR}/python/libs/python37_d.lib)
     set(${MY}_LIBRARY_RELEASE ${CMAKE_CURRENT_LIST_DIR}/python/libs/python37.lib)
     set(${MY}_INCLUDE_DIR     ${CMAKE_CURRENT_LIST_DIR}/python/include)
-    set(${MY}_DYLIBS_DEBUG    ${CMAKE_CURRENT_LIST_DIR}/python/python37_d.dll ${CMAKE_CURRENT_LIST_DIR}/python/python3_d.dll)
-    set(${MY}_DYLIBS_RELEASE  ${CMAKE_CURRENT_LIST_DIR}/python/python37.dll ${CMAKE_CURRENT_LIST_DIR}/python/python3.dll)
+    set(${MY}_DYLIBS_DEBUG    ${CMAKE_CURRENT_LIST_DIR}/python/python37_d.dll ${CMAKE_CURRENT_LIST_DIR}/python/python3_d.dll
+                              ${CMAKE_CURRENT_LIST_DIR}/python/python37_d.pdb ${CMAKE_CURRENT_LIST_DIR}/python/python3_d.pdb)
+    set(${MY}_DYLIBS_RELEASE  ${CMAKE_CURRENT_LIST_DIR}/python/python37.dll ${CMAKE_CURRENT_LIST_DIR}/python/python3.dll
+                              ${CMAKE_CURRENT_LIST_DIR}/python/python37.pdb ${CMAKE_CURRENT_LIST_DIR}/python/python3.pdb)
 
     set(${MY}_COMPILE_DEFINITIONS DEFAULT_LY_PYTHONHOME="${CMAKE_CURRENT_LIST_DIR}/python")
 

package_build_list_host_windows.json

@@ -37,7 +37,7 @@
         "poly2tri-7f0487a-rev1-windows": "package-system/poly2tri/build_package_image.py --platform-name windows",
         "RapidJSON-1.1.0-rev1-multiplatform": "Scripts/extras/pull_and_build_from_git.py ../../package-system/RapidJSON --platform-name multiplatform --package-root ../../package-system",
         "v-hacd-2.3-1a49edf-rev1-windows": "package-system/v-hacd/build_package_image.py --platform-name windows",
-        "python-3.7.10-rev1-windows" : "package-system/python/build_package_image.py",
+        "python-3.7.10-rev2-windows" : "package-system/python/build_package_image.py",
         "mikkelsen-1.0.0.4-windows": "package-system/mikkelsen/build_package_image.py",
         "mikkelsen-1.0.0.4-android": "package-system/mikkelsen/build_package_image.py --platform android",
         "zlib-1.2.11-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Windows --package-root ../../package-system --clean",
@@ -69,7 +69,7 @@
     "tiff-4.2.0.15-mac-ios": "package-system/tiff-mac-ios",
     "tiff-4.2.0.14-windows": "package-system/tiff-windows",
     "lux_core-2.2-rev5-multiplatform": "package-system/luxcore-multiplatform",
-    "python-3.7.10-rev1-windows": "package-system/python/win_x64/package",
+    "python-3.7.10-rev2-windows": "package-system/python/win_x64/package",
     "pybind11-2.4.3-rev1-multiplatform": "package-system/pybind11-multiplatform",
     "alembic-1.7.11-rev3-multiplatform": "package-system/alembic-multiplatform",
     "ilmbase-2.3.0-rev4-windows": "package-system/ilmbase-windows",