From 7497cc57043f7d378232778d235467e3e622b342 Mon Sep 17 00:00:00 2001 From: Dmitri Bogomolov <4glitch@gmail.com> Date: Sat, 2 May 2020 15:02:27 +0300 Subject: [PATCH] Format and simplify bitmessagemain.spec, exclude unused libs and files --- packages/pyinstaller/bitmessagemain.spec | 155 +++++++++++++---------- 1 file changed, 87 insertions(+), 68 deletions(-) diff --git a/packages/pyinstaller/bitmessagemain.spec b/packages/pyinstaller/bitmessagemain.spec index 92e52f6a..9249fc79 100644 --- a/packages/pyinstaller/bitmessagemain.spec +++ b/packages/pyinstaller/bitmessagemain.spec @@ -1,52 +1,54 @@ +# -*- mode: python -*- import ctypes import os -import time import sys +import time + -if ctypes.sizeof(ctypes.c_voidp) == 4: - arch=32 -else: - arch=64 - -sslName = 'OpenSSL-Win%s' % ("32" if arch == 32 else "64") site_root = os.path.abspath(HOMEPATH) spec_root = os.path.abspath(SPECPATH) +arch = 32 if ctypes.sizeof(ctypes.c_voidp) == 4 else 64 cdrivePath = site_root[0:3] srcPath = os.path.join(spec_root[:-20], "src") -qtBase = "PyQt4" +sslName = 'OpenSSL-Win%i' % arch openSSLPath = os.path.join(cdrivePath, sslName) msvcrDllPath = os.path.join(cdrivePath, "windows", "system32") -pythonDllPath = os.path.join(cdrivePath, "Python27") outPath = os.path.join(spec_root, "bitmessagemain") +qtBase = "PyQt4" -importPath = srcPath -sys.path.insert(0,importPath) -os.chdir(sys.path[0]) -from version import softwareVersion +sys.path.insert(0, srcPath) +os.chdir(srcPath) -today = time.strftime("%Y%m%d") snapshot = False -os.rename(os.path.join(srcPath, '__init__.py'), os.path.join(srcPath, '__init__.py.backup')) +os.rename( + os.path.join(srcPath, '__init__.py'), + os.path.join(srcPath, '__init__.py.backup')) -# -*- mode: python -*- a = Analysis( - [os.path.join(srcPath, 'bitmessagemain.py')], - pathex=[outPath], - hiddenimports=['bitmessageqt.languagebox', 'pyopencl','numpy', 'win32com' , 'setuptools.msvc' ,'_cffi_backend'], - hookspath=None, - runtime_hooks=None - ) + [os.path.join(srcPath, 'bitmessagemain.py')], + pathex=[outPath], + hiddenimports=[ + 'bitmessageqt.languagebox', 'pyopencl', 'numpy', 'win32com', + 'setuptools.msvc', '_cffi_backend' + ], + hookspath=None, + runtime_hooks=None, + excludes=['bsddb', 'bz2', 'tcl', 'tk', 'Tkinter'] +) + +os.rename( + os.path.join(srcPath, '__init__.py.backup'), + os.path.join(srcPath, '__init__.py')) -os.rename(os.path.join(srcPath, '__init__.py.backup'), os.path.join(srcPath, '__init__.py')) def addTranslations(): - import os extraDatas = [] for file_ in os.listdir(os.path.join(srcPath, 'translations')): if file_[-3:] != ".qm": continue - extraDatas.append((os.path.join('translations', file_), + extraDatas.append(( + os.path.join('translations', file_), os.path.join(srcPath, 'translations', file_), 'DATA')) for libdir in sys.path: qtdir = os.path.join(libdir, qtBase, 'translations') @@ -57,57 +59,74 @@ def addTranslations(): for file_ in os.listdir(qtdir): if file_[0:3] != "qt_" or file_[5:8] != ".qm": continue - extraDatas.append((os.path.join('translations', file_), + extraDatas.append(( + os.path.join('translations', file_), os.path.join(qtdir, file_), 'DATA')) return extraDatas -def addUIs(): - import os - extraDatas = [] - for file_ in os.listdir(os.path.join(srcPath, 'bitmessageqt')): - if file_[-3:] != ".ui": - continue - extraDatas.append((os.path.join('ui', file_), os.path.join(srcPath, - 'bitmessageqt', file_), 'DATA')) - return extraDatas + +dir_append = os.path.join(srcPath, 'bitmessageqt') + +a.datas += [ + (os.path.join('ui', file_), os.path.join(dir_append, file_), 'DATA') + for file_ in os.listdir(dir_append) if file_.endswith('.ui') +] # append the translations directory a.datas += addTranslations() -a.datas += addUIs() -a.binaries += [('libeay32.dll', os.path.join(openSSLPath, 'libeay32.dll'), 'BINARY'), - ('python27.dll', os.path.join(pythonDllPath, 'python27.dll'), 'BINARY'), - (os.path.join('bitmsghash', 'bitmsghash%i.dll' % (arch)), os.path.join(srcPath, 'bitmsghash', 'bitmsghash%i.dll' % (arch)), 'BINARY'), - (os.path.join('bitmsghash', 'bitmsghash.cl'), os.path.join(srcPath, 'bitmsghash', 'bitmsghash.cl'), 'BINARY'), - (os.path.join('sslkeys', 'cert.pem'), os.path.join(srcPath, 'sslkeys', 'cert.pem'), 'BINARY'), - (os.path.join('sslkeys', 'key.pem'), os.path.join(srcPath, 'sslkeys', 'key.pem'), 'BINARY') - ] +excluded_binaries = [ + 'QtOpenGL4.dll', + 'QtSvg4.dll', + 'QtXml4.dll', +] +a.binaries = TOC([x for x in a.binaries if x[0] not in excluded_binaries]) + +a.binaries += [ + # No effect: libeay32.dll will be taken from PyQt if installed + ('libeay32.dll', os.path.join(openSSLPath, 'libeay32.dll'), 'BINARY'), + (os.path.join('bitmsghash', 'bitmsghash%i.dll' % arch), + os.path.join(srcPath, 'bitmsghash', 'bitmsghash%i.dll' % arch), + 'BINARY'), + (os.path.join('bitmsghash', 'bitmsghash.cl'), + os.path.join(srcPath, 'bitmsghash', 'bitmsghash.cl'), 'BINARY'), + (os.path.join('sslkeys', 'cert.pem'), + os.path.join(srcPath, 'sslkeys', 'cert.pem'), 'BINARY'), + (os.path.join('sslkeys', 'key.pem'), + os.path.join(srcPath, 'sslkeys', 'key.pem'), 'BINARY') +] + + +from version import softwareVersion + +today = time.strftime("%Y%m%d") + +fname = '%s_%%s_%s.exe' % ( + ('Bitmessagedev', today) if snapshot else ('Bitmessage', softwareVersion) +) % ("x86" if arch == 32 else "x64") + - -fname = 'Bitmessage_%s_%s.exe' % ("x86" if arch == 32 else "x64", softwareVersion) -if snapshot: - fname = 'Bitmessagedev_%s_%s.exe' % ("x86" if arch == 32 else "x64", today) - pyz = PYZ(a.pure) -exe = EXE(pyz, - a.scripts, - a.binaries, - a.zipfiles, - a.datas, - a.binaries, - [], - name=fname, - debug=False, - strip=None, - upx=False, - console=False, icon= os.path.join(srcPath, 'images', 'can-icon.ico')) - -coll = COLLECT(exe, - a.binaries, - a.zipfiles, - a.datas, - strip=False, - upx=False, - name='main') +exe = EXE( + pyz, + a.scripts, + a.binaries, + a.zipfiles, + a.datas, + name=fname, + debug=False, + strip=None, + upx=False, + console=False, icon=os.path.join(srcPath, 'images', 'can-icon.ico') +) +coll = COLLECT( + exe, + a.binaries, + a.zipfiles, + a.datas, + strip=False, + upx=False, + name='main' +)