[Bf-blender-cvs] [3a5256307dc] tmp-vfx-platform-2023: deps: cleanup python windows build

[Ray Molenkamp]

Commit: 3a5256307dc3bcc64d47874ed9e3afa5e68a6f90
Author: Ray Molenkamp
Date:   Sat Nov 19 10:40:19 2022 -0700
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rB3a5256307dc3bcc64d47874ed9e3afa5e68a6f90

deps: cleanup python windows build

Move linking the openssl and zlib folders to the patch step
so you can run several builds in a row without having to
remove the folder

also fix typo in the patch

===================================================================

M	build_files/build_environment/cmake/python.cmake
M	build_files/build_environment/patches/python_windows.diff

===================================================================

diff --git a/build_files/build_environment/cmake/python.cmake b/build_files/build_environment/cmake/python.cmake
index c9a0d5ab6af..3d055a8af0b 100644
--- a/build_files/build_environment/cmake/python.cmake
+++ b/build_files/build_environment/cmake/python.cmake
@@ -34,12 +34,13 @@ if(WIN32)
     # the foldernames *HAVE* to match the ones inside pythons get_externals.cmd.
     # python 3.10.8 still ships zlib 1.2.12, replace it with our 1.2.13
     # copy until they update. Same rules apply to openssl foldernames HAVE to match
-    # regardless of the version actually in there. 
-    CONFIGURE_COMMAND mkdir ${PYTHON_EXTERNALS_FOLDER_DOS} &&
+    # regardless of the version actually in there.
+    PATCH_COMMAND mkdir ${PYTHON_EXTERNALS_FOLDER_DOS} &&
       mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\zlib-1.2.12 ${ZLIB_SOURCE_FOLDER_DOS} &&
       mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\openssl-1.1.1q ${SSL_SOURCE_FOLDER_DOS} &&
       ${CMAKE_COMMAND} -E copy ${ZLIB_SOURCE_FOLDER}/../external_zlib-build/zconf.h ${PYTHON_EXTERNALS_FOLDER}/zlib-1.2.12/zconf.h &&
       ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_windows.diff
+    CONFIGURE_COMMAND echo "."
     BUILD_COMMAND ${CONFIGURE_ENV_MSVC} && cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && set LDFLAGS=/DEBUG && call prepare_ssl.bat && call build.bat -e -p x64 -c ${BUILD_MODE}
     INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/ --include-stable --include-pip --include-dev --include-launchers  --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
   )
diff --git a/build_files/build_environment/patches/python_windows.diff b/build_files/build_environment/patches/python_windows.diff
index 5b6434f1440..a8d0d6d8126 100644
--- a/build_files/build_environment/patches/python_windows.diff
+++ b/build_files/build_environment/patches/python_windows.diff
@@ -8,7 +8,7 @@
 -if errorlevel 1 exit /b
 +REM Blender: we only need x64, ssl is kind of a long build, so just build what we need
 +REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=Win32
-+REMif errorlevel 1 exit /b
++REM if errorlevel 1 exit /b
  %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=x64
  if errorlevel 1 exit /b
 -%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM