external/python3/ExternalPackage_python3.mk | 14 ++++++++++++++ external/python3/generateExternalPackage.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-)
New commits: commit ffcdff2ff40124c58249f4a1219430610db7567f Author: Xisco Fauli <[email protected]> AuthorDate: Tue May 27 14:01:39 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Tue May 27 15:19:35 2025 +0200 tdf#166746: pip: include .exe files Change-Id: Ia4648ba2f51a1e04b1397bcde5e8321955854ba1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185907 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Xisco Fauli <[email protected]> diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index 266eda8210e1..0cd182f5684d 100644 --- a/external/python3/ExternalPackage_python3.mk +++ b/external/python3/ExternalPackage_python3.mk @@ -1154,8 +1154,14 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/pip/_vendor/distlib/metadata.py \ Lib/pip/_vendor/distlib/resources.py \ Lib/pip/_vendor/distlib/scripts.py \ + Lib/pip/_vendor/distlib/t32.exe \ + Lib/pip/_vendor/distlib/t64-arm.exe \ + Lib/pip/_vendor/distlib/t64.exe \ Lib/pip/_vendor/distlib/util.py \ Lib/pip/_vendor/distlib/version.py \ + Lib/pip/_vendor/distlib/w32.exe \ + Lib/pip/_vendor/distlib/w64-arm.exe \ + Lib/pip/_vendor/distlib/w64.exe \ Lib/pip/_vendor/distlib/wheel.py \ )) @@ -1596,6 +1602,10 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/_reqs.py \ Lib/setuptools/archive_util.py \ Lib/setuptools/build_meta.py \ + Lib/setuptools/cli-32.exe \ + Lib/setuptools/cli-64.exe \ + Lib/setuptools/cli-arm64.exe \ + Lib/setuptools/cli.exe \ Lib/setuptools/dep_util.py \ Lib/setuptools/depends.py \ Lib/setuptools/discovery.py \ @@ -1603,6 +1613,10 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/setuptools/errors.py \ Lib/setuptools/extension.py \ Lib/setuptools/glob.py \ + Lib/setuptools/gui-32.exe \ + Lib/setuptools/gui-64.exe \ + Lib/setuptools/gui-arm64.exe \ + Lib/setuptools/gui.exe \ Lib/setuptools/installer.py \ Lib/setuptools/launch.py \ Lib/setuptools/logging.py \ diff --git a/external/python3/generateExternalPackage.py b/external/python3/generateExternalPackage.py index ef6650438626..4aec90c1c5a2 100755 --- a/external/python3/generateExternalPackage.py +++ b/external/python3/generateExternalPackage.py @@ -34,7 +34,7 @@ if __name__ == '__main__': continue for fileName in sorted(files): - if not fileName.endswith(".py") and not fileName.endswith(".pem"): + if not fileName.endswith((".py", ".pem", ".exe")): continue filesList.append(path.join(relPythonDir, fileName)) if filesList:
