Skip to content

Commit d588816

Browse files
Put the full _freeze_module command on a single line (for less noise).
1 parent 684a7de commit d588816

File tree

2 files changed

+15
-39
lines changed

2 files changed

+15
-39
lines changed

Makefile.pre.in

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -751,64 +751,40 @@ regen-frozen: Tools/scripts/freeze_modules.py $(FROZEN_FILES)
751751
# BEGIN: freezing modules
752752

753753
Python/frozen_modules/importlib__bootstrap.h: Programs/_freeze_module Lib/importlib/_bootstrap.py
754-
$(srcdir)/Programs/_freeze_module importlib._bootstrap \
755-
$(srcdir)/Lib/importlib/_bootstrap.py \
756-
$(srcdir)/Python/frozen_modules/importlib__bootstrap.h
754+
$(srcdir)/Programs/_freeze_module importlib._bootstrap $(srcdir)/Lib/importlib/_bootstrap.py $(srcdir)/Python/frozen_modules/importlib__bootstrap.h
757755

758756
Python/frozen_modules/importlib__bootstrap_external.h: Programs/_freeze_module Lib/importlib/_bootstrap_external.py
759-
$(srcdir)/Programs/_freeze_module importlib._bootstrap_external \
760-
$(srcdir)/Lib/importlib/_bootstrap_external.py \
761-
$(srcdir)/Python/frozen_modules/importlib__bootstrap_external.h
757+
$(srcdir)/Programs/_freeze_module importlib._bootstrap_external $(srcdir)/Lib/importlib/_bootstrap_external.py $(srcdir)/Python/frozen_modules/importlib__bootstrap_external.h
762758

763759
Python/frozen_modules/zipimport.h: Programs/_freeze_module Lib/zipimport.py
764-
$(srcdir)/Programs/_freeze_module zipimport \
765-
$(srcdir)/Lib/zipimport.py \
766-
$(srcdir)/Python/frozen_modules/zipimport.h
760+
$(srcdir)/Programs/_freeze_module zipimport $(srcdir)/Lib/zipimport.py $(srcdir)/Python/frozen_modules/zipimport.h
767761

768762
Python/frozen_modules/abc.h: Programs/_freeze_module Lib/abc.py
769-
$(srcdir)/Programs/_freeze_module abc \
770-
$(srcdir)/Lib/abc.py \
771-
$(srcdir)/Python/frozen_modules/abc.h
763+
$(srcdir)/Programs/_freeze_module abc $(srcdir)/Lib/abc.py $(srcdir)/Python/frozen_modules/abc.h
772764

773765
Python/frozen_modules/io.h: Programs/_freeze_module Lib/io.py
774-
$(srcdir)/Programs/_freeze_module io \
775-
$(srcdir)/Lib/io.py \
776-
$(srcdir)/Python/frozen_modules/io.h
766+
$(srcdir)/Programs/_freeze_module io $(srcdir)/Lib/io.py $(srcdir)/Python/frozen_modules/io.h
777767

778768
Python/frozen_modules/_collections_abc.h: Programs/_freeze_module Lib/_collections_abc.py
779-
$(srcdir)/Programs/_freeze_module _collections_abc \
780-
$(srcdir)/Lib/_collections_abc.py \
781-
$(srcdir)/Python/frozen_modules/_collections_abc.h
769+
$(srcdir)/Programs/_freeze_module _collections_abc $(srcdir)/Lib/_collections_abc.py $(srcdir)/Python/frozen_modules/_collections_abc.h
782770

783771
Python/frozen_modules/_sitebuiltins.h: Programs/_freeze_module Lib/_sitebuiltins.py
784-
$(srcdir)/Programs/_freeze_module _sitebuiltins \
785-
$(srcdir)/Lib/_sitebuiltins.py \
786-
$(srcdir)/Python/frozen_modules/_sitebuiltins.h
772+
$(srcdir)/Programs/_freeze_module _sitebuiltins $(srcdir)/Lib/_sitebuiltins.py $(srcdir)/Python/frozen_modules/_sitebuiltins.h
787773

788774
Python/frozen_modules/genericpath.h: Programs/_freeze_module Lib/genericpath.py
789-
$(srcdir)/Programs/_freeze_module genericpath \
790-
$(srcdir)/Lib/genericpath.py \
791-
$(srcdir)/Python/frozen_modules/genericpath.h
775+
$(srcdir)/Programs/_freeze_module genericpath $(srcdir)/Lib/genericpath.py $(srcdir)/Python/frozen_modules/genericpath.h
792776

793777
Python/frozen_modules/ntpath.h: Programs/_freeze_module Lib/ntpath.py
794-
$(srcdir)/Programs/_freeze_module ntpath \
795-
$(srcdir)/Lib/ntpath.py \
796-
$(srcdir)/Python/frozen_modules/ntpath.h
778+
$(srcdir)/Programs/_freeze_module ntpath $(srcdir)/Lib/ntpath.py $(srcdir)/Python/frozen_modules/ntpath.h
797779

798780
Python/frozen_modules/posixpath.h: Programs/_freeze_module Lib/posixpath.py
799-
$(srcdir)/Programs/_freeze_module posixpath \
800-
$(srcdir)/Lib/posixpath.py \
801-
$(srcdir)/Python/frozen_modules/posixpath.h
781+
$(srcdir)/Programs/_freeze_module posixpath $(srcdir)/Lib/posixpath.py $(srcdir)/Python/frozen_modules/posixpath.h
802782

803783
Python/frozen_modules/stat.h: Programs/_freeze_module Lib/stat.py
804-
$(srcdir)/Programs/_freeze_module stat \
805-
$(srcdir)/Lib/stat.py \
806-
$(srcdir)/Python/frozen_modules/stat.h
784+
$(srcdir)/Programs/_freeze_module stat $(srcdir)/Lib/stat.py $(srcdir)/Python/frozen_modules/stat.h
807785

808786
Python/frozen_modules/hello.h: Programs/_freeze_module Tools/freeze/flag.py
809-
$(srcdir)/Programs/_freeze_module hello \
810-
$(srcdir)/Tools/freeze/flag.py \
811-
$(srcdir)/Python/frozen_modules/hello.h
787+
$(srcdir)/Programs/_freeze_module hello $(srcdir)/Tools/freeze/flag.py $(srcdir)/Python/frozen_modules/hello.h
812788

813789
# END: freezing modules
814790

Tools/scripts/freeze_modules.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -511,9 +511,9 @@ def regen_makefile(modules):
511511
# Note that we freeze the module to the target .h file
512512
# instead of going through an intermediate file like we used to.
513513
rules.append(f'{header}: Programs/_freeze_module {pyfile}')
514-
rules.append(f'\t$(srcdir)/Programs/_freeze_module {src.frozenid} \\')
515-
rules.append(f'\t\t$(srcdir)/{pyfile} \\')
516-
rules.append(f'\t\t$(srcdir)/{header}')
514+
rules.append(
515+
(f'\t$(srcdir)/Programs/_freeze_module {src.frozenid} '
516+
f'$(srcdir)/{pyfile} $(srcdir)/{header}'))
517517
rules.append('')
518518

519519
frozenfiles[-1] = frozenfiles[-1].rstrip(" \\")

0 commit comments

Comments
 (0)