From 9271e42766491b78d311399df426f474554a565f Mon Sep 17 00:00:00 2001
From: "Michal Krenek (Mikos)" <m.krenek@gmail.com>
Date: Tue, 28 Mar 2017 00:32:11 +0200
Subject: [PATCH] Switch from cx_Freeze to PyInstaller / subzero for building
 frozen Windows executables

---
 qspectrumanalyzer.ico                  | Bin 0 -> 15086 bytes
 qspectrumanalyzer/backends/__init__.py |  10 +----
 setup.py                               |  53 +++++++++++++------------
 3 files changed, 29 insertions(+), 34 deletions(-)
 create mode 100644 qspectrumanalyzer.ico

diff --git a/qspectrumanalyzer.ico b/qspectrumanalyzer.ico
new file mode 100644
index 0000000000000000000000000000000000000000..c22b3c051c733f75bb04fd10d86e5c13cf7e1fff
GIT binary patch
literal 15086
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

literal 0
HcmV?d00001

diff --git a/qspectrumanalyzer/backends/__init__.py b/qspectrumanalyzer/backends/__init__.py
index 08f3401..22628c2 100644
--- a/qspectrumanalyzer/backends/__init__.py
+++ b/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__))
-_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("_")]
+__all__ = ['soapy_power', 'hackrf_sweep', 'rtl_power', 'rtl_power_fftw', 'rx_power']
 
 # Import all backends
-from qspectrumanalyzer.backends import *
+from qspectrumanalyzer.backends import soapy_power, hackrf_sweep, rtl_power, rtl_power_fftw, rx_power
diff --git a/setup.py b/setup.py
index a421423..04773e9 100755
--- a/setup.py
+++ b/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
-
-    base = 'Win32GUI' if sys.platform == 'win32' else None
-    setup_kwargs['executables'] = [
-        Executable('qspectrumanalyzer.py', base=base),
-        Executable('soapy_power.py', base=None),
-    ]
+    from subzero import setup, Executable
+    setup_entry_points = {
+        "console_scripts": [
+            Executable('QSpectrumAnalyzer=qspectrumanalyzer.__main__:main',
+                       console=False, icon_file='qspectrumanalyzer.ico'),
+            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
 )