Commit e7bb7c2
authored
This effectively reverts the Makefile change in gh-31637. I've added some notes so it is more clear what is going on.
We also update the "Check if generated files are up to date" job to run "make regen-deepfreeze" to ensure "make regen-global-objects" catches deepfreeze.c.
https://bugs.python.org/issue47146
1 parent 74b95d8 commit e7bb7c2
3 files changed
Lines changed: 9 additions & 19 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -82,6 +82,9 @@ jobs: | |||
| 82 | 82 | run: make regen-configure | |
| 83 | 83 | - name: Build CPython | |
| 84 | 84 | run: | | |
| 85 | + # Deepfreeze will usually cause global objects to be added or removed, | ||
| 86 | + # so we run it before regen-global-objects gets rum (in regen-all). | ||
| 87 | + make regen-deepfreeze | ||
| 85 | 88 | make -j4 regen-all | |
| 86 | 89 | make regen-stdlib-module-names | |
| 87 | 90 | - name: Check for changes | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1161,8 +1161,9 @@ Python/deepfreeze/deepfreeze.c: $(DEEPFREEZE_DEPS) | |||
| 1161 | 1161 | Python/frozen_modules/__phello__.spam.h:__phello__.spam \ | |
| 1162 | 1162 | Python/frozen_modules/frozen_only.h:frozen_only \ | |
| 1163 | 1163 | -o Python/deepfreeze/deepfreeze.c | |
| 1164 | - | ||
| 1165 | 1164 | # END: deepfreeze modules | |
| 1165 | + @echo "Note: Deepfreeze may have added some global objects," | ||
| 1166 | + @echo " so run 'make regen-global-objects' if necessary." | ||
| 1166 | 1167 | ||
| 1167 | 1168 | # We keep this renamed target around for folks with muscle memory. | |
| 1168 | 1169 | .PHONY: regen-importlib | |
@@ -1171,24 +1172,11 @@ regen-importlib: regen-frozen | |||
| 1171 | 1172 | ############################################################################ | |
| 1172 | 1173 | # Global objects | |
| 1173 | 1174 | ||
| 1174 | - GLOBAL_OBJECTS_TARGETS = \ | ||
| 1175 | - $(srcdir)/Include/internal/pycore_global_objects.h \ | ||
| 1176 | - $(srcdir)/Include/internal/pycore_global_strings.h | ||
| 1177 | - | ||
| 1178 | - # The global objects will get regenerated as soon these files | ||
| 1179 | - # are required, including as a prerequisite for regen-deepfreeze. | ||
| 1180 | - $(GLOBAL_OBJECTS_TARGETS): generate-global-objects | ||
| 1181 | - | ||
| 1182 | - .PHONY: generate-global-objects | ||
| 1183 | - generate-global-objects: $(srcdir)/Tools/scripts/generate_global_objects.py | ||
| 1184 | - $(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/generate_global_objects.py | ||
| 1185 | - | ||
| 1186 | - .PHONY: generate-global-objects-after-deepfreeze | ||
| 1187 | - generate-global-objects-after-deepfreeze: regen-deepfreeze $(srcdir)/Tools/scripts/generate_global_objects.py | ||
| 1188 | - $(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/generate_global_objects.py | ||
| 1189 | - | ||
| 1190 | 1175 | .PHONY: regen-global-objects | |
| 1191 | - regen-global-objects: regen-deepfreeze generate-global-objects-after-deepfreeze | ||
| 1176 | + regen-global-objects: $(srcdir)/Tools/scripts/generate_global_objects.py | ||
| 1177 | + $(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/generate_global_objects.py | ||
| 1178 | + @echo "Note: Global objects can be added or removed by other tools (e.g. deepfreeze), " | ||
| 1179 | + @echo " so be sure to re-run regen-global-objects after those tools." | ||
| 1192 | 1180 | ||
| 1193 | 1181 | ############################################################################ | |
| 1194 | 1182 | # ABI | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -606,7 +606,6 @@ def regen_makefile(modules): | |||
| 606 | 606 | ]) | |
| 607 | 607 | deepfreezerules.append(f"\t{frozen_header}:{src.frozenid} \\") | |
| 608 | 608 | deepfreezerules.append('\t-o Python/deepfreeze/deepfreeze.c') | |
| 609 | - deepfreezerules.append('') | ||
| 610 | 609 | pyfiles[-1] = pyfiles[-1].rstrip(" \\") | |
| 611 | 610 | frozenfiles[-1] = frozenfiles[-1].rstrip(" \\") | |
| 612 | 611 | ||
0 commit comments