building: MERGE: fix symlink bookkeeping #8124
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
Implement separate bookkeeping for SYMLINK entries in the MERGE processing. With symlinks, we must track `(dest_path, src_path)` pairs instead of just `src_path`, because the `src_path` encodes the relative link destination, and might appear multiple times in different context. For example, on macOS, each Qt .framework bundle has a symlink `Current -> A`. So if the bookkeeping is done only based on `src_path`, only one .framework bundle in first `Analysis` (where these bundles occur) retains its symlink in the `binaries`/`datas` TOC, while the rest are moved into `dependencies` TOC. This means that such executable unncessarily gains onefile copy/extraction semantics if `dependencies` are properly set to `EXE` (if it was originally a onedir executable); on the other hand, if `dependencies` are not passed on to `EXE` (mis-use of `MERGE`), the symlinks would end up missing in the otherwise unchanged executable.
bwoodsend
approved these changes
Nov 24, 2023
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.
Implement separate bookkeeping for SYMLINK entries in the MERGE processing. With symlinks, we must track
(dest_path, src_path)pairs instead of justsrc_path, because thesrc_pathencodes the relative link destination, and might appear multiple times in different context. For example, on macOS, each Qt .framework bundle has a symlinkCurrent -> A.So if the bookkeeping is done only based on
src_path, only one .framework bundle in firstAnalysis(where these bundles occur) retains its symlink in thebinaries/datasTOC, while the rest are moved intodependenciesTOC. This means that such executable unncessarily gains onefile copy/extraction semantics ifdependenciesare properly set toEXE(if it was originally a onedir executable); on the other hand, ifdependenciesare not passed on toEXE(mis-use ofMERGE), the symlinks would end up missing in the otherwise unchanged executable.Closes #8120.