From 0926088612531c34ad93431604b7ee3d7a463abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 15 Nov 2023 16:54:40 +0100 Subject: [PATCH 1/2] gh-96954: Fix `make regen-unicodedata` in out-of-tree builds This avoids: python3.13 Tools/unicode/makeunicodedata.py python3.13: can't open file '.../build/debug/Tools/unicode/makeunicodedata.py': [Errno 2] No such file or directory make: *** [Makefile:1498: regen-unicodedata] Error 2 --- Makefile.pre.in | 2 +- .../next/Build/2023-11-15-16-56-20.gh-issue-96954.6FYvKn.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Build/2023-11-15-16-56-20.gh-issue-96954.6FYvKn.rst diff --git a/Makefile.pre.in b/Makefile.pre.in index 4fa0337fcc7777..3405975e89040a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1348,7 +1348,7 @@ regen-limited-abi: all .PHONY: regen-unicodedata regen-unicodedata: - $(PYTHON_FOR_REGEN) Tools/unicode/makeunicodedata.py + $(PYTHON_FOR_REGEN) $(srcdir)/Tools/unicode/makeunicodedata.py ############################################################################ diff --git a/Misc/NEWS.d/next/Build/2023-11-15-16-56-20.gh-issue-96954.6FYvKn.rst b/Misc/NEWS.d/next/Build/2023-11-15-16-56-20.gh-issue-96954.6FYvKn.rst new file mode 100644 index 00000000000000..e9a30e5f4bbaa7 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2023-11-15-16-56-20.gh-issue-96954.6FYvKn.rst @@ -0,0 +1 @@ +Make ``make regen-unicodedata`` work for out-of-tree builds of CPython. From 2f8c9144175010b3491571ebb7ab4ec648c1e450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 15 Nov 2023 17:13:09 +0100 Subject: [PATCH 2/2] Re-reun `make regen-unicodedata` to update the script path in generated files --- Modules/unicodedata_db.h | 2 +- Modules/unicodename_db.h | 2 +- Objects/unicodetype_db.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/unicodedata_db.h b/Modules/unicodedata_db.h index ed4b0eea9a6c59..3e210863448b78 100644 --- a/Modules/unicodedata_db.h +++ b/Modules/unicodedata_db.h @@ -1,4 +1,4 @@ -/* this file was generated by Tools/unicode/makeunicodedata.py 3.3 */ +/* this file was generated by ./Tools/unicode/makeunicodedata.py 3.3 */ #define UNIDATA_VERSION "15.1.0" /* a list of unique database records */ diff --git a/Modules/unicodename_db.h b/Modules/unicodename_db.h index a39dcccd408511..4fe60ad5ed4452 100644 --- a/Modules/unicodename_db.h +++ b/Modules/unicodename_db.h @@ -1,4 +1,4 @@ -/* this file was generated by Tools/unicode/makeunicodedata.py 3.3 */ +/* this file was generated by ./Tools/unicode/makeunicodedata.py 3.3 */ #define NAME_MAXLEN 256 diff --git a/Objects/unicodetype_db.h b/Objects/unicodetype_db.h index 39a567dc46e89a..e6dbeffbe2aa3e 100644 --- a/Objects/unicodetype_db.h +++ b/Objects/unicodetype_db.h @@ -1,4 +1,4 @@ -/* this file was generated by Tools/unicode/makeunicodedata.py 3.3 */ +/* this file was generated by ./Tools/unicode/makeunicodedata.py 3.3 */ /* a list of unique character type descriptors */ const _PyUnicode_TypeRecord _PyUnicode_TypeRecords[] = {