@@ -463,10 +463,10 @@ def replace_block(lines, start_marker, end_marker, replacements, file):
463463 return lines [:start_pos + 1 ] + replacements + lines [end_pos :]
464464
465465
466- def regen_frozen (modules , deepfreeze_only : bool ):
466+ def regen_frozen (modules , frozen_modules : bool ):
467467 headerlines = []
468468 parentdir = os .path .dirname (FROZEN_FILE )
469- if not deepfreeze_only :
469+ if frozen_modules :
470470 for src in _iter_sources (modules ):
471471 # Adding a comment to separate sections here doesn't add much,
472472 # so we don't.
@@ -502,7 +502,7 @@ def regen_frozen(modules, deepfreeze_only: bool):
502502
503503 symbol = mod .symbol
504504 pkg = 'true' if mod .ispkg else 'false'
505- if deepfreeze_only :
505+ if not frozen_modules :
506506 line = ('{"%s", NULL, 0, %s, GET_CODE(%s)},'
507507 ) % (mod .name , pkg , code_name )
508508 else :
@@ -715,19 +715,21 @@ def regen_pcbuild(modules):
715715#######################################
716716# the script
717717
718- def main (deepfreeze_only : bool ):
718+ parser = argparse .ArgumentParser ()
719+ parser .add_argument ("--frozen-modules" , action = "store_true" ,
720+ help = "Use both frozen and deepfrozen modules. (default: uses only deepfrozen modules)" )
721+
722+ def main ():
723+ args = parser .parse_args ()
724+ frozen_modules : bool = args .frozen_modules
719725 # Expand the raw specs, preserving order.
720726 modules = list (parse_frozen_specs ())
721727
722728 # Regen build-related files.
723729 regen_makefile (modules )
724730 regen_pcbuild (modules )
725- regen_frozen (modules , deepfreeze_only )
731+ regen_frozen (modules , frozen_modules )
726732
727733
728734if __name__ == '__main__' :
729- parser = argparse .ArgumentParser ()
730- parser .add_argument ("--deepfreeze-only" , action = "store_true" ,
731- help = "Only use deepfrozen modules" , default = True )
732- args = parser .parse_args ()
733- main (args .deepfreeze_only )
735+ main ()
0 commit comments