Second attempt

jasonbrianhall · Feb 22, 2025 · a97df32 · a97df32
1 parent 7f4d1d3
commit a97df32
Showing 1 changed file with 46 additions and 46 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -96,52 +96,52 @@ jobs:
 
         # Create the WXS file with the generated entries
         cat > installer.wxs << EOL
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Solitaire GTK" Language="1033" Version="1.0.0" Manufacturer="Your Name" UpgradeCode="D7E94C12-7B38-42F6-9E1A-BB952F7D5801">
-    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
-    <MajorUpgrade DowngradeErrorMessage="A newer version is already installed." />
-    <MediaTemplate EmbedCab="yes" />
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="Solitaire GTK">
-          <Component Id="MainExecutable" Guid="93F5A218-4C3D-48E5-B85F-1E6C9D4A7B23">
-            <File Id="MainEXE" Name="solitaire.exe" Source="solitaire.exe" KeyPath="yes"/>
-            <File Id="CardsZIP" Name="cards.zip" Source="cards.zip"/>
-            <File Id="IconFile" Name="icon.ico" Source="icon.ico"/>
-            <File Id="SettingsIni" Name="settings.ini" Source="settings.ini"/>
-            $DLL_ENTRIES
-            <File Id="README" Name="README.md" Source="../../README.md"/>
-            <File Id="LICENSE" Name="LICENSE.md" Source="../../LICENSE.md"/>
-          </Component>
-          $GTK_ENTRIES
-        </Directory>
-      </Directory>
-      <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="Solitaire GTK">
-          <Component Id="ApplicationShortcuts" Guid="C8E2D459-F6A1-4B93-9C72-E31D8FE52D47">
-            <Shortcut Id="ApplicationStartMenu" 
-                     Name="Solitaire GTK" 
-                     Target="[INSTALLFOLDER]solitaire.exe" 
-                     WorkingDirectory="INSTALLFOLDER"
-                     Icon="SolitaireIcon"/>
-            <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
-            <RegistryValue Root="HKCU" Key="Software\SolitaireGTK" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
-          </Component>
-        </Directory>
-      </Directory>
-    </Directory>
-    <Feature Id="ProductFeature" Title="Solitaire GTK" Level="1">
-      <ComponentRef Id="MainExecutable" />
-      <ComponentRef Id="ApplicationShortcuts" />
-      <ComponentRef Id="GtkSchemas" />
-      <ComponentRef Id="GtkIcons" />
-      <ComponentRef Id="GtkThemes" />
-    </Feature>
-    <Icon Id="SolitaireIcon" SourceFile="icon.ico"/>
-  </Product>
-</Wix>
-EOL
+        <?xml version="1.0" encoding="UTF-8"?>
+        <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+          <Product Id="*" Name="Solitaire GTK" Language="1033" Version="1.0.0" Manufacturer="Your Name" UpgradeCode="D7E94C12-7B38-42F6-9E1A-BB952F7D5801">
+            <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+            <MajorUpgrade DowngradeErrorMessage="A newer version is already installed." />
+            <MediaTemplate EmbedCab="yes" />
+            <Directory Id="TARGETDIR" Name="SourceDir">
+              <Directory Id="ProgramFilesFolder">
+                <Directory Id="INSTALLFOLDER" Name="Solitaire GTK">
+                  <Component Id="MainExecutable" Guid="93F5A218-4C3D-48E5-B85F-1E6C9D4A7B23">
+                    <File Id="MainEXE" Name="solitaire.exe" Source="solitaire.exe" KeyPath="yes"/>
+                    <File Id="CardsZIP" Name="cards.zip" Source="cards.zip"/>
+                    <File Id="IconFile" Name="icon.ico" Source="icon.ico"/>
+                    <File Id="SettingsIni" Name="settings.ini" Source="settings.ini"/>
+                    $DLL_ENTRIES
+                    <File Id="README" Name="README.md" Source="../../README.md"/>
+                    <File Id="LICENSE" Name="LICENSE.md" Source="../../LICENSE.md"/>
+                  </Component>
+                  $GTK_ENTRIES
+                </Directory>
+              </Directory>
+              <Directory Id="ProgramMenuFolder">
+                <Directory Id="ApplicationProgramsFolder" Name="Solitaire GTK">
+                  <Component Id="ApplicationShortcuts" Guid="C8E2D459-F6A1-4B93-9C72-E31D8FE52D47">
+                    <Shortcut Id="ApplicationStartMenu" 
+                             Name="Solitaire GTK" 
+                             Target="[INSTALLFOLDER]solitaire.exe" 
+                             WorkingDirectory="INSTALLFOLDER"
+                             Icon="SolitaireIcon"/>
+                    <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
+                    <RegistryValue Root="HKCU" Key="Software\SolitaireGTK" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+                  </Component>
+                </Directory>
+              </Directory>
+            </Directory>
+            <Feature Id="ProductFeature" Title="Solitaire GTK" Level="1">
+              <ComponentRef Id="MainExecutable" />
+              <ComponentRef Id="ApplicationShortcuts" />
+              <ComponentRef Id="GtkSchemas" />
+              <ComponentRef Id="GtkIcons" />
+              <ComponentRef Id="GtkThemes" />
+            </Feature>
+            <Icon Id="SolitaireIcon" SourceFile="icon.ico"/>
+          </Product>
+        </Wix>
+        EOL
 
         wixl -v installer.wxs -o ../../Solitaire-GTK.msi