Skip to content

bpo-43372: Use BUILDPYTHON for regen-frozen. #24714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

bpo-43372: Use BUILDPYTHON for regen-frozen. #24714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9117ebf
Use BUILDPYTHON for regen-frozen.
nascheme Mar 3, 2021
2b74672
Reformat NEWS as single paragraph.
nascheme Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Lib/ctypes/test/test_values.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ class struct_frozen(Structure):
continue
items.append((entry.name.decode("ascii"), entry.size))

expected = [("__hello__", 125),
("__phello__", -125),
("__phello__.spam", 125),
expected = [("__hello__", 129),
("__phello__", -129),
("__phello__.spam", 129),
]
self.assertEqual(items, expected, "PyImport_FrozenModules example "
"in Doc/library/ctypes.rst may be out of date")
Expand Down
8 changes: 6 additions & 2 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,9 +871,13 @@ regen-opcode:
$(UPDATE_FILE) $(srcdir)/Include/opcode.h $(srcdir)/Include/opcode.h.new

.PHONY: regen-frozen
regen-frozen:
regen-frozen: build_all
# Regenerate code for frozen module "__hello__".
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/freeze/regen_frozen.py $(srcdir)/Python/frozen_hello.h
$(RUNSHARED) ./$(BUILDPYTHON) \
$(srcdir)/Tools/freeze/regen_frozen.py \
$(srcdir)/Python/frozen_hello.h.new
$(UPDATE_FILE) $(srcdir)/Python/frozen_hello.h \
$(srcdir)/Python/frozen_hello.h.new

.PHONY: regen-token
regen-token:
Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Build/2021-03-02-18-24-51.bpo-43372.HvwNkL.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Change the regen-frozen target to use BUILDPYTHON rather than
PYTHON_FOR_REGEN. The marshaled data for code objects has changed with
bpo-42246, commit 877df85. Update the frozen code for ``__hello__`` and update
the expected code sizes in ctypes test_frozentable.
2 changes: 1 addition & 1 deletion Python/frozen_hello.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ static unsigned char M___hello__[] = {
100,218,5,112,114,105,110,116,169,0,114,2,0,
0,0,114,2,0,0,0,218,4,110,111,110,101,
218,8,60,109,111,100,117,108,101,62,1,0,0,
0,115,2,0,0,0,4,1,
0,115,6,0,0,0,4,0,12,1,255,128,
};