Allow users to re-enable the old onedir layout #7968
Merged
Conversation
This file contains 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
Clean up and document the multipackage dependency extration code in an attempt to make it easier to read. When determining the parent directory of the current exectuable (the former `homepath_parent`, now `this_executable_dir`), use `executablename` member of `ARCHIVE_STATUS` instead of `homepath`, as the latter is affected by the contents-directory option while the former is not. (And this seems to work for onefile builds because `homepath` there is also affected by contents-directory, even through it should be not). Remove the useless else-if branch, whose condition is now identical to that of the preceding if condition. It was very likely unused even in its original form, where it attempted to find the dependency by jumping to the parent directory of the directory containing the executable, and then applying relative path to the other executable. However, this relative path should already encode the relative relation between the executables (accounting for all four possible combinations regaring build types), and as such jumping one directory higher would never work. Fix the path check for the external .PKG archive (side-load mode). Such archive is located next to the executable, and is not a subject to contents-directory setting.
Allow pyi-contents-directory option to be unset, which re-enables the old layout for onedir builds, where files are placed next to the executable (instead of placing them into sub-directory).
rokm
force-pushed
the
optional-old-onedir-layout
branch
from
aa74ca1
to
cc89091
Compare
bwoodsend
reviewed
Sep 30, 2023
bwoodsend
approved these changes
Sep 30, 2023
Allow user to re-enable old onedir layout without contents directory. This can be done by setting `contents_directory` argument to `EXE` in the spec to either ".", "", or None (all three values are effectively mapped to None, which prevents the `pyi-contents-directory` bootloader option from being set). On command line, the equivalent can be achieved by passing "." to `--contents-directory` command-line option.
Append contents-directory path to homepath member of ARCHIVE_STATUS only in onedir mode (i.e., if we do not need to extract the archive). This implies that we need to check whether extraction is required when we open the archive (before homepath is set), so move the corresponding code into `pyi_arch_setup`.
Test for `..` as an invalid contents-directory option instead of `.`, which is now valid.
Add a basic test with --contents-directory=. that checks if `sys._MEIPASS` == `os.path.dirname(sys.executable)`, which should be the case in the legacy onedir layout.
rokm
force-pushed
the
optional-old-onedir-layout
branch
from
cc89091
to
4264076
Compare
Indeed. But we can spend our time on better things than arguing this point with the users (or having to implement dubious work-arounds such as support for collection outside of the _MEIPASS). |
bwoodsend
approved these changes
Sep 30, 2023
|
Hello, when can we see this feature to be released? |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Allow users to re-enable the old onedir layout (without contents directory) by settings the
--contents-directoryoption (or the equivalentcontents_directoryargument toEXEin the .spec file) to..