fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2025-12-26 19:29:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

PICARD-1703: Upgrade to PyInstaller 3.6

Browse Source 
Allows us to remove some Windows specific workarounds, fixes a CVE related to the portable onefile install.
This commit is contained in:
Philipp Wolfer
2020-01-10 08:24:29 +01:00
parent 18e1932294
commit 1636fcb310
3 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
picard.spec
View File

@@ -50,18 +50,8 @@ data_files = get_locale_messages()
fpcalc_name = 'fpcalc'
if os_name == 'Windows':
from PyQt5.QtCore import QLibraryInfo
qt_binaries_path = QLibraryInfo.location(QLibraryInfo.BinariesPath)
fpcalc_name = 'fpcalc.exe'
binaries += [
('discid.dll', '.'),
# The following two lines should not be neccasary with PyInstaller 3.5
(os.path.join(qt_binaries_path, 'libeay32.dll'), '.'),
(os.path.join(qt_binaries_path, 'ssleay32.dll'), '.'),
# The following two lines should not be neccasary with PyInstaller >3.5
(os.path.join(qt_binaries_path, 'libcrypto-1_1-x64.dll'), '.'),
(os.path.join(qt_binaries_path, 'libssl-1_1-x64.dll'), '.'),
]
binaries += [('discid.dll', '.')]
data_files.append((os.path.join('resources', 'win10', '*'), '.'))
if os_name == 'Darwin':

2
requirements-build.txt
View File

@@ -1,2 +1,2 @@
Babel==2.6
PyInstaller==3.5
PyInstaller==3.6

6
scripts/package/win-common.ps1
View File

@@ -37,12 +37,6 @@ Function FinalizePackage {
CodeSignBinary (Join-Path $Path fpcalc.exe)
CodeSignBinary (Join-Path $Path discid.dll)
# Workaround for https://github.com/pyinstaller/pyinstaller/issues/4429
$OldTRanslationsPath = (Join-Path $Path PyQt5\translations)
If (Test-Path $OldTRanslationsPath -PathType Container) {
Move-Item -Path $OldTRanslationsPath -Destination (Join-Path $Path PyQt5\Qt)
}
# Delete unused files
Remove-Item -Path (Join-Path $Path libcrypto-1_1.dll)
Remove-Item -Path (Join-Path $Path libssl-1_1.dll)