Skip to content

bpo-46608: Fix argument parsing in freeze_modules.py #31131

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

Merged
gvanrossum merged 3 commits into from
Feb 5, 2022
Merged

bpo-46608: Fix argument parsing in freeze_modules.py #31131

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77d2bae
bpo-46608: Fix argument parsing in freeze_modules.py
kumaraditya303 Feb 4, 2022
f86ee28
rework
kumaraditya303 Feb 5, 2022
79f339b
add help
kumaraditya303 Feb 5, 2022
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
22 changes: 12 additions & 10 deletions Tools/scripts/freeze_modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,10 +463,10 @@ def replace_block(lines, start_marker, end_marker, replacements, file):
return lines[:start_pos + 1] + replacements + lines[end_pos:]


def regen_frozen(modules, deepfreeze_only: bool):
def regen_frozen(modules, frozen_modules: bool):
headerlines = []
parentdir = os.path.dirname(FROZEN_FILE)
if not deepfreeze_only:
if frozen_modules:
for src in _iter_sources(modules):
# Adding a comment to separate sections here doesn't add much,
# so we don't.
Expand Down Expand Up @@ -502,7 +502,7 @@ def regen_frozen(modules, deepfreeze_only: bool):

symbol = mod.symbol
pkg = 'true' if mod.ispkg else 'false'
if deepfreeze_only:
if not frozen_modules:
line = ('{"%s", NULL, 0, %s, GET_CODE(%s)},'
) % (mod.name, pkg, code_name)
else:
Expand Down Expand Up @@ -715,19 +715,21 @@ def regen_pcbuild(modules):
#######################################
# the script

def main(deepfreeze_only: bool):
parser = argparse.ArgumentParser()
parser.add_argument("--frozen-modules", action="store_true",
help="Use both frozen and deepfrozen modules. (default: uses only deepfrozen modules)")

def main():
args = parser.parse_args()
frozen_modules: bool = args.frozen_modules
# Expand the raw specs, preserving order.
modules = list(parse_frozen_specs())

# Regen build-related files.
regen_makefile(modules)
regen_pcbuild(modules)
regen_frozen(modules, deepfreeze_only)
regen_frozen(modules, frozen_modules)


if __name__ == '__main__':
parser = argparse.ArgumentParser()
parser.add_argument("--deepfreeze-only", action="store_true",
help="Only use deepfrozen modules", default=True)
args = parser.parse_args()
main(args.deepfreeze_only)
main()