From 3d87b2c0fdece2de52aa46329d4b72a3bee9009c Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Sun, 28 Jul 2024 17:56:43 +0300
Subject: [PATCH] Correct dir placement...?

---
 .github/workflows/buildAndDeploy.yml | 2 +-
 .github/workflows/unciv.wxs          | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/buildAndDeploy.yml b/.github/workflows/buildAndDeploy.yml
index 0ae4b7424b..8db9593f59 100644
--- a/.github/workflows/buildAndDeploy.yml
+++ b/.github/workflows/buildAndDeploy.yml
@@ -231,7 +231,7 @@ jobs:
         uses: microsoft/setup-msbuild@v2
 
       - name: Unzip unciv file
-        run: | # The relative folders in wxs files are relative to the file itself
+        run: | 
           mkdir .github/workflows/wix-msi-files
           tar -xf Unciv-Windows64.zip -C .github/workflows/wix-msi-files
           dir .github/workflows/wix-msi-files
diff --git a/.github/workflows/unciv.wxs b/.github/workflows/unciv.wxs
index 4457c0e241..2e761d1247 100644
--- a/.github/workflows/unciv.wxs
+++ b/.github/workflows/unciv.wxs
@@ -20,12 +20,15 @@
             <File Id="UncivExe"
                   KeyPath="yes"
                   Checksum="yes"
-                  Source="wix-msi-files/Unciv.exe">
+                  Source=".github/workflows/wix-msi-files/Unciv.exe">
+                  <!-- Annoyingly the relative locations are not the same.0
+                   THIS source is relative to the current working dir.... -->
             </File>
           </Component>
         </DirectoryRef>
     
         <ComponentGroup Id="UncivFiles" Directory="INSTALLFOLDER">
+            <!-- But THIS source is relative to the exs file location!!! -->
             <Files Include="wix-msi-files\**" />
         </ComponentGroup>