use autogenerated GUIDs

1 files changed, 14 insertions, 40 deletions

diff --git a/src/msi/sok.wxs b/src/msi/sok.wxs
index d1bcfa9..b02bd50 100644
--- a/src/msi/sok.wxs
+++ b/src/msi/sok.wxs
@@ -37,7 +37,7 @@ adc88948-391e-48cf-8067-b002dcba4411
 -->
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product
-    Name='Sokoban'
+    Name='Pablotron Sokoban'
     Id='3626b379-ca7b-4fae-990e-b00cdeb0f2d7'
     UpgradeCode='dd702ed3-2b65-4d05-bc99-205aafbb8c37'
     Language='1033'
@@ -49,7 +49,7 @@ adc88948-391e-48cf-8067-b002dcba4411
       Id='*'
       Keywords='Installer'
       Description="Pablotron Sokoban installer."
-      Comments='Pablotron sokoban installer.'
+      Comments='Pablotron Sokoban installer.'
       Manufacturer='Pablotron'
       InstallerVersion='100'
       Languages='1033'
@@ -74,15 +74,12 @@ adc88948-391e-48cf-8067-b002dcba4411
       Value="Pablotron Sokoban 1.0 Installation [1]"
     />
 
-    <Property Id='ARPPRODUCTICON' Value='sok.ico' />
+    <Property Id='ARPPRODUCTICON' Value='sok.ico'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramMenuFolder' Name='Programs'>
         <Directory Id='ProgramMenuDir' Name='Pablotron Sokoban'>
-          <Component
-            Id='ProgramMenuDir'
-            Guid='364e3bc9-53c8-465b-ae02-edf3e53b327c'
-          >
+          <Component Id='ProgramMenuDir' Guid='*'>
             <RemoveFolder Id='ProgramMenuDir' On='uninstall'/>
             <RegistryValue
               Root='HKCU'
@@ -100,10 +97,7 @@ adc88948-391e-48cf-8067-b002dcba4411
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <Directory Id='Pablotron' Name='Pablotron'>
           <Directory Id='INSTALLDIR' Name='Sokoban'>
-            <Component
-              Id='cmp-sok-exe'
-              Guid='ca5c1c3c-4bb5-4123-b8ff-e1228e3457eb'
-            >
+            <Component Id='cmp-sok-exe' Guid='*'>
               <File
                 Id='file-sok-exe'
                 Name='sok.exe'
@@ -111,6 +105,7 @@ adc88948-391e-48cf-8067-b002dcba4411
                 Source='$(var.BUILD_DIR)/sok.exe'
                 KeyPath='yes'
               >
+                <!-- programs menu shortcut -->
                 <Shortcut
                   Id='shortcut-menu-sok-exe'
                   Directory='ProgramMenuDir'
@@ -121,7 +116,7 @@ adc88948-391e-48cf-8067-b002dcba4411
                   Advertise='yes'
                 />
 
-                <!-- really?? -->
+                <!-- desktop shortcut -->
                 <Shortcut
                   Id='shortcut-desktop-sok-exe'
                   Directory='DesktopFolder'
@@ -134,10 +129,7 @@ adc88948-391e-48cf-8067-b002dcba4411
               </File>
             </Component>
 
-            <Component
-              Id='cmp-readme-txt'
-              Guid='0aca3163-98b4-4302-9dad-9dfaac254620'
-            >
+            <Component Id='cmp-readme-txt' Guid='*'>
               <File
                 Id='file-readme-txt'
                 Name='readme.txt'
@@ -154,10 +146,7 @@ adc88948-391e-48cf-8067-b002dcba4411
               </File>
             </Component>
 
-            <Component
-              Id='cmp-solve-exe'
-              Guid='be925023-1bc1-4e05-a5bf-64b831106651'
-            >
+            <Component Id='cmp-solve-exe' Guid='*'>
               <File
                 Id='file-solve-exe'
                 Name='solve.exe'
@@ -167,10 +156,7 @@ adc88948-391e-48cf-8067-b002dcba4411
               />
             </Component>
 
-            <Component
-              Id='cmp-text-exe'
-              Guid='29d288a3-09f7-408b-8412-8d0e6176a235'
-            >
+            <Component Id='cmp-text-exe' Guid='*'>
               <File
                 Id='file-text-exe'
                 Name='text.exe'
@@ -180,10 +166,7 @@ adc88948-391e-48cf-8067-b002dcba4411
               />
             </Component>
 
-            <Component
-              Id='cmp-libfreetype-dll'
-              Guid='8089e94a-61f3-402e-b1b4-6b7346dc96e9'
-            >
+            <Component Id='cmp-libfreetype-dll' Guid='*'>
               <File
                 Id='file-libfreetype-6-dll'
                 Name='libfreetype-6.dll'
@@ -193,10 +176,7 @@ adc88948-391e-48cf-8067-b002dcba4411
               />
             </Component>
 
-            <Component
-              Id='cmp-sdl2-ttf-dll'
-              Guid='1e8a655d-7370-410c-95f2-2e42c41d9031'
-            >
+            <Component Id='cmp-sdl2-ttf-dll' Guid='*'>
               <File
                 Id='file-sdl2-ttf-dll'
                 Name='SDL2_ttf.dll'
@@ -206,10 +186,7 @@ adc88948-391e-48cf-8067-b002dcba4411
               />
             </Component>
 
-            <Component
-              Id='cmp-sdl2-dll'
-              Guid='67058335-6a4e-4cf0-bc34-c8cc2e2e2578'
-            >
+            <Component Id='cmp-sdl2-dll' Guid='*'>
               <File
                 Id='file-sdl2-dll'
                 Name='SDL2.dll'
@@ -219,10 +196,7 @@ adc88948-391e-48cf-8067-b002dcba4411
               />
             </Component>
 
-            <Component
-              Id='cmp-zlib1-dll'
-              Guid='e9383c16-e1cb-432a-b8db-d799c8225c85'
-            >
+            <Component Id='cmp-zlib1-dll' Guid='*'>
               <File
                 Id='file-zlib1-dll'
                 Name='zlib1.dll'