From bfab3045eed12ca9c40e7d7b69dc7846d1756326 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan.grewe@g-node.org>
Date: Sun, 14 Mar 2021 22:41:47 +0100
Subject: [PATCH] [win packaging] normal folder packaging works

---
 .github/workflows/python-app_win.yml |  4 ++--
 blipblop_win.spec                    | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/python-app_win.yml b/.github/workflows/python-app_win.yml
index 14ec40f..d750fe1 100644
--- a/.github/workflows/python-app_win.yml
+++ b/.github/workflows/python-app_win.yml
@@ -35,13 +35,13 @@ jobs:
     - name: create package
       run: |
         pyrcc5 resources.qrc -o resources.py
-        pyinstaller blipblop_win.spec
+        pyinstaller blipblop_win.spec -y
     
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v2.2.2
       with:
         # Artifact name
-        name: blipblop-binary
+        name: blipblop-windows
         # A file, directory or wildcard pattern that describes what to upload
         path: |
           dist
diff --git a/blipblop_win.spec b/blipblop_win.spec
index cbe9f7d..d266649 100644
--- a/blipblop_win.spec
+++ b/blipblop_win.spec
@@ -16,7 +16,6 @@ a = Analysis(['blipblop_main.py'],
                     ('sounds/bell.wav', "sounds"),
                     ('sounds/complete.wav', "sounds"),
                     ('sounds/message.wav', "sounds"),
-                    ('icons/blipblop_logo.ico', '.')
                     ],
              hiddenimports=[],
              hookspath=[],
@@ -31,9 +30,6 @@ pyz = PYZ(a.pure, a.zipped_data,
 
 exe = EXE(pyz,
           a.scripts,
-          a.binaries,
-          a.zipfiles,
-          a.datas,
           [],
           exclude_binaries=True,
           name='BlipBlop',
@@ -42,8 +38,14 @@ exe = EXE(pyz,
           strip=False,
           upx=True,
           console=True,
-          upx_exclude=[],
-          runtime_tmpdir=None,
           icon='icons/blipblop_logo.ico'
           )
 
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               upx_exclude=[],
+               name='BlipBlop')