From 9ef4d1ad5cda8e5f701e1f58dec97d874d2e63a5 Mon Sep 17 00:00:00 2001
From: Johannes Pohl <Johannes.Pohl90@gmail.com>
Date: Sat, 23 Feb 2019 17:02:43 +0100
Subject: [PATCH] Use PyInstaller and InnoSetup for Windows binaries (#618)

---
 data/azure-pipelines.yml   |  16 +++--
 data/build_cx.py           | 117 -------------------------------------
 data/inno.iss              |  38 ++++++++++++
 data/pyinstaller_helper.py |  43 ++++++++++++++
 src/urh/main.py            |  10 ++--
 src/urh/version.py         |   4 ++
 6 files changed, 103 insertions(+), 125 deletions(-)
 delete mode 100644 data/build_cx.py
 create mode 100644 data/inno.iss
 create mode 100644 data/pyinstaller_helper.py

diff --git a/data/azure-pipelines.yml b/data/azure-pipelines.yml
index e390ae1bf3..511f4d3ef3 100644
--- a/data/azure-pipelines.yml
+++ b/data/azure-pipelines.yml
@@ -126,7 +126,7 @@ jobs:
     displayName: "Build extensions"
 
   - script: |
-      pip install wheel twine six appdirs packaging cx_freeze
+      pip install --upgrade wheel twine six appdirs packaging setuptools pyinstaller pywin32
       pip install "pyaudio; python_version < '3.7'"
       python -c "import tempfile, os; open(os.path.join(tempfile.gettempdir(), 'urh_releasing'), 'w').close()"
     displayName: "Install build dependencies"
@@ -134,9 +134,17 @@ jobs:
   - script: python setup.py bdist_wheel
     displayName: "Build python wheel"
 
-  - script: python data\build_cx.py
+  - script: python data/pyinstaller_helper.py
     condition: eq(variables['python.version'], '3.6')
-    displayName: "Build MSI"
+    displayName: "Run PyInstaller"
+
+  - script: |
+      choco install innosetup
+      python src/urh/version.py > C:\urh_version.txt
+      set /p URHVERSION=<C:\urh_version.txt
+      iscc /dMyAppVersion=%URHVERSION% /dArch=$(python.arch) data/inno.iss
+    condition: eq(variables['python.version'], '3.6')
+    displayName: "Create setup.exe"
 
   - task: PublishBuildArtifacts@1
     inputs:
@@ -160,7 +168,7 @@ jobs:
       action: 'edit'
       tag: $(Build.SourceBranchName)
       repositoryName: jopohl/urh
-      assets: 'dist/*.msi'
+      assets: 'dist/*.exe'
       assetUploadMode: 'replace'
       addChangeLog: true
 
diff --git a/data/build_cx.py b/data/build_cx.py
deleted file mode 100644
index 69c50c8693..0000000000
--- a/data/build_cx.py
+++ /dev/null
@@ -1,117 +0,0 @@
-import os
-import sys
-
-import cx_Freeze
-
-
-def build_exe(build_cmd='build'):
-    # have to make sure args looks right
-    sys.argv = sys.argv[:1] + [build_cmd]
-
-    root_path = os.path.realpath(os.path.join(os.path.dirname(__file__), ".."))
-    os.chdir(root_path)
-
-    app_path = os.path.join("src", "urh", "main.py")
-    assert os.path.isfile(app_path)
-
-    cli_path = os.path.join("src", "urh", "cli", "urh_cli.py")
-    assert os.path.isfile(cli_path)
-
-    src_dir = os.path.join(os.curdir, "src")
-    assert os.path.isdir(src_dir)
-    sys.path.insert(0, src_dir)
-
-    import urh.version as version
-
-    if sys.platform == 'win32':
-        include_files = [os.path.join("data", 'icons', 'appicon.ico')]
-        lib_path = os.path.join("src", "urh", "dev", "native", "lib", "shared")
-        for f in os.listdir(lib_path):
-            if f.endswith(".dll") or f.endswith(".txt"):
-                include_files.append(os.path.join(lib_path, f))
-
-        shortcut_table = [
-            ("DesktopShortcut",  # Shortcut
-             "DesktopFolder",  # Directory_
-             "Universal Radio Hacker",  # Name
-             "TARGETDIR",  # Component_
-             "[TARGETDIR]urh.exe",  # Target
-             None,  # Arguments
-             None,  # Description
-             None,  # Hotkey
-             None,  # Icon
-             None,  # IconIndex
-             None,  # ShowCmd
-             'TARGETDIR'  # WkDir
-             ),
-        ]
-
-        executables = [
-            cx_Freeze.Executable(
-                app_path,
-                targetName="urh.exe",
-                icon=os.path.join("data", 'icons', 'appicon.ico'),
-                copyright="Copyright (C) 2019 Johannes Pohl, Andreas Noack",
-                base="Win32GUI"),
-
-            cx_Freeze.Executable(
-                app_path,
-                targetName="urh_debug.exe",
-                copyright="Copyright (C) 2019 Johannes Pohl, Andreas Noack"),
-
-            cx_Freeze.Executable(cli_path, targetName="urh_cli.exe")
-        ]
-    else:
-        include_files = [os.path.join("data", 'icons', 'appicon.png')]
-        executables = [
-            cx_Freeze.Executable(app_path, targetName="urh", icon=os.path.join("data", 'icons', 'appicon.png')),
-            cx_Freeze.Executable(cli_path, targetName="urh_cli.exe")
-        ]
-
-        shortcut_table = None
-
-    for f in os.listdir(os.path.join("src", "urh", "dev", "gr", "scripts")):
-        if f.endswith(".py"):
-            include_files.append(os.path.join("src", "urh", "dev", "gr", "scripts", f))
-
-    plugins = []
-    plugin_path = os.path.join("src", "urh", "plugins")
-    for plugin in os.listdir(plugin_path):
-        if os.path.isdir(os.path.join(plugin_path, plugin)):
-            for f in os.listdir(os.path.join(plugin_path, plugin)):
-                if f.endswith(".py") and f != "__init__.py":
-                    plugins.append("urh.plugins.{0}.{1}".format(plugin, f.replace(".py", "")))
-
-    options = {
-        'build_exe': {
-            "include_files": include_files,
-            "include_msvcr": True,
-            "excludes": ["tkinter"],
-            "includes": ['numpy.core._methods', 'numpy.lib.format', 'six', 'appdirs', 'pyaudio',
-                         'packaging', 'packaging.version', 'packaging.specifiers', 'packaging.requirements',
-                         'setuptools.msvc', 'html.parser'] + plugins
-        },
-        'bdist_msi': {
-            "upgrade_code": "{96abcdef-1337-4711-cafe-beef4a1ce42}",
-            "data": {"Shortcut": shortcut_table}
-        }
-    }
-
-    cx_Freeze.setup(
-        name="Universal Radio Hacker",
-        description="Universal Radio Hacker: investigate wireless protocols like a boss",
-        author="Johannes Pohl",
-        author_email="Johannes.Pohl90@gmail.com",
-        url="https://github.com/jopohl/urh",
-        license="GNU General Public License (GPL) 3",
-        version=version.VERSION,
-        executables=executables,
-        options=options
-    )
-
-
-if __name__ == '__main__':
-    if sys.platform == "win32":
-        build_exe("bdist_msi")
-    else:
-        build_exe()
diff --git a/data/inno.iss b/data/inno.iss
new file mode 100644
index 0000000000..36437bc0bb
--- /dev/null
+++ b/data/inno.iss
@@ -0,0 +1,38 @@
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{8A0E36A6-DE56-46B8-BCC3-C16D1BC759CC}
+AppName=Universal Radio Hacker
+AppVersion={#MyAppVersion}
+VersionInfoVersion={#MyAppVersion}
+ArchitecturesInstallIn64BitMode=x64
+UninstallDisplayName=Universal Radio Hacker
+AppPublisher=Johannes Pohl
+AppPublisherURL=https://github.com/jopohl/urh
+AppSupportURL=https://github.com/jopohl/urh
+AppUpdatesURL=https://github.com/jopohl/urh
+DefaultDirName={pf}\Universal Radio Hacker
+DisableProgramGroupPage=yes
+LicenseFile=..\LICENSE
+OutputDir=..\dist
+OutputBaseFilename=Universal.Radio.Hacker-{#Arch}
+Compression=lzma2/ultra
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "..\pyinstaller\urh\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{commonprograms}\Universal Radio Hacker"; Filename: "{app}\urh.exe"
+Name: "{commondesktop}\Universal Radio Hacker"; Filename: "{app}\urh.exe"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\urh.exe"; Description: "{cm:LaunchProgram,Universal Radio Hacker}"; Flags: nowait postinstall skipifsilent
diff --git a/data/pyinstaller_helper.py b/data/pyinstaller_helper.py
new file mode 100644
index 0000000000..54ae49d9f9
--- /dev/null
+++ b/data/pyinstaller_helper.py
@@ -0,0 +1,43 @@
+import os
+import shutil
+import sys
+from subprocess import call
+
+HIDDEN_IMPORTS = ["packaging.specifiers", "packaging.requirements",
+                  "numpy.core._methods", "numpy.core._dtype_ctypes"]
+DATA = [("src/urh/dev/native/lib/shared", "."), ("src/urh/plugins", "urh/plugins"), ]
+EXCLUDE = ["matplotlib"]
+
+cmd = ["pyinstaller"]
+if sys.platform == "darwin":
+    cmd.append("--onefile")
+
+for hidden_import in HIDDEN_IMPORTS:
+    cmd.append("--hidden-import={}".format(hidden_import))
+
+for src, dst in DATA:
+    cmd.append("--add-data")
+    cmd.append('"{}{}{}"'.format(src, os.pathsep, dst))
+
+for exclude in EXCLUDE:
+    cmd.append("--exclude-module={}".format(exclude))
+
+urh_path = os.path.realpath(os.path.join(os.path.dirname(__file__), ".."))
+cmd.append('--icon="{}"'.format(os.path.join(urh_path, "data/icons/appicon.ico")))
+
+cmd.extend(["--distpath", "./pyinstaller"])
+
+shutil.copy(os.path.join(urh_path, "src/urh/main.py"), os.path.join(urh_path, "src/urh/urh.py"))
+shutil.copy(os.path.join(urh_path, "src/urh/main.py"), os.path.join(urh_path, "src/urh/urh_debug.py"))
+urh_cmd = cmd + ["--windowed", os.path.join(urh_path, "src/urh/urh.py")]
+urh_debug_cmd = cmd + [os.path.join(urh_path, "src/urh/urh_debug.py")]
+cli_cmd = cmd + [os.path.join(urh_path, "src/urh/cli/urh_cli.py")]
+
+for cmd in (urh_cmd, cli_cmd, urh_debug_cmd):
+    cmd = " ".join(cmd)
+    print(cmd)
+    sys.stdout.flush()
+    call(cmd, shell=True)
+
+shutil.copy("./pyinstaller/urh_cli/urh_cli.exe", "./pyinstaller/urh/urh_cli.exe")
+shutil.copy("./pyinstaller/urh_debug/urh_debug.exe", "./pyinstaller/urh/urh_debug.exe")
diff --git a/src/urh/main.py b/src/urh/main.py
index db3bc0ad68..1f26c0f4e7 100755
--- a/src/urh/main.py
+++ b/src/urh/main.py
@@ -4,6 +4,8 @@
 import re
 import os
 import sys
+import multiprocessing
+
 
 from PyQt5.QtCore import QTimer, Qt
 from PyQt5.QtGui import QPalette, QIcon, QColor
@@ -153,9 +155,8 @@ def main():
     constants.SEND_INDICATOR_COLOR = selection_color
 
     main_window = MainController()
-    import multiprocessing as mp
     # allow usage of prange (OpenMP) in Processes
-    mp.set_start_method("spawn")
+    multiprocessing.set_start_method("spawn")
 
     if sys.platform == "darwin":
         menu_bar = main_window.menuBar()
@@ -164,8 +165,6 @@ def main():
         # Ensure we get the app icon in windows taskbar
         import ctypes
         ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID("jopohl.urh")
-        import multiprocessing as mp
-        mp.freeze_support()
 
     main_window.showMaximized()
     # main_window.setFixedSize(1920, 1080 - 30)  # Youtube
@@ -182,4 +181,7 @@ def main():
 
 
 if __name__ == "__main__":
+    if hasattr(sys, "frozen"):
+        multiprocessing.freeze_support()
+
     main()
diff --git a/src/urh/version.py b/src/urh/version.py
index 7c38ef3ef7..a2f22966f8 100644
--- a/src/urh/version.py
+++ b/src/urh/version.py
@@ -1 +1,5 @@
 VERSION = "2.5.5" 
+
+if __name__ == '__main__':
+    # To read out version easy on command line for InnoSetup
+    print(VERSION)