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

PICARD-2724: Move all Qt5 DLLs into main directory on Windows #2305

Merged
merged 2 commits into from
Sep 8, 2023
Merged

PICARD-2724: Move all Qt5 DLLs into main directory on Windows #2305

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
addf1cf
PICARD-2724: Move all Qt5 DLLs into main directory on Windows
phw Sep 8, 2023
b65b181
Use named parameters in powershell script
phw Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions scripts/package/win-common.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,13 @@
CodeSignBinary (Join-Path $Path picard.exe)
CodeSignBinary (Join-Path $Path fpcalc.exe)
CodeSignBinary (Join-Path $Path discid.dll)

# Move all Qt5 DLLs into the main folder to avoid conflicts with system wide
# versions of those dependencies. Since some version PyInstaller tries to
# maintain the file hierarchy of imported modules, but this easily breaks
# DLL loading on Windows.
# Workaround for https://tickets.metabrainz.org/browse/PICARD-2736
$Qt5BinDir = (Join-Path $Path PyQt5 Qt5 bin)

Check notice on line 45 in scripts/package/win-common.ps1

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

scripts/package/win-common.ps1#L45 

Cmdlet 'Join-Path' has positional parameter. Please use named parameters instead of positional parameters when calling a command.
Fixed Show fixed Hide fixed
Move-Item (Join-Path $Qt5BinDir *.dll) $Path -Force
Remove-Item $Qt5BinDir
}
Loading