From 3acb64e6aa8030fd3e11461aa6290c7770942c2d Mon Sep 17 00:00:00 2001
From: Christoph Stahl <christoph.stahl@tu-dortmund.de>
Date: Sat, 15 Feb 2025 19:59:06 +0100
Subject: [PATCH] Since this is only run on GH Actions, this will take a bit of
 trial and error

---
 .github/workflows/windows.yaml | 20 ++++++++++----------
 resources/windows/syng.wxs     | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index 25822bb..6c01152 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -79,10 +79,10 @@ jobs:
         run: pip install -r requirements.txt
         working-directory: ./work      
 
-      - name: Bundle Syng (portable)
-        run:
-          pyinstaller -n "syng-${{ env.VERSION }}" -F -w -i'.\syng.ico' --add-data='.\syng.ico;.' --add-data='.\background.png;.' --add-data='.\background20perc.png;.' --add-binary '.\libmpv-2.dll;.' --add-binary '.\ffmpeg.exe;.' syng/main.py
-        working-directory: ./work/portable
+      # - name: Bundle Syng (portable)
+      #   run:
+      #     pyinstaller -n "syng-${{ env.VERSION }}" -F -w -i'.\syng.ico' --add-data='.\syng.ico;.' --add-data='.\background.png;.' --add-data='.\background20perc.png;.' --add-binary '.\libmpv-2.dll;.' --add-binary '.\ffmpeg.exe;.' syng/main.py
+      #   working-directory: ./work/portable
 
       - name: Bundle Syng (install)
         run:
@@ -99,12 +99,12 @@ jobs:
         working-directory: ./work/install
 
 
-      - name: Upload artifact (portable)
-        uses: actions/upload-artifact@v4
-        with:
-          name: Syng Version ${{ env.VERSION }} portable
-          path: work/portable/dist/syng-${{ env.VERSION }}.exe
-
+      # - name: Upload artifact (portable)
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: Syng Version ${{ env.VERSION }} portable
+      #     path: work/portable/dist/syng-${{ env.VERSION }}.exe
+      
       - name: Upload artifact (install)
         uses: actions/upload-artifact@v4
         with:
diff --git a/resources/windows/syng.wxs b/resources/windows/syng.wxs
index 7e5a68f..975b5b6 100644
--- a/resources/windows/syng.wxs
+++ b/resources/windows/syng.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Package Language="1033"
-             Manufacturer="Syng Rocks"
+             Manufacturer="Syng.Rocks!"
              Name="Syng"
              Scope="perUserOrMachine"
              UpgradeCode="092e7e0b-5042-47a1-9673-544d9722f8df"
@@ -10,10 +10,10 @@
         <Icon Id="syng.ico" SourceFile="syng.ico"/>
         <Property Id="ARPPRODUCTICON" Value="syng.ico" />
         <StandardDirectory Id="TARGETDIR">
-            <Directory Id="ProgramFilesFolder">
+            <StandardDirectory Id="ProgramFilesFolder">
                 <Directory Id="INSTALLFOLDER" Name="syng">
                     <Component Id="ProductComponent">
-                        <File KeyPath="yes" Source="dist\syng.exe" Name="syng.exe"></File>
+                        <File KeyPath="yes" Source="dist\syng\syng.exe" Name="syng.exe"></File>
                         <Shortcut Id="startmenuShortcut"
                                   Directory="ProgramMenuDir"
                                   Name="syng"
@@ -30,13 +30,13 @@
                                   Advertise="yes" />
                     </Component>
                     <Directory Name="data">
-                        <Files Include="dist\data\**">
+                        <Files Include="dist\syng\data\**">
                         </Files>
                     </Directory>
                 </Directory>
             </Directory>
         </StandardDirectory>
-        <Directory Id="ProgramMenuFolder" Name="Programs">
+        <StandardDirectory Id="ProgramMenuFolder" Name="Programs">
             <Directory Id="ProgramMenuDir" Name="syng"/>
         </Directory>
         <StandardDirectory Id="DesktopFolder"/>