From d7021a934a61ed4a1dd37f30f58b72adbb1003d6 Mon Sep 17 00:00:00 2001
From: Christoph Stahl <christoph.stahl@tu-dortmund.de>
Date: Sat, 15 Feb 2025 20:38:28 +0100
Subject: [PATCH] Move wxs file to dist folder

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

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index 6c01152..96978fa 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -53,7 +53,6 @@ jobs:
           mkdir work/install
           Copy-Item -Recurse -Verbose syng work/install/syng
           Copy-Item -Verbose requirements-client.txt work/install/requirements.txt
-          Copy-Item -Verbose resources/windows/syng.wxs work/install/syng.wxs
           Copy-Item -Verbose resources/icons/syng.ico work/install/
           Copy-Item -Verbose syng/static/background.png work/install/
           Copy-Item -Verbose syng/static/background20perc.png work/install/
@@ -94,9 +93,12 @@ jobs:
         uses: microsoft/setup-msbuild@v2
       - name: Install WiX
         run: dotnet tool install --global wix
+      - name: Copy wix file to dist
+        run: 
+          Copy-Item -Verbose resources/windows/syng.wxs work/install/dist/syng.wxs
       - name: Build WiX on Windows
         run: wix build .\syng.wxs
-        working-directory: ./work/install
+        working-directory: ./work/install/dist
 
 
       # - name: Upload artifact (portable)
diff --git a/resources/windows/syng.wxs b/resources/windows/syng.wxs
index 78e449c..aa1746c 100644
--- a/resources/windows/syng.wxs
+++ b/resources/windows/syng.wxs
@@ -12,7 +12,7 @@
         <StandardDirectory Id="ProgramFilesFolder">
             <Directory Id="INSTALLFOLDER" Name="syng">
                 <Component Id="ProductComponent">
-                    <File KeyPath="yes" Source="dist\syng\syng.exe" Name="syng.exe"></File>
+                    <File KeyPath="yes" Source="syng\syng.exe" Name="syng.exe"></File>
                     <Shortcut Id="startmenuShortcut"
                               Directory="ProgramMenuDir"
                               Name="syng"
@@ -28,7 +28,7 @@
                               IconIndex="0"
                               Advertise="yes" />
                 </Component>
-                <Directory Name="data" SourceName="dist\syng\data" >
+                <Directory Name="data">
                     <Files Include="**">
                     </Files>
                 </Directory>