Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

building: ensure that onefile builds on Windows have manifest embedded #5625

Merged
merged 2 commits into from Mar 13, 2021
Merged

building: ensure that onefile builds on Windows have manifest embedded #5625

merged 2 commits into from Mar 13, 2021

Commits on Mar 11, 2021

  1. tests: add test for onefile builds on Windows having a manifest 

    Test building with different --icon options, as that is what seems to
be triggering inconsistent behavior at the moment.
    @rokm
    rokm committed Mar 11, 2021
    Copy the full SHA
    b9e70f3 View commit details
    Browse the repository at this point in the history

  2. building: ensure that onefile builds on Windows have manifest embedded 

    The onefile builds on Windows may not have manifest embedded if
icon was explicitly disabled via `--icon NONE`. This in turn causes
subtle issues, such as pyinstaller#5624.

Remove the convoluted check for entering the resource-modification
codepath, as we always need to reach the part that embeds the
manifest in the onefile executable, and the rest of
resource-modification parts are already guarded by their corresponding
checks. This should simplify the code and make it less prone to
errors.
    @rokm
    rokm committed Mar 11, 2021
    Copy the full SHA
    d7000e9 View commit details
    Browse the repository at this point in the history