summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2019-07-18 15:23:33 +0200
committerFlorian Bruhin <me@the-compiler.org>2019-07-18 15:41:54 +0200
commitd4966852d7123aa0d51ebfa02f5515b811acc822 (patch)
tree1979950e6ff7cbc50cc3de5f2173c5a3ff81b7a5
parent636db82c0668b52cf1ecf385a966df5b1b00ca2a (diff)
downloadqutebrowser-d4966852d7123aa0d51ebfa02f5515b811acc822.tar.gz
qutebrowser-d4966852d7123aa0d51ebfa02f5515b811acc822.zip
build_release: Re-add windows patching
Looks like we need some patching again nowadays... This reverts commit 7763287b100dd4b15135bc40957e6c3bcd1b5e42. (cherry picked from commit d37843d13759630a46213373a75144b147cbeba4)
-rwxr-xr-xscripts/dev/build_release.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py
index ac06b8b6c..0b311e40f 100755
--- a/scripts/dev/build_release.py
+++ b/scripts/dev/build_release.py
@@ -224,6 +224,17 @@ def build_mac():
return [(dmg_name, 'application/x-apple-diskimage', 'macOS .dmg')]
+def patch_windows(out_dir, x64):
+ """Copy missing DLLs for windows into the given output."""
+ dll_dir = os.path.join('.tox', 'pyinstaller', 'lib', 'site-packages',
+ 'PyQt5', 'Qt', 'bin')
+ dlls = ['libEGL.dll', 'd3dcompiler_47.dll']
+ if x64:
+ dlls += ['libssl-1_1-x64.dll', 'libcrypto-1_1-x64.dll']
+ for dll in dlls:
+ shutil.copy(os.path.join(dll_dir, dll), out_dir)
+
+
def build_windows():
"""Build windows executables/setups."""
utils.print_title("Updating 3rdparty content")
@@ -267,11 +278,13 @@ def build_windows():
_maybe_remove(out_32)
call_tox('pyinstaller', '-r', python=python_x86)
shutil.move(out_pyinstaller, out_32)
+ patch_windows(out_32, x64=False)
utils.print_title("Running pyinstaller 64bit")
_maybe_remove(out_64)
call_tox('pyinstaller', '-r', python=python_x64)
shutil.move(out_pyinstaller, out_64)
+ patch_windows(out_64, x64=True)
utils.print_title("Running 32bit smoke test")
smoke_test(os.path.join(out_32, 'qutebrowser.exe'))