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.

diff --git a/w32/Setup/FreeSWITCHConsole.wxs b/w32/Setup/FreeSWITCHConsole.wxs
index 243e614e6023760ef1f936bfabfa2888d8464b22..5c3b3ab7443bcc74b5b6a2e037e0ee4182ce5106 100644 (file)
--- a/w32/Setup/FreeSWITCHConsole.wxs
+++ b/w32/Setup/FreeSWITCHConsole.wxs
@@ -17,6 +17,9 @@
         Arguments=" -service "/>\r
         <ServiceControl Id="StartService" Stop="both" Remove="uninstall" Name="FreeSWITCH" Wait="no" />\r
       </Component>\r
+      <Component Id="cmp5A06A4A7E1884331BC6C949456B5F293" Guid="*">\r
+        <File Id="filD71F29178BC541A58D2E1A110EF3503D" Name="fs_cli.exe" Source="$(var.FreeSwitchConsole.TargetDir)\fs_cli.exe" KeyPath="yes"/>\r
+      </Component>\r
     </DirectoryRef>\r
   </Fragment>\r
   <Fragment>\r

diff --git a/w32/Setup/Product.2015.wxs b/w32/Setup/Product.2015.wxs
index e90bc42fd3f1a03725a416a7577a44bcc41abb9b..c19f86c4f47a46cc1ac12a9a977bcf49e110df52 100644 (file)
--- a/w32/Setup/Product.2015.wxs
+++ b/w32/Setup/Product.2015.wxs
@@ -72,7 +72,9 @@
                        <!-- <ComponentRef Id="ProductComponent" /> -->\r
                        <!-- The following Ref pulls in FreeSWITCHconsole.wxs items -->\r
                        <ComponentRef Id="cmpBEF12B96A80D45AC32F3B692E94A57C9"/>\r
-                       <!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. -->\r
+      <!-- This following Ref Pulls in fs_cli.exe-->\r
+      <ComponentRef Id="cmp5A06A4A7E1884331BC6C949456B5F293"/>\r
+      <!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. -->\r
                        <ComponentGroupRef Id="FreeSWITCHBaseFiles" />\r
                        <?if $(var.Platform) != x64 ?>\r
                          <MergeRef Id="CrtFiles_x86"/>\r

diff --git a/w32/Setup/Setup.2015.wixproj b/w32/Setup/Setup.2015.wixproj
index 8f97faa8a8c96a809f108890e8ccaab7b6719f69..ffb35e0310b605bd80fd3579bd3f075ce5bd5777 100644 (file)
--- a/w32/Setup/Setup.2015.wixproj
+++ b/w32/Setup/Setup.2015.wixproj
@@ -12,7 +12,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">\r
     <OutputPath>bin\Win32\Debug\</OutputPath>\r
     <IntermediateOutputPath>obj\X86\$(Configuration)\</IntermediateOutputPath>\r
-    <DefineConstants>Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\Win32\debug\sounds;FreeSWITCHBaseDir=$(SolutionDir)Win32\$(Configuration);</DefineConstants>\r
+    <DefineConstants>Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\Win32\debug\sounds;FreeSWITCHBaseDir=$(SolutionDir)Win32\$(Configuration);PlatformDir=Win32;</DefineConstants>\r
     <WixVariables>\r
     </WixVariables>\r
   </PropertyGroup>\r
@@ -50,6 +50,14 @@
     <Folder Include="Fragments" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ProjectReference Include="..\..\libs\esl\fs_cli.2015.vcxproj">\r
+      <Name>fs_cli</Name>\r
+      <Project>{d2fb8043-d208-4aee-8f18-3b5857c871b9}</Project>\r
+      <Private>True</Private>\r
+      <DoNotHarvest>True</DoNotHarvest>\r
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>\r
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>\r
+    </ProjectReference>\r
     <ProjectReference Include="..\..\src\mod\applications\mod_commands\mod_commands.2015.vcxproj">\r
       <Name>mod_commands</Name>\r
       <Project>{30a5b29c-983e-4580-9fd0-d647ccdcc7eb}</Project>\r
@@ -409,8 +417,8 @@
   <Import Project="$(WixTargetsPath)" />\r
   <PropertyGroup>\r
     <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"\r
-"$(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"\r
-"$(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>\r
+"$(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"\r
+"$(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>\r
   </PropertyGroup>\r
   <!--\r
        To modify your build process, add your task inside one of the targets below and uncomment it.\r