Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6c91fd5

Browse files
gvanrossumpull[bot]
gvanrossum
authored and
pull[bot]
committed
gh-108716: Cleanup remaining deepfreeze infrastructure (#116919)
Keep Tools/build/deepfreeze.py around (we may repurpose it for deepfreezing non-code objects), and keep basic "clean" targets that remove the output of former deep-freeze activities, to keep the build directories of current devs clean.
1 parent 293ed05 commit 6c91fd5

9 files changed

Lines changed: 7 additions & 180 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ Tools/unicode/data/
142142
/profile-clean-stamp
143143
/profile-run-stamp
144144
/profile-bolt-stamp
145-
/Python/deepfreeze/*.c
146145
/pybuilddir.txt
147146
/pyconfig.h
148147
/python-config

‎Makefile.pre.in‎

Lines changed: 3 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ Programs/_testembed: Programs/_testembed.o $(LINK_PYTHON_DEPS)
14001400
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS)
14011401

14021402
############################################################################
1403-
# "Bootstrap Python" used to run deepfreeze.py
1403+
# "Bootstrap Python" used to run Programs/_freeze_module.py
14041404

14051405
BOOTSTRAP_HEADERS = \
14061406
Python/frozen_modules/importlib._bootstrap.h \
@@ -1419,7 +1419,7 @@ _bootstrap_python: $(LIBRARY_OBJS_OMIT_FROZEN) Programs/_bootstrap_python.o Modu
14191419
#
14201420
# Freezing is a multi step process. It works differently for standard builds
14211421
# and cross builds. Standard builds use Programs/_freeze_module and
1422-
# _bootstrap_python for freezing and deepfreezing, so users can build Python
1422+
# _bootstrap_python for freezing, so users can build Python
14231423
# without an existing Python installation. Cross builds cannot execute
14241424
# compiled binaries and therefore rely on an external build Python
14251425
# interpreter. The build interpreter must have same version and same bytecode
@@ -1433,12 +1433,10 @@ _bootstrap_python: $(LIBRARY_OBJS_OMIT_FROZEN) Programs/_bootstrap_python.o Modu
14331433
# 5) create remaining frozen module headers with
14341434
# ``./_bootstrap_python Programs/_freeze_module.py``. The pure Python
14351435
# script is used to test the cross compile code path.
1436-
# 6) deepfreeze modules with _bootstrap_python
14371436
#
14381437
# Cross compile process:
14391438
# 1) create all frozen module headers with external build Python and
14401439
# Programs/_freeze_module.py script.
1441-
# 2) deepfreeze modules with external build Python.
14421440
#
14431441

14441442
# FROZEN_FILES_* are auto-generated by Tools/build/freeze_modules.py.
@@ -1584,41 +1582,6 @@ regen-frozen: Tools/build/freeze_modules.py $(FROZEN_FILES_IN)
15841582
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/build/freeze_modules.py --frozen-modules
15851583
@echo "The Makefile was updated, you may need to re-run make."
15861584

1587-
############################################################################
1588-
# Deepfreeze targets
1589-
1590-
DEEPFREEZE_C = Python/deepfreeze/deepfreeze.c
1591-
DEEPFREEZE_DEPS=$(srcdir)/Tools/build/deepfreeze.py Include/internal/pycore_global_strings.h $(FREEZE_MODULE_DEPS) $(FROZEN_FILES_OUT)
1592-
1593-
# BEGIN: deepfreeze modules
1594-
$(DEEPFREEZE_C): $(DEEPFREEZE_DEPS)
1595-
$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/build/deepfreeze.py \
1596-
Python/frozen_modules/importlib._bootstrap.h:importlib._bootstrap \
1597-
Python/frozen_modules/importlib._bootstrap_external.h:importlib._bootstrap_external \
1598-
Python/frozen_modules/zipimport.h:zipimport \
1599-
Python/frozen_modules/abc.h:abc \
1600-
Python/frozen_modules/codecs.h:codecs \
1601-
Python/frozen_modules/io.h:io \
1602-
Python/frozen_modules/_collections_abc.h:_collections_abc \
1603-
Python/frozen_modules/_sitebuiltins.h:_sitebuiltins \
1604-
Python/frozen_modules/genericpath.h:genericpath \
1605-
Python/frozen_modules/ntpath.h:ntpath \
1606-
Python/frozen_modules/posixpath.h:posixpath \
1607-
Python/frozen_modules/os.h:os \
1608-
Python/frozen_modules/site.h:site \
1609-
Python/frozen_modules/stat.h:stat \
1610-
Python/frozen_modules/importlib.util.h:importlib.util \
1611-
Python/frozen_modules/importlib.machinery.h:importlib.machinery \
1612-
Python/frozen_modules/runpy.h:runpy \
1613-
Python/frozen_modules/__hello__.h:__hello__ \
1614-
Python/frozen_modules/__phello__.h:__phello__ \
1615-
Python/frozen_modules/__phello__.ham.h:__phello__.ham \
1616-
Python/frozen_modules/__phello__.ham.eggs.h:__phello__.ham.eggs \
1617-
Python/frozen_modules/__phello__.spam.h:__phello__.spam \
1618-
Python/frozen_modules/frozen_only.h:frozen_only \
1619-
-o Python/deepfreeze/deepfreeze.c
1620-
# END: deepfreeze modules
1621-
16221585
# We keep this renamed target around for folks with muscle memory.
16231586
.PHONY: regen-importlib
16241587
regen-importlib: regen-frozen
@@ -2933,7 +2896,7 @@ clean-retain-profile: pycremoval
29332896
-rm -f python.html python*.js python.data python*.symbols python*.map
29342897
-rm -f $(WASM_STDLIB)
29352898
-rm -f Programs/_testembed Programs/_freeze_module
2936-
-rm -f Python/deepfreeze/*.[co]
2899+
-rm -rf Python/deepfreeze
29372900
-rm -f Python/frozen_modules/*.h
29382901
-rm -f Python/frozen_modules/MANIFEST
29392902
-rm -f jit_stencils.h

‎PCbuild/_freeze_module.vcxproj‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -476,25 +476,6 @@
476476
<Message Text="Updated files: @(_Updated->'%(Filename)%(Extension)',', ')"
477477
Condition="'@(_Updated)' != ''" Importance="high" />
478478
</Target>
479-
<Target Name="_RebuildDeepFrozen"
480-
AfterTargets="_RebuildFrozen"
481-
DependsOnTargets="FindPythonForBuild"
482-
Condition="$(Configuration) != 'PGUpdate'">
483-
<PropertyGroup>
484-
<FreezeMappingsFile>
485-
<!-- BEGIN freeze mapping file -->
486-
$(IntDir)\deepfreeze_mappings.txt
487-
<!-- END freeze mapping file -->
488-
</FreezeMappingsFile>
489-
</PropertyGroup>
490-
<WriteLinesToFile
491-
File="$(FreezeMappingsFile)"
492-
Overwrite="true"
493-
Lines="@(FrozenModule->'%(FullPath):%(FrozenId)')" />
494-
<!-- BEGIN deepfreeze rule -->
495-
<Exec Command='$(PythonForBuild) "$(PySourcePath)Tools\build\deepfreeze.py" -f "$(IntDir)\deepfreeze_mappings.txt" -o "$(GeneratedFrozenModulesDir)deepfreeze.c"' />
496-
<!-- END deepfreeze rule -->
497-
</Target>
498479
<Target Name="_CleanFrozen" BeforeTargets="CoreClean" Condition="$(Configuration) != 'PGUpdate'">
499480
<ItemGroup>
500481
<Clean Include="%(None.IntFile)" />

‎PCbuild/pythoncore.vcxproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -632,11 +632,6 @@
632632
<ClCompile Include="..\Python\traceback.c" />
633633
<ClCompile Include="..\Python\tracemalloc.c" />
634634
</ItemGroup>
635-
<ItemGroup>
636-
<!-- BEGIN deepfreeze -->
637-
<ClCompile Include="$(GeneratedFrozenModulesDir)deepfreeze.c" />
638-
<!-- END deepfreeze -->
639-
</ItemGroup>
640635
<ItemGroup Condition="$(IncludeExternals)">
641636
<ClCompile Include="..\Modules\zlibmodule.c" />
642637
<ClCompile Include="$(zlibDir)\adler32.c" />

‎Python/deepfreeze/README.txt‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Python/frozen.c‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -66,34 +66,6 @@
6666
#include "frozen_modules/frozen_only.h"
6767
/* End includes */
6868

69-
#define GET_CODE(name) _Py_get_##name##_toplevel
70-
71-
/* Start extern declarations */
72-
extern PyObject *_Py_get_importlib__bootstrap_toplevel(void);
73-
extern PyObject *_Py_get_importlib__bootstrap_external_toplevel(void);
74-
extern PyObject *_Py_get_zipimport_toplevel(void);
75-
extern PyObject *_Py_get_abc_toplevel(void);
76-
extern PyObject *_Py_get_codecs_toplevel(void);
77-
extern PyObject *_Py_get_io_toplevel(void);
78-
extern PyObject *_Py_get__collections_abc_toplevel(void);
79-
extern PyObject *_Py_get__sitebuiltins_toplevel(void);
80-
extern PyObject *_Py_get_genericpath_toplevel(void);
81-
extern PyObject *_Py_get_ntpath_toplevel(void);
82-
extern PyObject *_Py_get_posixpath_toplevel(void);
83-
extern PyObject *_Py_get_os_toplevel(void);
84-
extern PyObject *_Py_get_site_toplevel(void);
85-
extern PyObject *_Py_get_stat_toplevel(void);
86-
extern PyObject *_Py_get_importlib_util_toplevel(void);
87-
extern PyObject *_Py_get_importlib_machinery_toplevel(void);
88-
extern PyObject *_Py_get_runpy_toplevel(void);
89-
extern PyObject *_Py_get___hello___toplevel(void);
90-
extern PyObject *_Py_get___phello___toplevel(void);
91-
extern PyObject *_Py_get___phello___ham_toplevel(void);
92-
extern PyObject *_Py_get___phello___ham_eggs_toplevel(void);
93-
extern PyObject *_Py_get___phello___spam_toplevel(void);
94-
extern PyObject *_Py_get_frozen_only_toplevel(void);
95-
/* End extern declarations */
96-
9769
static const struct _frozen bootstrap_modules[] = {
9870
{"_frozen_importlib", _Py_M__importlib__bootstrap, (int)sizeof(_Py_M__importlib__bootstrap), false},
9971
{"_frozen_importlib_external", _Py_M__importlib__bootstrap_external, (int)sizeof(_Py_M__importlib__bootstrap_external), false},

‎Tools/build/freeze_modules.py‎

Lines changed: 2 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
# If FROZEN_MODULES_DIR or DEEPFROZEN_MODULES_DIR is changed then the
2121
# .gitattributes and .gitignore files needs to be updated.
2222
FROZEN_MODULES_DIR = os.path.join(ROOT_DIR, 'Python', 'frozen_modules')
23-
DEEPFROZEN_MODULES_DIR = os.path.join(ROOT_DIR, 'Python', 'deepfreeze')
24-
DEEPFREEZE_MAPPING_FNAME = 'deepfreeze_mappings.txt'
2523

2624
FROZEN_FILE = os.path.join(ROOT_DIR, 'Python', 'frozen.c')
2725
MAKEFILE = os.path.join(ROOT_DIR, 'Makefile.pre.in')
@@ -233,16 +231,15 @@ def iter_subs():
233231
#######################################
234232
# frozen source files
235233

236-
class FrozenSource(namedtuple('FrozenSource', 'id pyfile frozenfile deepfreezefile')):
234+
class FrozenSource(namedtuple('FrozenSource', 'id pyfile frozenfile')):
237235

238236
@classmethod
239237
def from_id(cls, frozenid, pyfile=None):
240238
if not pyfile:
241239
pyfile = os.path.join(STDLIB_DIR, *frozenid.split('.')) + '.py'
242240
#assert os.path.exists(pyfile), (frozenid, pyfile)
243241
frozenfile = resolve_frozen_file(frozenid, FROZEN_MODULES_DIR)
244-
deepfreezefile = resolve_frozen_file(frozenid, DEEPFROZEN_MODULES_DIR)
245-
return cls(frozenid, pyfile, frozenfile, deepfreezefile)
242+
return cls(frozenid, pyfile, frozenfile)
246243

247244
@property
248245
def frozenid(self):
@@ -508,13 +505,6 @@ def regen_frozen(modules):
508505
lines.append(f'/* {mod.section} */')
509506
lastsection = mod.section
510507

511-
# Also add a extern declaration for the corresponding
512-
# deepfreeze-generated function.
513-
orig_name = mod.source.id
514-
code_name = orig_name.replace(".", "_")
515-
get_code_name = "_Py_get_%s_toplevel" % code_name
516-
externlines.append("extern PyObject *%s(void);" % get_code_name)
517-
518508
pkg = 'true' if mod.ispkg else 'false'
519509
size = f"(int)sizeof({mod.symbol})"
520510
line = f'{{"{mod.name}", {mod.symbol}, {size}, {pkg}}},'
@@ -549,13 +539,6 @@ def regen_frozen(modules):
549539
headerlines,
550540
FROZEN_FILE,
551541
)
552-
lines = replace_block(
553-
lines,
554-
"/* Start extern declarations */",
555-
"/* End extern declarations */",
556-
externlines,
557-
FROZEN_FILE,
558-
)
559542
lines = replace_block(
560543
lines,
561544
"static const struct _frozen bootstrap_modules[] =",
@@ -591,8 +574,6 @@ def regen_makefile(modules):
591574
pyfiles = []
592575
frozenfiles = []
593576
rules = ['']
594-
deepfreezerules = ["$(DEEPFREEZE_C): $(DEEPFREEZE_DEPS)",
595-
"\t$(PYTHON_FOR_FREEZE) $(srcdir)/Tools/build/deepfreeze.py \\"]
596577
for src in _iter_sources(modules):
597578
frozen_header = relpath_for_posix_display(src.frozenfile, ROOT_DIR)
598579
frozenfiles.append(f'\t\t{frozen_header} \\')
@@ -614,8 +595,6 @@ def regen_makefile(modules):
614595
f'\t{freeze}',
615596
'',
616597
])
617-
deepfreezerules.append(f"\t{frozen_header}:{src.frozenid} \\")
618-
deepfreezerules.append('\t-o Python/deepfreeze/deepfreeze.c')
619598
pyfiles[-1] = pyfiles[-1].rstrip(" \\")
620599
frozenfiles[-1] = frozenfiles[-1].rstrip(" \\")
621600

@@ -643,23 +622,13 @@ def regen_makefile(modules):
643622
rules,
644623
MAKEFILE,
645624
)
646-
lines = replace_block(
647-
lines,
648-
"# BEGIN: deepfreeze modules",
649-
"# END: deepfreeze modules",
650-
deepfreezerules,
651-
MAKEFILE,
652-
)
653625
outfile.writelines(lines)
654626

655627

656628
def regen_pcbuild(modules):
657629
projlines = []
658630
filterlines = []
659631
corelines = []
660-
deepfreezemappingsfile = f'$(IntDir)\\{DEEPFREEZE_MAPPING_FNAME}'
661-
deepfreezerules = [f' <Exec Command=\'$(PythonForBuild) "$(PySourcePath)Tools\\build\\deepfreeze.py" -f "{deepfreezemappingsfile}" -o "$(GeneratedFrozenModulesDir)deepfreeze.c"\' />']
662-
deepfreezemappings = []
663632
for src in _iter_sources(modules):
664633
pyfile = relpath_for_windows_display(src.pyfile, ROOT_DIR)
665634
header = relpath_for_windows_display(src.frozenfile, ROOT_DIR)
@@ -673,9 +642,6 @@ def regen_pcbuild(modules):
673642
filterlines.append(f' <None Include="..\\{pyfile}">')
674643
filterlines.append(' <Filter>Python Files</Filter>')
675644
filterlines.append(' </None>')
676-
deepfreezemappings.append(f' <FrozenModule Include="$(GeneratedFrozenModulesDir){header}" FrozenId="{src.frozenid}" />\n')
677-
678-
corelines.append(f' <ClCompile Include="$(GeneratedFrozenModulesDir)deepfreeze.c" />')
679645

680646
print(f'# Updating {os.path.relpath(PCBUILD_PROJECT)}')
681647
with updating_file_with_tmpfile(PCBUILD_PROJECT) as (infile, outfile):
@@ -688,36 +654,6 @@ def regen_pcbuild(modules):
688654
PCBUILD_PROJECT,
689655
)
690656
outfile.writelines(lines)
691-
with updating_file_with_tmpfile(PCBUILD_PROJECT) as (infile, outfile):
692-
lines = infile.readlines()
693-
lines = replace_block(
694-
lines,
695-
'<!-- BEGIN freeze mappings -->',
696-
'<!-- END freeze mappings -->',
697-
deepfreezemappings,
698-
PCBUILD_PROJECT,
699-
)
700-
outfile.writelines(lines)
701-
with updating_file_with_tmpfile(PCBUILD_PROJECT) as (infile, outfile):
702-
lines = infile.readlines()
703-
lines = replace_block(
704-
lines,
705-
'<!-- BEGIN freeze mapping file -->',
706-
'<!-- END freeze mapping file -->',
707-
[deepfreezemappingsfile, ],
708-
PCBUILD_PROJECT,
709-
)
710-
outfile.writelines(lines)
711-
with updating_file_with_tmpfile(PCBUILD_PROJECT) as (infile, outfile):
712-
lines = infile.readlines()
713-
lines = replace_block(
714-
lines,
715-
'<!-- BEGIN deepfreeze rule -->',
716-
'<!-- END deepfreeze rule -->',
717-
deepfreezerules,
718-
PCBUILD_PROJECT,
719-
)
720-
outfile.writelines(lines)
721657
print(f'# Updating {os.path.relpath(PCBUILD_FILTERS)}')
722658
with updating_file_with_tmpfile(PCBUILD_FILTERS) as (infile, outfile):
723659
lines = infile.readlines()
@@ -729,17 +665,6 @@ def regen_pcbuild(modules):
729665
PCBUILD_FILTERS,
730666
)
731667
outfile.writelines(lines)
732-
print(f'# Updating {os.path.relpath(PCBUILD_PYTHONCORE)}')
733-
with updating_file_with_tmpfile(PCBUILD_PYTHONCORE) as (infile, outfile):
734-
lines = infile.readlines()
735-
lines = replace_block(
736-
lines,
737-
'<!-- BEGIN deepfreeze -->',
738-
'<!-- END deepfreeze -->',
739-
corelines,
740-
PCBUILD_FILTERS,
741-
)
742-
outfile.writelines(lines)
743668

744669

745670
#######################################

‎configure‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configure.ac‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6826,8 +6826,7 @@ SRCDIRS="\
68266826
Parser/lexer \
68276827
Programs \
68286828
Python \
6829-
Python/frozen_modules \
6830-
Python/deepfreeze"
6829+
Python/frozen_modules"
68316830
AC_MSG_CHECKING([for build directories])
68326831
for dir in $SRCDIRS; do
68336832
if test ! -d $dir; then

0 commit comments

Comments
 (0)