Bump the version number in configure.ac to 1.0.5

[moonshot-ui.git] / windows / app.wxs

diff --git a/windows/app.wxs b/windows/app.wxs
index c1f098e..6fc6573 100644 (file)
--- a/windows/app.wxs
+++ b/windows/app.wxs
@@ -23,11 +23,11 @@
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <Directory Id='INSTALLDIR' Name='Moonshot'>
           <Directory Id='BINDIR' Name='bin'>
-            <Component Id='MainExe' Guid='$(var.MainExeGuid)'>
+            <Component Id='MainExe' Guid='37D8BA2D-40E0-475D-BF50-6328A9E269FE'>
               <File Id='MainExe'
-                    Name='$(var.MainExeFile)'
+                    Name='moonshot.exe'
                     DiskId='1'
-                    Source='$(var.MainExeSource)'
+                    Source='src/.libs/moonshot.exe'
                     KeyPath='yes'>
                 <Shortcut Id='startmenu'
                           Directory='ProgramMenuDir'
@@ -42,6 +42,35 @@
               </File>
             </Component>
 
+            <Component Id='WebProvisionExe' Guid='E150A9E2-3429-4082-9919-557EDAEFB43F'>
+              <!-- FIXME: to add the icon for these associations, see the following:
+                   http://wix.tramontana.co.hu/tutorial/getting-started/beyond-files
+                   http://stackoverflow.com/questions/138550/how-to-register-file-types-extensions-with-a-wix-installer
+                -->
+              <File Id='WebProvisionExe'
+                    Name='moonshot-webp.exe'
+                    DiskId='1'
+                    Source='src/.libs/moonshot-webp.exe'
+                    KeyPath='yes' />
+
+              <ProgId Id="Moonshot.Identity" Description="Moonshot Identity">
+                <Extension Id="msht" ContentType="application/moonshot+xml">
+                  <Verb Id="install"
+                        Command="install"
+                        TargetFile="WebProvisionExe"
+                        Argument="&quot;%1&quot;" />
+                </Extension>
+              </ProgId>
+            </Component>
+
+            <!-- General deps -->
+            <Component Id='Deps' Guid='4668773A-2486-4BF5-9AFE-A6595F1A3EB9'>
+              <File Id="MSRPC_MINGW.DLL" Name="msrpc-mingw.dll" Source="bin\msrpc-mingw.dll" />
+              <File Id="MSRPC_GLIB2.DLL" Name="msrpc-glib2.dll" Source="bin\msrpc-glib2.dll" />
+              <File Id="LIBMOONSHOT_0.DLL" Name="libmoonshot-0.dll" Source="libmoonshot/.libs/libmoonshot-0.dll" />
+                         <File Id="LIBGEE_2.DLL" Name="libgee-2.dll" Source="bin\libgee-2.dll" />
+            </Component>
+
             <!-- Gtk+ runtime - /bin -->
             <Component Id='Gtk2BinFiles' Guid='DB587042-E204-4D76-9372-8B6B03642377'>
               <!-- Included in mingw -->
@@ -78,10 +107,6 @@
               <File Id="LIBPNG14_14.DLL" Name="libpng14-14.dll" Source="bin\libpng14-14.dll" />
               <File Id="PANGO_QUERYMODULES.EXE" Name="pango-querymodules.exe" Source="bin\pango-querymodules.exe" />
               <File Id="ZLIB1.DLL" Name="zlib1.dll" Source="bin\zlib1.dll" />
-
-              <!-- FIXME: need to use this and then delete it -->
-              <File Id="GTK_UPDATE_ICON_CACHE.EXE" Name="gtk-update-icon-cache.exe" Source="bin\gtk-update-icon-cache.exe" />
-
             </Component>
           </Directory>
 
@@ -130,15 +155,27 @@
       </Directory>
 
       <Directory Id='DesktopFolder' Name='Desktop' />
+
+      <Component Id='RegistryEntries' Guid='7251DB79-DC03-4868-9855-41104164E5BA'>
+        <RegistryKey Root='HKLM'
+                     Key='Software\Moonshot'
+                     Action='createAndRemoveOnUninstall'>
+          <RegistryValue Type="string" Value="[BINDIR]/moonshot.exe" />
+        </RegistryKey>
+      </Component>
+
     </Directory>
 
     <Feature Id='Complete' Level='1'>
       <ComponentRef Id='MainExe' />
+      <ComponentRef Id='WebProvisionExe' />
+      <ComponentRef Id='Deps' />
       <ComponentRef Id='ProgramMenuDir' />
       <ComponentRef Id='Gtk2BinFiles' />
       <ComponentRef Id='Gtk2ThemeEngineFiles' />
       <ComponentRef Id='Gtk2ThemeRcFiles' />
       <ComponentRef Id='Icons' />
+      <ComponentRef Id='RegistryEntries' />
     </Feature>
   </Product>
 </Wix>