From 0c413afccd6d5d610866bca34415e02bc1fc7c83 Mon Sep 17 00:00:00 2001
From: Ken Rice <krice@freeswitch.org>
Date: Tue, 15 Dec 2015 14:12:27 -0600
Subject: [PATCH] FS-8664 #resolve add fs_cli.exe to msi so its installed.

Tweak the wix configs to actually build a 64bit installer.
unfortunately this breaks the 32bit msi without edits to the Setup.2015
WiX configs for the 32bit temp pathes. We are looking for a solution for
this.
---
 w32/Setup/FreeSWITCHConsole.wxs |  3 +++
 w32/Setup/Product.2015.wxs      |  4 +++-
 w32/Setup/Setup.2015.wixproj    | 14 +++++++++++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/w32/Setup/FreeSWITCHConsole.wxs b/w32/Setup/FreeSWITCHConsole.wxs
index 243e614e60..5c3b3ab744 100644
--- a/w32/Setup/FreeSWITCHConsole.wxs
+++ b/w32/Setup/FreeSWITCHConsole.wxs
@@ -17,6 +17,9 @@
         Arguments=" -service "/>
         <ServiceControl Id="StartService" Stop="both" Remove="uninstall" Name="FreeSWITCH" Wait="no" />
       </Component>
+      <Component Id="cmp5A06A4A7E1884331BC6C949456B5F293" Guid="*">
+        <File Id="filD71F29178BC541A58D2E1A110EF3503D" Name="fs_cli.exe" Source="$(var.FreeSwitchConsole.TargetDir)\fs_cli.exe" KeyPath="yes"/>
+      </Component>
     </DirectoryRef>
   </Fragment>
   <Fragment>
diff --git a/w32/Setup/Product.2015.wxs b/w32/Setup/Product.2015.wxs
index e90bc42fd3..c19f86c4f4 100644
--- a/w32/Setup/Product.2015.wxs
+++ b/w32/Setup/Product.2015.wxs
@@ -72,7 +72,9 @@
 			<!-- <ComponentRef Id="ProductComponent" /> -->
 			<!-- The following Ref pulls in FreeSWITCHconsole.wxs items -->
 			<ComponentRef Id="cmpBEF12B96A80D45AC32F3B692E94A57C9"/>
-			<!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. -->
+      <!-- This following Ref Pulls in fs_cli.exe-->
+      <ComponentRef Id="cmp5A06A4A7E1884331BC6C949456B5F293"/>
+      <!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. -->
 			<ComponentGroupRef Id="FreeSWITCHBaseFiles" />
 			<?if $(var.Platform) != x64 ?>
 			  <MergeRef Id="CrtFiles_x86"/>
diff --git a/w32/Setup/Setup.2015.wixproj b/w32/Setup/Setup.2015.wixproj
index 8f97faa8a8..ffb35e0310 100644
--- a/w32/Setup/Setup.2015.wixproj
+++ b/w32/Setup/Setup.2015.wixproj
@@ -12,7 +12,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\Win32\Debug\</OutputPath>
     <IntermediateOutputPath>obj\X86\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\Win32\debug\sounds;FreeSWITCHBaseDir=$(SolutionDir)Win32\$(Configuration);</DefineConstants>
+    <DefineConstants>Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\Win32\debug\sounds;FreeSWITCHBaseDir=$(SolutionDir)Win32\$(Configuration);PlatformDir=Win32;</DefineConstants>
     <WixVariables>
     </WixVariables>
   </PropertyGroup>
@@ -50,6 +50,14 @@
     <Folder Include="Fragments" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\libs\esl\fs_cli.2015.vcxproj">
+      <Name>fs_cli</Name>
+      <Project>{d2fb8043-d208-4aee-8f18-3b5857c871b9}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\mod\applications\mod_commands\mod_commands.2015.vcxproj">
       <Name>mod_commands</Name>
       <Project>{30a5b29c-983e-4580-9fd0-d647ccdcc7eb}</Project>
@@ -409,8 +417,8 @@
   <Import Project="$(WixTargetsPath)" />
   <PropertyGroup>
     <PreBuildEvent>"$(WixToolPath)\heat.exe" dir "$(ProjectDir)..\..\conf\vanilla" -cg FreeSWITCHConfFiles -gg -scom -sreg -sfrag -srd -dr CONFLOCATION -var var.FreeSWITCHConfFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHConfFiles.wxs"
-"$(WixToolPath)\heat.exe" dir "$(SolutionDir)Win32\$(Configuration)\sounds" -cg FreeSWITCHSoundFiles8 -gg -scom -sreg -sfrag -srd -dr SOUNDLOCATION -var var.FreeSWITCHSoundFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHSoundFiles8.wxs"
-"$(WixToolPath)\heat.exe" dir "$(SolutionDir)Win32\$(Configuration)" -t $(ProjectDir)filter.xslt -cg FreeSWITCHBaseFiles -gg -scom -sreg -sfrag -srd -dr INSTALLLOCATION -var var.FreeSWITCHBaseDir -out "$(ProjectDir)Fragments\FreeSWITCHBaseFiles.wxs"</PreBuildEvent>
+"$(WixToolPath)\heat.exe" dir "$(SolutionDir)x64\$(Configuration)\sounds" -cg FreeSWITCHSoundFiles8 -gg -scom -sreg -sfrag -srd -dr SOUNDLOCATION -var var.FreeSWITCHSoundFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHSoundFiles8.wxs"
+"$(WixToolPath)\heat.exe" dir "$(SolutionDir)x64\$(Configuration)" -t $(ProjectDir)filter.xslt -cg FreeSWITCHBaseFiles -gg -scom -sreg -sfrag -srd -dr INSTALLLOCATION -var var.FreeSWITCHBaseDir -out "$(ProjectDir)Fragments\FreeSWITCHBaseFiles.wxs"</PreBuildEvent>
   </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.