X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Finstaller.wxs;h=52e7cb771effeb472a5c9d3b51bc81c600ac129c;hb=1de7240eb88fa24a8532ded116b4ec72dd213008;hp=7be97778ad69eaac925bb0697520fe320c091841;hpb=5c5879b99d2a0785095a384f48a2d934e1b2d4c5;p=PuTTY.git

diff --git a/windows/installer.wxs b/windows/installer.wxs
index 7be97778..52e7cb77 100644
--- a/windows/installer.wxs
+++ b/windows/installer.wxs
@@ -162,7 +162,7 @@
           <Component Id="README_Component"
                      Guid="0AB63F2A-0FD9-4961-B8F7-AB85C22D9986">
             <File Id="README_File"
-                  Source="README.txt" KeyPath="yes" />
+                  Source="README-msi.txt" Name="README.txt" KeyPath="yes" />
           </Component>
 
           <!--
@@ -298,12 +298,19 @@
         separately disableable are the auxiliary ones for desktop
         shortcuts, .PPK file extension and modifying PATH.
 
-        (And even those are mostly historical - the first two were
-        checkbox options in Inno Setup, and the third was not done at
-        all by Inno Setup so people might be surprised by it when
-        switching to this installer. I don't actually know for sure
-        that anyone _wants_ to be without these pieces. So all of them
-        are enabled by default.)
+        DesktopFeature (the desktop icon) is disabled by default, on
+        the basis of not cluttering up desktops too much unless
+        someone actually wants it. The .PPK association and PATH are
+        behind-the-scenes sorts of thing, so they're on by default.
+
+        (The old Inno Setup installer also made it optional whether
+        PuTTY got a Start Menu subfolder. That seems to be harder in
+        WiX, because the Start Menu shortcuts are tied in to the
+        installation of the files themselves, so the Start Menu
+        subfolder is mandatory if you're using this installer at all.
+        That doesn't seem unreasonable to me - if you don't want
+        _that_, you might as well just unpack the zip file and not
+        bother with an installer at all.)
     -->
     <Feature Id="FilesFeature" Level="1" Absent="disallow" AllowAdvertise="no"
              Title="Install PuTTY files">
@@ -319,7 +326,7 @@
       <ComponentRef Id="README_Component" />
       <ComponentRef Id="ProgramMenuDir" />
     </Feature>
-    <Feature Id="DesktopFeature" Level="1" Absent="allow" AllowAdvertise="no"
+    <Feature Id="DesktopFeature" Level="2" Absent="allow" AllowAdvertise="no"
              Title="Add shortcut to PuTTY on the Desktop">
       <ComponentRef Id="Desktop_Shortcut_Component" />
     </Feature>
@@ -413,6 +420,9 @@
       <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
       <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
 
+      <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" 
+               Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+
       <!--
           This ARPNOMODIFY flag prohibits changing the set of
           installed features, which would otherwise be possible by
@@ -437,6 +447,16 @@
       <Property Id="ARPNOMODIFY" Value="1" />
     </UI>
 
+    <!--
+        Offer to display README after installation.
+    -->
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"
+              Value="View README file" />
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" />
+    <Property Id="WixShellExecTarget" Value="[#README_File]" />
+    <CustomAction Id="LaunchApplication" BinaryKey="WixCA"
+                  DllEntry="WixShellExec" Impersonate="yes" />
+
     <!-- Glue: tell the install dir part of the UI what id my actual
          install dir is known by. Otherwise the former won't know how
          to alter the setting of the latter. -->
@@ -448,5 +468,14 @@
     <WixVariable Id="WixUIDialogBmp" Value="msidialog.bmp" />
     <WixVariable Id="WixUIBannerBmp" Value="msibanner.bmp" />
 
+    <!--
+        Set the icon that will show up in Add/Remove Programs.
+
+        http://www.codeproject.com/Articles/43564/WiX-Tricks says that
+        for some weird reason the Id of this icon has to end in .exe.
+    -->
+    <Icon Id="installericon.exe" SourceFile="puttyins.ico" />
+    <Property Id="ARPPRODUCTICON" Value="installericon.exe" />
+
   </Product>
 </Wix>