include viewer app + shortcuts in MSI install

diff --git a/windows/graphviz.wxs.in b/windows/graphviz.wxs.in
index 6626a806aabed9da7a10838b2dd6550a4e0e2ec0..1508ea4559e98108042f30491777a8b225930f33 100755 (executable)
--- a/windows/graphviz.wxs.in
+++ b/windows/graphviz.wxs.in
@@ -16,6 +16,7 @@
                        InstallerVersion="200"
                        Compressed="yes" />
 
+               <Property Id="ALLUSERS" Value="1" />
                <Property Id="ARPCOMMENTS" Value="AT&amp;T Graphviz - Graph Visualization Software" />
                <Property Id="ARPHELPLINK" Value="http://www.graphviz.org/" />
                <Property Id="ARPURLUPDATEINFO" Value="http://www.graphviz.org/Download_windows.php" />
@@ -44,19 +45,31 @@
 
                <Directory Id="TARGETDIR" Name="SourceDir">
                        <Directory Id="ProgramFilesFolder">
-                               <Directory Id="ApplicationFolder" Name="Graphviz">
-                                       <!-- referenced by the directories in the heated wxs -->
+                               <Directory Id="ApplicationProgramFilesFolder" Name="Graphviz">
+                                       <!-- bin, include, lib and share are referenced by the directories in the heated wxs -->
                                        <Directory Id="bin" Name="bin">
                                                <!-- need to remove the config file when uninstalling -->
                                                <Component Id="config" Guid="DAD3E382-59B2-429A-9292-0C28A12783C3">
                                                        <RemoveFile Id="config" Name="config" On="uninstall" />
                                                </Component>
+                                               <!-- viewer application sourced from graphviz.csproj build directory, include shortcuts in the start menu and desktop -->
+                                               <Component Id="Graphviz.exe" Guid="25FE550B-3D8B-435B-AB35-553D2628171D">
+                                                       <File Id="Graphviz.exe" Name="Graphviz.exe" KeyPath="yes" Source="bin\x86\Release\Graphviz.exe">
+                                                               <Shortcut Id="ApplicationProgramMenu" Name="Graphviz" Directory="ApplicationProgramMenuFolder" Advertise="yes" />
+                                                               <Shortcut Id="ApplicationDesktop" Name="Graphviz" Directory="DesktopFolder" Advertise="yes" />
+                                                       </File>
+                                                       <RemoveFolder Id="ApplicationProgramMenuFolder" Directory="ApplicationProgramMenuFolder" On="uninstall" />
+                                               </Component>
                                        </Directory>
                                        <Directory Id="include" Name="include" />
                                        <Directory Id="lib" Name="lib" />
                                        <Directory Id="share" Name="share" />
                                </Directory>
                        </Directory>
+                       <Directory Id="ProgramMenuFolder">
+                               <Directory Id="ApplicationProgramMenuFolder" Name="Graphviz" />
+                       </Directory>
+                       <Directory Id="DesktopFolder" />
                </Directory>
 
                <Feature Id="cli" Title="Command Line Tools and Libraries" Level="1">
@@ -67,6 +80,10 @@
                        <ComponentGroupRef Id="share" />
                        <ComponentRef Id="config" />
                </Feature>
+               <Feature Id="gui" Title="Viewer Application" Level="1">
+                       <!-- refer to the viewer application -->
+                       <ComponentRef Id="Graphviz.exe" />
+               </Feature>
 
                <CustomAction Id="PreventDowngrading" Error="Same or newer version already installed." />
                <CustomAction Id="ConfigurePlugins" FileKey="dot.exe" ExeCommand="-c" Execute="deferred"/>