From 0af8eec73a8a4290b0a0348f3ad8d8295e17deaa Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 3 Jul 2018 11:08:56 +0200 Subject: [PATCH] build_release: Remove 32-bit support for Windows QtWebEngine isn't available for 32-bit anymore: https://blog.qt.io/blog/2018/05/22/qt-5-11-released/ (comments) --- scripts/dev/build_release.py | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py index 146b7a462..366c6f393 100755 --- a/scripts/dev/build_release.py +++ b/scripts/dev/build_release.py @@ -239,17 +239,7 @@ def build_windows(): except FileNotFoundError: python_x64 = r'C:\Python{}\python.exe'.format(ver) - try: - reg32_key = winreg.OpenKeyEx(winreg.HKEY_LOCAL_MACHINE, - r'SOFTWARE\WOW6432Node\Python\PythonCore' - r'\{}-32\InstallPath'.format(dot_ver)) - python_x86 = winreg.QueryValueEx(reg32_key, 'ExecutablePath')[0] - except FileNotFoundError: - python_x86 = r'C:\Python{}-32\python.exe'.format(ver) - out_pyinstaller = os.path.join('dist', 'qutebrowser') - out_32 = os.path.join('dist', - 'qutebrowser-{}-x86'.format(qutebrowser.__version__)) out_64 = os.path.join('dist', 'qutebrowser-{}-x64'.format(qutebrowser.__version__)) @@ -258,12 +248,6 @@ def build_windows(): utils.print_title("Updating VersionInfo file") gen_versioninfo.main() - utils.print_title("Running pyinstaller 32bit") - _maybe_remove(out_32) - call_tox('pyinstaller', '-r', python=python_x86) - shutil.move(out_pyinstaller, out_32) - patch_windows(out_32) - utils.print_title("Running pyinstaller 64bit") _maybe_remove(out_64) call_tox('pyinstaller', '-r', python=python_x64) @@ -279,31 +263,17 @@ def build_windows(): '/DVERSION={}'.format(qutebrowser.__version__), 'misc/qutebrowser.nsi'], check=True) - name_32 = 'qutebrowser-{}-win32.exe'.format(qutebrowser.__version__) name_64 = 'qutebrowser-{}-amd64.exe'.format(qutebrowser.__version__) artifacts += [ - (os.path.join('dist', name_32), - 'application/vnd.microsoft.portable-executable', - 'Windows 32bit installer'), (os.path.join('dist', name_64), 'application/vnd.microsoft.portable-executable', 'Windows 64bit installer'), ] - utils.print_title("Running 32bit smoke test") - smoke_test(os.path.join(out_32, 'qutebrowser.exe')) utils.print_title("Running 64bit smoke test") smoke_test(os.path.join(out_64, 'qutebrowser.exe')) - utils.print_title("Zipping 32bit standalone...") - name = 'qutebrowser-{}-windows-standalone-win32'.format( - qutebrowser.__version__) - shutil.make_archive(name, 'zip', 'dist', os.path.basename(out_32)) - artifacts.append(('{}.zip'.format(name), - 'application/zip', - 'Windows 32bit standalone')) - utils.print_title("Zipping 64bit standalone...") name = 'qutebrowser-{}-windows-standalone-amd64'.format( qutebrowser.__version__)