Skip to content

Commit ef3ef6f

Browse files
kumaraditya303kumaraditya303
authored
bpo-46429: Merge all deepfrozen files into one (pythonGH-30572)
1 parent 650720a commit ef3ef6f

File tree

6 files changed

+120
-243
lines changed

6 files changed

+120
-243
lines changed

‎Makefile.pre.in

+39-106
Original file line numberDiff line numberDiff line change
@@ -484,32 +484,7 @@ OBJECT_OBJS= \
484484
Objects/unionobject.o \
485485
Objects/weakrefobject.o
486486

487-
# DEEPFREEZE_OBJS is auto-generated by Tools/scripts/freeze_modules.py.
488-
DEEPFREEZE_OBJS = \
489-
Python/deepfreeze/importlib._bootstrap.o \
490-
Python/deepfreeze/importlib._bootstrap_external.o \
491-
Python/deepfreeze/zipimport.o \
492-
Python/deepfreeze/abc.o \
493-
Python/deepfreeze/codecs.o \
494-
Python/deepfreeze/io.o \
495-
Python/deepfreeze/_collections_abc.o \
496-
Python/deepfreeze/_sitebuiltins.o \
497-
Python/deepfreeze/genericpath.o \
498-
Python/deepfreeze/ntpath.o \
499-
Python/deepfreeze/posixpath.o \
500-
Python/deepfreeze/os.o \
501-
Python/deepfreeze/site.o \
502-
Python/deepfreeze/stat.o \
503-
Python/deepfreeze/importlib.util.o \
504-
Python/deepfreeze/importlib.machinery.o \
505-
Python/deepfreeze/runpy.o \
506-
Python/deepfreeze/__hello__.o \
507-
Python/deepfreeze/__phello__.o \
508-
Python/deepfreeze/__phello__.ham.o \
509-
Python/deepfreeze/__phello__.ham.eggs.o \
510-
Python/deepfreeze/__phello__.spam.o \
511-
Python/deepfreeze/frozen_only.o
512-
# End DEEPFREEZE_OBJS
487+
DEEPFREEZE_OBJS = Python/deepfreeze/deepfreeze.o
513488

514489
##########################################################################
515490
# objects that get linked into the Python library
@@ -984,86 +959,6 @@ _bootstrap_python: $(LIBRARY_OBJS_OMIT_FROZEN) Programs/_bootstrap_python.o Modu
984959
$(LINKCC) $(PY_LDFLAGS_NOLTO) -o $@ $(LIBRARY_OBJS_OMIT_FROZEN) \
985960
Programs/_bootstrap_python.o Modules/getpath.o $(LIBS) $(MODLIBS) $(SYSLIBS)
986961

987-
############################################################################
988-
# Deepfreeze targets
989-
990-
.PHONY: regen-deepfreeze
991-
regen-deepfreeze: $(DEEPFREEZE_OBJS)
992-
993-
DEEPFREEZE_DEPS=$(srcdir)/Tools/scripts/deepfreeze.py $(FREEZE_MODULE_DEPS)
994-
995-
# BEGIN: deepfreeze modules
996-
997-
Python/deepfreeze/importlib._bootstrap.c: Python/frozen_modules/importlib._bootstrap.h $(DEEPFREEZE_DEPS)
998-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/importlib._bootstrap.h -m importlib._bootstrap -o Python/deepfreeze/importlib._bootstrap.c
999-
1000-
Python/deepfreeze/importlib._bootstrap_external.c: Python/frozen_modules/importlib._bootstrap_external.h $(DEEPFREEZE_DEPS)
1001-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/importlib._bootstrap_external.h -m importlib._bootstrap_external -o Python/deepfreeze/importlib._bootstrap_external.c
1002-
1003-
Python/deepfreeze/zipimport.c: Python/frozen_modules/zipimport.h $(DEEPFREEZE_DEPS)
1004-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/zipimport.h -m zipimport -o Python/deepfreeze/zipimport.c
1005-
1006-
Python/deepfreeze/abc.c: Python/frozen_modules/abc.h $(DEEPFREEZE_DEPS)
1007-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/abc.h -m abc -o Python/deepfreeze/abc.c
1008-
1009-
Python/deepfreeze/codecs.c: Python/frozen_modules/codecs.h $(DEEPFREEZE_DEPS)
1010-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/codecs.h -m codecs -o Python/deepfreeze/codecs.c
1011-
1012-
Python/deepfreeze/io.c: Python/frozen_modules/io.h $(DEEPFREEZE_DEPS)
1013-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/io.h -m io -o Python/deepfreeze/io.c
1014-
1015-
Python/deepfreeze/_collections_abc.c: Python/frozen_modules/_collections_abc.h $(DEEPFREEZE_DEPS)
1016-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/_collections_abc.h -m _collections_abc -o Python/deepfreeze/_collections_abc.c
1017-
1018-
Python/deepfreeze/_sitebuiltins.c: Python/frozen_modules/_sitebuiltins.h $(DEEPFREEZE_DEPS)
1019-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/_sitebuiltins.h -m _sitebuiltins -o Python/deepfreeze/_sitebuiltins.c
1020-
1021-
Python/deepfreeze/genericpath.c: Python/frozen_modules/genericpath.h $(DEEPFREEZE_DEPS)
1022-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/genericpath.h -m genericpath -o Python/deepfreeze/genericpath.c
1023-
1024-
Python/deepfreeze/ntpath.c: Python/frozen_modules/ntpath.h $(DEEPFREEZE_DEPS)
1025-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/ntpath.h -m ntpath -o Python/deepfreeze/ntpath.c
1026-
1027-
Python/deepfreeze/posixpath.c: Python/frozen_modules/posixpath.h $(DEEPFREEZE_DEPS)
1028-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/posixpath.h -m posixpath -o Python/deepfreeze/posixpath.c
1029-
1030-
Python/deepfreeze/os.c: Python/frozen_modules/os.h $(DEEPFREEZE_DEPS)
1031-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/os.h -m os -o Python/deepfreeze/os.c
1032-
1033-
Python/deepfreeze/site.c: Python/frozen_modules/site.h $(DEEPFREEZE_DEPS)
1034-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/site.h -m site -o Python/deepfreeze/site.c
1035-
1036-
Python/deepfreeze/stat.c: Python/frozen_modules/stat.h $(DEEPFREEZE_DEPS)
1037-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/stat.h -m stat -o Python/deepfreeze/stat.c
1038-
1039-
Python/deepfreeze/importlib.util.c: Python/frozen_modules/importlib.util.h $(DEEPFREEZE_DEPS)
1040-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/importlib.util.h -m importlib.util -o Python/deepfreeze/importlib.util.c
1041-
1042-
Python/deepfreeze/importlib.machinery.c: Python/frozen_modules/importlib.machinery.h $(DEEPFREEZE_DEPS)
1043-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/importlib.machinery.h -m importlib.machinery -o Python/deepfreeze/importlib.machinery.c
1044-
1045-
Python/deepfreeze/runpy.c: Python/frozen_modules/runpy.h $(DEEPFREEZE_DEPS)
1046-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/runpy.h -m runpy -o Python/deepfreeze/runpy.c
1047-
1048-
Python/deepfreeze/__hello__.c: Python/frozen_modules/__hello__.h $(DEEPFREEZE_DEPS)
1049-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/__hello__.h -m __hello__ -o Python/deepfreeze/__hello__.c
1050-
1051-
Python/deepfreeze/__phello__.c: Python/frozen_modules/__phello__.h $(DEEPFREEZE_DEPS)
1052-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/__phello__.h -m __phello__ -o Python/deepfreeze/__phello__.c
1053-
1054-
Python/deepfreeze/__phello__.ham.c: Python/frozen_modules/__phello__.ham.h $(DEEPFREEZE_DEPS)
1055-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/__phello__.ham.h -m __phello__.ham -o Python/deepfreeze/__phello__.ham.c
1056-
1057-
Python/deepfreeze/__phello__.ham.eggs.c: Python/frozen_modules/__phello__.ham.eggs.h $(DEEPFREEZE_DEPS)
1058-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/__phello__.ham.eggs.h -m __phello__.ham.eggs -o Python/deepfreeze/__phello__.ham.eggs.c
1059-
1060-
Python/deepfreeze/__phello__.spam.c: Python/frozen_modules/__phello__.spam.h $(DEEPFREEZE_DEPS)
1061-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/__phello__.spam.h -m __phello__.spam -o Python/deepfreeze/__phello__.spam.c
1062-
1063-
Python/deepfreeze/frozen_only.c: Python/frozen_modules/frozen_only.h $(DEEPFREEZE_DEPS)
1064-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py Python/frozen_modules/frozen_only.h -m frozen_only -o Python/deepfreeze/frozen_only.c
1065-
1066-
# END: deepfreeze modules
1067962

1068963
############################################################################
1069964
# frozen modules (including importlib)
@@ -1235,6 +1130,44 @@ regen-frozen: Tools/scripts/freeze_modules.py $(FROZEN_FILES_IN)
12351130
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/freeze_modules.py
12361131
@echo "The Makefile was updated, you may need to re-run make."
12371132

1133+
############################################################################
1134+
# Deepfreeze targets
1135+
1136+
.PHONY: regen-deepfreeze
1137+
regen-deepfreeze: $(DEEPFREEZE_OBJS)
1138+
1139+
DEEPFREEZE_DEPS=$(srcdir)/Tools/scripts/deepfreeze.py $(FREEZE_MODULE_DEPS) $(FROZEN_FILES_OUT)
1140+
1141+
# BEGIN: deepfreeze modules
1142+
Python/deepfreeze/deepfreeze.c: $(DEEPFREEZE_DEPS)
1143+
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/scripts/deepfreeze.py \
1144+
Python/frozen_modules/importlib._bootstrap.h:importlib._bootstrap \
1145+
Python/frozen_modules/importlib._bootstrap_external.h:importlib._bootstrap_external \
1146+
Python/frozen_modules/zipimport.h:zipimport \
1147+
Python/frozen_modules/abc.h:abc \
1148+
Python/frozen_modules/codecs.h:codecs \
1149+
Python/frozen_modules/io.h:io \
1150+
Python/frozen_modules/_collections_abc.h:_collections_abc \
1151+
Python/frozen_modules/_sitebuiltins.h:_sitebuiltins \
1152+
Python/frozen_modules/genericpath.h:genericpath \
1153+
Python/frozen_modules/ntpath.h:ntpath \
1154+
Python/frozen_modules/posixpath.h:posixpath \
1155+
Python/frozen_modules/os.h:os \
1156+
Python/frozen_modules/site.h:site \
1157+
Python/frozen_modules/stat.h:stat \
1158+
Python/frozen_modules/importlib.util.h:importlib.util \
1159+
Python/frozen_modules/importlib.machinery.h:importlib.machinery \
1160+
Python/frozen_modules/runpy.h:runpy \
1161+
Python/frozen_modules/__hello__.h:__hello__ \
1162+
Python/frozen_modules/__phello__.h:__phello__ \
1163+
Python/frozen_modules/__phello__.ham.h:__phello__.ham \
1164+
Python/frozen_modules/__phello__.ham.eggs.h:__phello__.ham.eggs \
1165+
Python/frozen_modules/__phello__.spam.h:__phello__.spam \
1166+
Python/frozen_modules/frozen_only.h:frozen_only \
1167+
-o Python/deepfreeze/deepfreeze.c
1168+
1169+
# END: deepfreeze modules
1170+
12381171
# We keep this renamed target around for folks with muscle memory.
12391172
.PHONY: regen-importlib
12401173
regen-importlib: regen-frozen

‎Misc/NEWS.d/next/Build/2022-01-19-04-36-15.bpo-46429.y0OtVL.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Merge all deep-frozen files into one for space savings. Patch by Kumar Aditya.

0 commit comments

Comments
 (0)