From 755d7b0742cb9c1616b896a294f1c4e82d5ff5fc Mon Sep 17 00:00:00 2001
From: David Sparer <David.Sparer@pearson.com>
Date: Tue, 31 May 2016 15:31:47 -0600
Subject: [PATCH] Resolved MR-846 - help files not being copied with installer

---
 .gitignore                                    |  1 +
 .../Fragments/DirectoriesFragment.wxs         |  4 ++-
 .../Installer/Installer.wixproj               | 27 ++++++++++---------
 Installer Projects/Installer/mRemoteNGV1.wxs  |  2 ++
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index e221f2f48..f645fe654 100644
--- a/.gitignore
+++ b/.gitignore
@@ -279,3 +279,4 @@ Installer/Resources/License.rtf
 Installer/Fragments/FilesFragment.wxs
 Installer Projects/Installer/Resources/License.rtf
 Installer Projects/Installer/Fragments/FilesFragment.wxs
+Installer Projects/Installer/Fragments/HelpFilesFragment.wxs
diff --git a/Installer Projects/Installer/Fragments/DirectoriesFragment.wxs b/Installer Projects/Installer/Fragments/DirectoriesFragment.wxs
index 9ff127b03..7a9a687a3 100644
--- a/Installer Projects/Installer/Fragments/DirectoriesFragment.wxs	
+++ b/Installer Projects/Installer/Fragments/DirectoriesFragment.wxs	
@@ -4,7 +4,9 @@
 	<Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="$(var.PlatformProgramFilesFolder)">
-        <Directory Id="APPLICATIONROOTDIRECTORY" Name="$(var.ProductName)" />
+        <Directory Id="APPLICATIONROOTDIRECTORY" Name="$(var.ProductName)">
+          <Directory Id="HELPFILESDIRECTORY" Name="Help" />
+        </Directory>
       </Directory>
 
       <Directory Id="DesktopFolder" Name="!(loc.Folders_Desktop)" />
diff --git a/Installer Projects/Installer/Installer.wixproj b/Installer Projects/Installer/Installer.wixproj
index e5c926bdc..b7c573b6a 100644
--- a/Installer Projects/Installer/Installer.wixproj	
+++ b/Installer Projects/Installer/Installer.wixproj	
@@ -30,6 +30,7 @@
     <Compile Include="CustomActions\UninstallLegacyVersions.wxs" />
     <Compile Include="Fragments\FilesFragment.wxs" />
     <Compile Include="Fragments\DirectoriesFragment.wxs" />
+    <Compile Include="Fragments\HelpFilesFragment.wxs" />
     <Compile Include="Fragments\MainExeFragment.wxs" />
     <Compile Include="Fragments\MiscTextFilesFragment.wxs" />
     <Compile Include="Fragments\PuTTYNGFragment.wxs" />
@@ -98,22 +99,24 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <LinkerAdditionalOptions>
     </LinkerAdditionalOptions>
-    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release;</DefineConstants>
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <Cultures>en-US</Cultures>
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Portable|x86' ">
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Portable|x86' ">
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>REM Harvest bin directory of the mRemoteV1 project
 call "$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\bin\$(Configuration)" -ag -dr APPLICATIONROOTDIRECTORY -var var.HarvestPath -srd -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt" -v
 REM Convert the license file "COPYING.TXT" to "License.rtf" to be shown in the installer GUI
-call "$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT"</PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <Cultures>en-US</Cultures>
-    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug;</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Portable|x86' ">
-    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug Portable;</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Portable|x86' ">
-    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release Portable;</DefineConstants>
+call "$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT"
+REM Harvest the help files for inclusion in a custom directory
+call "$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\Resources\Help" -ag -dr HELPFILESDIRECTORY -var var.HelpFilesHarvestPath -srd -cg HelpFiles -template fragment -out "$(ProjectDir)Fragments\HelpFilesFragment.wxs" -v</PreBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Installer Projects/Installer/mRemoteNGV1.wxs b/Installer Projects/Installer/mRemoteNGV1.wxs
index 7889f333b..d8174fd6b 100644
--- a/Installer Projects/Installer/mRemoteNGV1.wxs	
+++ b/Installer Projects/Installer/mRemoteNGV1.wxs	
@@ -22,6 +22,7 @@
     <PropertyRef Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" />
     <Icon Id="mRemoteNG.ico" SourceFile="Resources\mRemoteNG.ico" />
 
+
     <InstallUISequence>
       <Custom Action="SetRDP80KBValue" After="AppSearch" />
       <Custom Action="CheckIfRDP80Installed" After="SetRDP80KBValue">(NOT Installed) AND (VersionNT = 601 OR VersionNT64 = 601)</Custom>
@@ -58,6 +59,7 @@
       <Feature Id="F.MinimalFeature" Title="$(var.ProductName)" Absent="disallow" ConfigurableDirectory="APPLICATIONROOTDIRECTORY" Level="1">
         <ComponentGroupRef Id="MandatoryComponents" Primary="yes" />
         <ComponentRef Id="C.MainExe" Primary="yes" />
+        <ComponentGroupRef Id="HelpFiles" Primary="yes" />
         <ComponentGroupRef Id="CG.ProjectInfoFiles" Primary="yes" />
       </Feature>