Avoid collecting Wine built-in DLLs #6149
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
bwoodsend
reviewed
Aug 22, 2021
bwoodsend
requested changes
Aug 22, 2021
Add a new flag, is_win_wine, which indicates that we are running under Wine. Implement a new function, is_wine_dll(), which checks if the given file is a Wine build-in DLL (PE-converted or fake/placeholder).
Automatically exclude Wine built-in DLLs, regardless of the exclude and include lists. Wine built-in DLLs are likely to cause problems under Windows, so excluding them increases the chances of the bundle working under Windows. On the other hand, even with Wine DLLs excluded, the bundle should still run under Wine as before.
rokm
force-pushed
the
exclude-wine-dlls
branch
from
6f0adb4
to
522f485
Compare
bwoodsend
approved these changes
Aug 23, 2021
rokm
added a commit
to rokm/pyinstaller
that referenced
this pull request
Feb 24, 2022
Back-port of pyinstaller#6149 to the v4 branch. * compat: implement detection of Wine environment and Wine DLLs Add a new flag, is_win_wine, which indicates that we are running under Wine. Implement a new function, is_wine_dll(), which checks if the given file is a Wine build-in DLL (PE-converted or fake/placeholder). * depend: automatically exclude Wine built-in DLLs Automatically exclude Wine built-in DLLs, regardless of the exclude and include lists. Wine built-in DLLs are likely to cause problems under Windows, so excluding them increases the chances of the bundle working under Windows. On the other hand, even with Wine DLLs excluded, the bundle should still run under Wine as before. * depend: display each excluded-Wine-DLL warning only once
bwoodsend
pushed a commit
that referenced
this pull request
Feb 24, 2022
Back-port of #6149 to the v4 branch. * compat: implement detection of Wine environment and Wine DLLs Add a new flag, is_win_wine, which indicates that we are running under Wine. Implement a new function, is_wine_dll(), which checks if the given file is a Wine build-in DLL (PE-converted or fake/placeholder). * depend: automatically exclude Wine built-in DLLs Automatically exclude Wine built-in DLLs, regardless of the exclude and include lists. Wine built-in DLLs are likely to cause problems under Windows, so excluding them increases the chances of the bundle working under Windows. On the other hand, even with Wine DLLs excluded, the bundle should still run under Wine as before. * depend: display each excluded-Wine-DLL warning only once
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.
Wine built-in DLLs are likely to cause problems under Windows, so excluding them increases the chances of the bundle working under Windows. On the other hand, even with Wine DLLs excluded, the bundle should still run under Wine as before.
For each excluded Wine DLL, we display a one-time warning message.
See #6145.