Switch from cx_Freeze to PyInstaller / subzero for building frozen Windows executables

qspectrumanalyzer/backends/__init__.py

@@ -106,13 +106,7 @@ class BasePowerThread(QtCore.QThread):
 
 
 # Build list of all backends
-_base_path = os.path.realpath(os.path.dirname(__file__))
+__all__ = ['soapy_power', 'hackrf_sweep', 'rtl_power', 'rtl_power_fftw', 'rx_power']
-_backends_files = (glob.glob(os.path.join(_base_path, "*.py")) +
-                   glob.glob(os.path.join(_base_path, "*.pyc")) +
-                   glob.glob(os.path.join(_base_path, "*.pyo")))
-
-__all__ = [os.path.splitext(os.path.basename(f))[0] for f in _backends_files
-           if os.path.isfile(f) and not os.path.basename(f).startswith("_")]
 
 # Import all backends
-from qspectrumanalyzer.backends import *
+from qspectrumanalyzer.backends import soapy_power, hackrf_sweep, rtl_power, rtl_power_fftw, rx_power

setup.py

@@ -1,12 +1,18 @@
 #!/usr/bin/env python
 
-import sys, pathlib, subprocess, shutil, re
+import sys
+
 import setuptools
+from setuptools import setup
 
 from qspectrumanalyzer.version import __version__
 
 setup_cmdclass = {}
-setup_kwargs = {}
+setup_entry_points = {
+    "gui_scripts": [
+        "qspectrumanalyzer=qspectrumanalyzer.__main__:main",
+    ],
+}
 
 # Allow compilation of Qt .qrc, .ui and .ts files (build_qt command)
 try:
@@ -15,17 +21,19 @@ try:
 except ImportError:
     pass
 
-# Allow building of frozen executables with cx_Freeze (build_exe command)
+# Allow building frozen executables with PyInstaller / subzero (build_exe command)
 try:
-    from cx_Freeze import setup, Executable
+    from subzero import setup, Executable
-
+    setup_entry_points = {
-    base = 'Win32GUI' if sys.platform == 'win32' else None
+        "console_scripts": [
-    setup_kwargs['executables'] = [
+            Executable('QSpectrumAnalyzer=qspectrumanalyzer.__main__:main',
-        Executable('qspectrumanalyzer.py', base=base),
+                       console=False, icon_file='qspectrumanalyzer.ico'),
-        Executable('soapy_power.py', base=None),
+            Executable('soapy_power=soapypower.__main__:main',
-    ]
+                       console=True),
+        ],
+    }
 except ImportError:
-    from setuptools import setup
+    pass
 
 
 setup(
@@ -49,11 +57,6 @@ setup(
         ("share/applications", ["qspectrumanalyzer.desktop"]),
         ("share/pixmaps", ["qspectrumanalyzer.png"])
     ],
-    entry_points={
-        "gui_scripts": [
-            "qspectrumanalyzer=qspectrumanalyzer.__main__:main"
-        ],
-    },
     install_requires=[
         "soapy_power>=1.5.0",
         "pyqtgraph>=0.10.0",
@@ -75,21 +78,19 @@ setup(
         "Topic :: Scientific/Engineering :: Visualization"
     ],
     options={
-        'build_exe': {
-            'packages': ['qspectrumanalyzer', 'qspectrumanalyzer.backends'],
-            'excludes': [],
-            'includes': [
-                'numpy.core._methods', 'numpy.lib.format', 'pyqtgraph.debug', 'pyqtgraph.ThreadsafeTimer'
-            ],
-            'include_msvcr': True,
-            'optimize': 2,
-        },
         'build_qt': {
             'packages': ['qspectrumanalyzer'],
             'languages': ['cs'],
             'replacement_bindings': 'Qt'
         },
+        'build_exe': {},
+        'bdist_msi': {
+            'upgrade_code': '30740ef4-84e7-4e67-8e4a-12b53492c387',
+            'shortcuts': [
+                'ProgramMenuFolder\\QSpectrumAnalyzer=qspectrumanalyzer',
+            ],
         },
+    },
+    entry_points=setup_entry_points,
     cmdclass=setup_cmdclass,
-    **setup_kwargs
 )