Compare commits

...

3 Commits

Author SHA1 Message Date
Florian Bruhin
718f73be2e Use ImportError for winreg import
This also satisfies pylint.

(cherry picked from commit b67733b781)
2018-06-21 23:51:37 +02:00
bitraid
da4865d408 build_release.py: reformat
(cherry picked from commit b61c99687d)
2018-06-21 23:51:35 +02:00
bitraid
fd4ff3c9ce build_release.py: Get python path from registry on Windows
(cherry picked from commit ddfbe255e7)
2018-06-21 23:51:33 +02:00

View File

@@ -34,6 +34,11 @@ import tarfile
import tempfile
import collections
try:
import winreg
except ImportError:
pass
sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir,
os.pardir))
@@ -222,8 +227,25 @@ def build_windows():
utils.print_title("Building Windows binaries")
parts = str(sys.version_info.major), str(sys.version_info.minor)
ver = ''.join(parts)
python_x86 = r'C:\Python{}-32\python.exe'.format(ver)
python_x64 = r'C:\Python{}\python.exe'.format(ver)
dot_ver = '.'.join(parts)
# Get python path from registry if possible
try:
reg64_key = winreg.OpenKeyEx(winreg.HKEY_LOCAL_MACHINE,
r'SOFTWARE\Python\PythonCore'
r'\{}\InstallPath'.format(dot_ver))
python_x64 = winreg.QueryValueEx(reg64_key, 'ExecutablePath')[0]
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__))