external/python3/ExternalPackage_python3.mk | 7 +++++++
external/python3/generateExternalPackage.py | 6 +++++-
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit e925155733c8324339f2b7280779e8a295797e18
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Jun 5 13:02:25 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Jun 5 16:04:41 2025 +0200
tdf#165120: pip: include .txt files
Change-Id: I06ce1fbfccf540113a918915488fa8a57527ce8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186208
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/external/python3/ExternalPackage_python3.mk
b/external/python3/ExternalPackage_python3.mk
index 0cd182f5684d..3e10b65a0320 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -711,6 +711,8 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
))
$(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib2to3,\
+ Lib/lib2to3/Grammar.txt \
+ Lib/lib2to3/PatternGrammar.txt \
Lib/lib2to3/__init__.py \
Lib/lib2to3/__main__.py \
Lib/lib2to3/btm_matcher.py \
@@ -1050,6 +1052,7 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/pip/_vendor/__init__.py \
Lib/pip/_vendor/six.py \
Lib/pip/_vendor/typing_extensions.py \
+ Lib/pip/_vendor/vendor.txt \
))
$(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/pip/_vendor/cachecontrol,\
@@ -1828,6 +1831,10 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/setuptools/extern/__init__.py \
))
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/site-packages,\
+ Lib/site-packages/README.txt \
+))
+
$(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/tomllib,\
Lib/tomllib/__init__.py \
Lib/tomllib/_parser.py \
diff --git a/external/python3/generateExternalPackage.py
b/external/python3/generateExternalPackage.py
index 4aec90c1c5a2..962c8f3a8130 100755
--- a/external/python3/generateExternalPackage.py
+++ b/external/python3/generateExternalPackage.py
@@ -33,8 +33,12 @@ if __name__ == '__main__':
if "/test" in relLibDir:
continue
+ # ignore setuptools.dist-info and pip.dist-info folders
+ if ".dist-info" in relLibDir:
+ continue
+
for fileName in sorted(files):
- if not fileName.endswith((".py", ".pem", ".exe")):
+ if not fileName.endswith((".py", ".pem", ".exe", ".txt")):
continue
filesList.append(path.join(relPythonDir, fileName))
if filesList:
