Format and simplify bitmessagemain.spec, exclude unused libs and files

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, srcPath)
-sys.path.insert(0,importPath)
+os.chdir(srcPath)
-os.chdir(sys.path[0])
-from version import softwareVersion
 
-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'],
+    hiddenimports=[
+        'bitmessageqt.languagebox', 'pyopencl', 'numpy', 'win32com',
+        'setuptools.msvc', '_cffi_backend'
+    ],
     hookspath=None,
-             runtime_hooks=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
+dir_append = os.path.join(srcPath, 'bitmessageqt')
-    extraDatas = []
+
-    for file_ in os.listdir(os.path.join(srcPath, 'bitmessageqt')):
+a.datas += [
-        if file_[-3:] != ".ui":
+    (os.path.join('ui', file_), os.path.join(dir_append, file_), 'DATA')
-            continue
+    for file_ in os.listdir(dir_append) if file_.endswith('.ui')
-        extraDatas.append((os.path.join('ui', file_), os.path.join(srcPath,
+]
-            'bitmessageqt', file_), 'DATA'))
-    return extraDatas
 
 # append the translations directory
 a.datas += addTranslations()
-a.datas += addUIs()
 
 
-a.binaries += [('libeay32.dll', os.path.join(openSSLPath, 'libeay32.dll'), 'BINARY'),
+excluded_binaries = [
-         ('python27.dll', os.path.join(pythonDllPath, 'python27.dll'), 'BINARY'),
+    'QtOpenGL4.dll',
-         (os.path.join('bitmsghash', 'bitmsghash%i.dll' % (arch)), os.path.join(srcPath, 'bitmsghash', 'bitmsghash%i.dll' % (arch)), 'BINARY'),
+    'QtSvg4.dll',
-         (os.path.join('bitmsghash', 'bitmsghash.cl'), os.path.join(srcPath, 'bitmsghash', 'bitmsghash.cl'), 'BINARY'),
+    'QtXml4.dll',
-         (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')
+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')
+]
 
 
-fname = 'Bitmessage_%s_%s.exe' % ("x86" if arch == 32 else "x64", softwareVersion)
+from version import softwareVersion
-if snapshot:
+
-    fname = 'Bitmessagedev_%s_%s.exe' % ("x86" if arch == 32 else "x64", today)
+today = time.strftime("%Y%m%d")
+
+fname = '%s_%%s_%s.exe' % (
+    ('Bitmessagedev', today) if snapshot else ('Bitmessage', softwareVersion)
+) % ("x86" if arch == 32 else "x64")
+
 
 pyz = PYZ(a.pure)
-exe = EXE(pyz,
+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'))
+    console=False, icon=os.path.join(srcPath, 'images', 'can-icon.ico')
+)
 
-coll = COLLECT(exe,
+coll = COLLECT(
+    exe,
     a.binaries,
     a.zipfiles,
     a.datas,
     strip=False,
     upx=False,
-               name='main')
+    name='main'
-
+)