Commit e03c1e6b authored by Matt Harbison's avatar Matt Harbison
Browse files

Move 32-bit builds to Qt5

The packaging scripts in 5.3 handle building this when given a 32-bit python and
MSVC 2015, or at least MS Build Tools 2015[1].

[1] https://visualstudio.microsoft.com/vs/older-downloads/
parent aa327418ca4f
......@@ -571,23 +571,14 @@ def build_thg_installer(name, productid, arch):
run(r'if exist dist rmdir /s /q dist', 'build/thg')
run_python(r'setup.py py2exe -b3', 'build/thg', env=env)
if arch == 'x86':
path = os.path.join(sys.exec_prefix, 'lib', 'site-packages', 'PyQt4')
binpath = os.path.join(path, 'bin')
if os.path.exists(binpath):
path = binpath
for f in ('qscintilla2.dll', 'QtSvg4.dll', 'QtXml4.dll'):
p = os.path.join(path, f)
run(r'copy %s dist/lib' % p, r'build/thg')
else:
path = os.path.join(sys.exec_prefix, 'lib', 'site-packages', 'PyQt5')
for f in ('qscintilla2_qt5.dll', 'Qt5Svg.dll', 'Qt5Xml.dll'):
p = os.path.join(path, f)
run(r'copy %s dist\lib' % p, r'build/thg')
# kdiff3 needs qt.conf find platforms and imageformat plugins
open('build/thg/dist/lib/qt.conf', 'w').write('[Paths]\nPlugins = ..\n')
# workaround for QTBUG 57687
shutil.copy(r'contrib\spawn.cmd', r'build\thg\dist\lib')
path = os.path.join(sys.exec_prefix, 'lib', 'site-packages', 'PyQt5')
for f in ('qscintilla2_qt5.dll', 'Qt5Svg.dll', 'Qt5Xml.dll'):
p = os.path.join(path, f)
run(r'copy %s dist\lib' % p, r'build/thg')
# kdiff3 needs qt.conf find platforms and imageformat plugins
open('build/thg/dist/lib/qt.conf', 'w').write('[Paths]\nPlugins = ..\n')
# workaround for QTBUG 57687
shutil.copy(r'contrib\spawn.cmd', r'build\thg\dist\lib')
hgversion = repoversion('build/hg/mercurial/__version__.py')
hgperiodic = windowsversion(name, hgversion)[2]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment