bpo-45873: Get rid of bootstrap_python#29717
Merged
gvanrossum merged 12 commits intopython:mainfrom Nov 23, 2021
Merged
Conversation
Instead we use $(PYTHON_FOR_REGEN) .../deepfreeze.py with the frozen .h file as input, as we did for Windows in bpo-45850. We also get rid of the code that generates the .h files when make regen-frozen is run (i.e., .../make_frozen.py).
gvanrossum
force-pushed
the
unixdeepfreeze
branch
from
44915f8 to
0821457
Compare
Instead we use $(PYTHON_FOR_REGEN) .../deepfreeze.py with the frozen .h file as input, as we did for Windows in bpo-45850. We also get rid of the code that generates the .h files when make regen-frozen is run (i.e., .../make_frozen.py).
Member
Author
|
(Sorry for the confusing push history. I had my branches mixed up. Should be ready for review now.) |
gvanrossum
requested review from
zooba and
zware
and removed request for
a team
zware
approved these changes
Nov 23, 2021
Member
zware
left a comment
zware
left a comment
There was a problem hiding this comment.
One minor suggestion, otherwise LGTM
|
|
||
| @rem If py.exe finds a recent enough version, use that one | ||
| @for %%p in (3.10) do @py -%%p -EV >nul 2>&1 && (set PYTHON=py -%%p) && (set _Py_Python_Source=found %%p with py.exe) && goto :found | ||
| @for %%p in (3.10 3.9 3.8) do @py -%%p -EV >nul 2>&1 && (set PYTHON=py -%%p) && (set _Py_Python_Source=found %%p with py.exe) && goto :found |
Member
There was a problem hiding this comment.
Considering how at least one (my :( ) buildbot happily used 3.1 for py -3.10, we might want to put 3.10 at the end of the list here.
Member
Author
There was a problem hiding this comment.
Member
Author
|
About the failing test. This is (again :-( ) about an out-of-tree build. Here's the thing. For each module foo.py that's to be frozen there's a rule that creates a frozen foo.h from it, and then a rule that creates a deep-frozen foo.c from that. So far so good. Here's the weirdness. The freezing rule that creates foo.h writes to This seems inconsistent since I could go on forever randomly adding or removing Note that there's one more mention of |
Member
|
The rule of thumb for for The idea behind out-of-tree (OOT) builds is a separation of source files and target files. Source files are any files we ship to users, either in a git checkout or in a source tarball. OOT building treat the source directory is an immutable, read-only source and places any generated file in a separate directory structure. The feature is also known as out of source build or autoconf with VPATH. Example for separate debug and release builds |
Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
|
@gvanrossum: Please replace |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
remykarem
pushed a commit
to remykarem/cpython
that referenced
this pull request
Dec 7, 2021
Instead we use $(PYTHON_FOR_REGEN) .../deepfreeze.py with the frozen .h file as input, as we did for Windows in bpo-45850. We also get rid of the code that generates the .h files when make regen-frozen is run (i.e., .../make_frozen.py), and the MANIFEST file. Restore Python 3.8 and 3.9 as Windows host Python again Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Instead we use
$(PYTHON_FOR_REGEN) .../deepfreeze.pywith thefrozen .h file as input, as we did for Windows in bpo-45850.
We also get rid of the code that generates the .h files
when make regen-frozen is run (i.e., .../make_frozen.py),
as well as the generated MANIFEST file
(the latter depended on those .h files existing).
https://bugs.python.org/issue45873