summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorEric Snow <ericsnowcurrently@gmail.com>2021-09-16 20:20:52 (GMT)
committerGitHub <noreply@github.com>2021-09-16 20:20:52 (GMT)
commitfdc6b3d9316501d2f0068a1bf4334debc1949e62 (patch)
tree3dc3ff7d35f0ad4b8d4b2464c28b192a014dcceb /Tools
parenta59ede244714455aa9ee8637608e019a20fa2ca6 (diff)
downloadcpython-fdc6b3d9316501d2f0068a1bf4334debc1949e62.zip
cpython-fdc6b3d9316501d2f0068a1bf4334debc1949e62.tar.gz
cpython-fdc6b3d9316501d2f0068a1bf4334debc1949e62.tar.bz2
bpo-45020: Drop the frozen .h files from the repo. (gh-28392)
The main advantage is that the files will no longer show up in diffs and PRs. That means, for a PR, the number of files / lines changed will more clearly reflect the actual change. (This is essentially an un-revert of gh-28375.) https://bugs.python.org/issue45020
Diffstat (limited to 'Tools')
-rw-r--r--Tools/scripts/freeze_modules.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/Tools/scripts/freeze_modules.py b/Tools/scripts/freeze_modules.py
index 89b6616..35849c9 100644
--- a/Tools/scripts/freeze_modules.py
+++ b/Tools/scripts/freeze_modules.py
@@ -20,8 +20,9 @@ TOOLS_DIR = os.path.dirname(SCRIPTS_DIR)
ROOT_DIR = os.path.dirname(TOOLS_DIR)
STDLIB_DIR = os.path.join(ROOT_DIR, 'Lib')
-# If MODULES_DIR is changed then the .gitattributes file needs to be updated.
-MODULES_DIR = os.path.join(ROOT_DIR, 'Python/frozen_modules')
+# If MODULES_DIR is changed then the .gitattributes and .gitignore files
+# need to be updated.
+MODULES_DIR = os.path.join(ROOT_DIR, 'Python', 'frozen_modules')
if sys.platform != "win32":
TOOL = os.path.join(ROOT_DIR, 'Programs', '_freeze_module')
@@ -539,7 +540,7 @@ def regen_makefile(modules):
rules = ['']
for src in _iter_sources(modules):
header = relpath_for_posix_display(src.frozenfile, ROOT_DIR)
- frozenfiles.append(f'\t\t$(srcdir)/{header} \\')
+ frozenfiles.append(f'\t\t{header} \\')
pyfile = relpath_for_posix_display(src.pyfile, ROOT_DIR)
# Note that we freeze the module to the target .h file
@@ -576,10 +577,6 @@ def regen_pcbuild(modules):
projlines = []
filterlines = []
for src in _iter_sources(modules):
- # For now we only require the essential frozen modules on Windows.
- # See bpo-45186 and bpo-45188.
- if src.id not in ESSENTIAL and src.id != '__hello__':
- continue
pyfile = relpath_for_windows_display(src.pyfile, ROOT_DIR)
header = relpath_for_windows_display(src.frozenfile, ROOT_DIR)
intfile = ntpath.splitext(ntpath.basename(header))[0] + '.g.h'