ci: overhaul ci recipes for pyinstaller

.appveyor.yml

@@ -49,7 +49,7 @@ after_test:
   - python setup.py sdist
   - ps: "ls dist"
   # Run pyinstaller
-  - pyinstaller -y --log-level=WARN build-recipes\\win_pyjibe.spec
+  - pyinstaller -y --log-level=WARN build-recipes\\win_PyJibe.spec
   # Run the binary (the most simple test)
   - dist\\pyjibe\\PyJibe.exe --version
   # Create InnoSetup installers

.github/workflows/check.yml

@@ -57,5 +57,4 @@ jobs:
       if: runner.os == 'macOS'
       working-directory: ./build-recipes
       run: |
-        bash ./macos_build_app.sh PyJibeApp $(git describe --tags)
-        cat PyJibeApp.spec
+        bash ./macos_build_app.sh PyJibe $(git describe --tags)

build-recipes/macos_PyJibe.spec

@@ -0,0 +1,47 @@
+# -*- mode: python ; coding: utf-8 -*-
+from os.path import exists
+import warnings
+
+if not exists("./PyJibeLauncher.py")):
+	warnings.warn("Cannot find 'PyJibeLauncher.py'! Please run pyinstaller "+
+                  "from the 'build-recipes' directory.")
+
+block_cipher = None
+
+
+a = Analysis(['PyJibeLauncher.py'],
+             pathex=['.'],
+             binaries=[],
+             datas=[],
+             hiddenimports=[],
+             hookspath=['.'],
+             runtime_hooks=[],
+             excludes=['tkinter'],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          [],
+          exclude_binaries=True,
+          name='PyJibe',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=True,
+          console=False )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               upx_exclude=[],
+               name='PyJibe')
+app = BUNDLE(coll,
+             name='PyJibe.app',
+             icon=None,
+             bundle_identifier=None)

build-recipes/macos_build_app.sh

@@ -24,7 +24,7 @@ else
     NAMEVERSION=${1}_${2}
 fi
 
-SCRIPT="./${NAME}.py"
+SPEC="./macos_${NAME}.spec"
 APP="./dist_app/${NAME}.app"
 DMG="./dist_app/${NAMEVERSION}.dmg"
 PKG="./dist_app/${NAME}.pkg"
@@ -36,7 +36,7 @@ rm -rf ./dist_app
 
 pip install -r macos_build_requirements.txt
 
-pyinstaller -w -y --distpath="./dist_app" --exclude-module tkinter --additional-hooks-dir="." $SCRIPT
+pyinstaller -y --log-level=WARN --distpath="./dist_app" ${SPEC}
 
 # Test the binary by executing it with --version argument
 echo ""

build-recipes/win_pyjibe.spec → build-recipes/win_PyJibe.spec

@@ -11,11 +11,11 @@ if not exists(join(cdir, "pyjibe")):
 	warnings.warn("Cannot find 'pyjibe'! Please run pyinstaller "+
                   "from git root folder.")
 
-pyinstdir = os.path.realpath(cdir+"/build-recipes/")
-script = os.path.join(pyinstdir, "PyJibeApp.py")
+pyinstdir = os.path.realpath(cdir + "/build-recipes/")
+script = os.path.join(pyinstdir, "PyJibeLauncher.py")
 
 # Icon
-icofile = os.path.join(pyinstdir,"PyJibe.ico")
+icofile = os.path.join(pyinstdir, "PyJibe.ico")
 
 a = Analysis([script],
              pathex=[cdir],