ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

python3: get python.exe from extern

Browse Source 
Instead of downloading nuget.exe and then python.exe
as explained in https://lists.freedesktop.org/archives/libreoffice/2025-January/092881.html,
Add python.3.12.8.nupkg to extern and download it as a tarball
to unzip it in external/pythonx86.
find_python.bat will look for python.exe in external/pythonx86/tools

Downloaded from
https://globalcdn.nuget.org/packages/python.3.12.8.nupkg?packageVersion=3.12.8

Change-Id: Ib1638fa66b3983048c2f9a472d00ce365602fcbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180078
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
This commit is contained in:
Xisco Fauli
2025-01-10 23:18:29 +01:00
parent 3eb7cdd6ec
commit c9ae567c79
5 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/python3/ExternalProject_python3.mk
Vendored
-6
View File
@@ -33,15 +33,9 @@ ifeq ($(OS),WNT)
# at least for MSVC 2008 it is necessary to clear MAKEFLAGS because
# nmake is invoked
#
# Since Python 3.11, _freeze_module.vcxproj needs python.exe to build
# deepfreeze.c. At the moment target _RebuildDeepFrozen is called, python.exe
# doesn't exist yet so it needs to be downloaded using nuget.
# Call find_python.bat first to have nuget.exe and python.exe ready before building
$(call gb_ExternalProject_get_state_target,python3,build) :
$(call gb_Trace_StartRange,python3,EXTERNAL)
$(call gb_ExternalProject_run,build,\
cmd /c $(gb_UnpackedTarball_workdir)/python3/PCbuild/find_python.bat -q && \
MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build $(gb_MSBUILD_CONFIG_AND_PLATFORM) \
/p:bz2Dir=$(gb_UnpackedTarball_workdir)/bzip2 \
/p:opensslIncludeDir=$(gb_UnpackedTarball_workdir)/openssl/include \