From d015395566df56912f760eb88b1781474ed4724c Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Tue, 15 May 2012 11:25:50 -0500
Subject: [PATCH] FS-4203 --resolve add service setup to windows installer

---
 w32/Setup/FreeSWITCHConsole.wxs | 51 +++++++++++++++++++++++++++++++++
 w32/Setup/Product.wxs           | 18 ++++++------
 w32/Setup/Setup.wixproj         |  2 ++
 3 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 w32/Setup/FreeSWITCHConsole.wxs

diff --git a/w32/Setup/FreeSWITCHConsole.wxs b/w32/Setup/FreeSWITCHConsole.wxs
new file mode 100644
index 0000000000..243e614e60
--- /dev/null
+++ b/w32/Setup/FreeSWITCHConsole.wxs
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <DirectoryRef Id="INSTALLLOCATION">
+      <Component Id="cmpBEF12B96A80D45AC32F3B692E94A57C9" Guid="*">
+        <File Id="fil7DBC560A735C4208B3E7DF75D1D1E513" Name="FreeSwitchConsole.exe" Source="$(var.FreeSwitchConsole.TargetDir)\FreeSwitchConsole.exe" KeyPath="yes"/>
+        <ServiceInstall
+        Type="ownProcess"
+        Account="localSystem"
+        Vital="no"
+        Name="FreeSWITCH"
+        DisplayName="FreeSWITCH Multi Protocol Switch"
+        Description="FreeSWITCH service control"
+        Start="demand"
+        ErrorControl="ignore"
+        Interactive="no"
+        Arguments=" -service "/>
+        <ServiceControl Id="StartService" Stop="both" Remove="uninstall" Name="FreeSWITCH" Wait="no" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="FreeSwitchConsole.Binaries">
+      <ComponentRef Id="cmpBEF12B96A80D45AC32F3B692E94A57C9" />
+    </ComponentGroup>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="FreeSwitchConsole.Symbols" />
+  </Fragment>
+  <Fragment>
+    <DirectoryRef Id="INSTALLLOCATION">
+      <Component Id="cmp7AC01B2B6EDD58CE539876AB86975286" Guid="*">
+        <File Id="filA3A7609AFEB16B75D819A0208EFFF451" Source="$(var.FreeSwitchConsole.ProjectDir)\FreeSwitchConsole.2010.vcxproj" />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="FreeSwitchConsole.Sources">
+      <ComponentRef Id="cmp7AC01B2B6EDD58CE539876AB86975286" />
+    </ComponentGroup>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="FreeSwitchConsole.Content" />
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="FreeSwitchConsole.Satellites" />
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="FreeSwitchConsole.Documents" />
+  </Fragment>
+</Wix>
diff --git a/w32/Setup/Product.wxs b/w32/Setup/Product.wxs
index 2f072aa8ca..66bc63b61d 100644
--- a/w32/Setup/Product.wxs
+++ b/w32/Setup/Product.wxs
@@ -66,12 +66,12 @@
 							 WorkingDirectory="INSTALLLOCATION"/>
 				<RegistryValue Root="HKCU" Key="Software\FreeSWITCH\FS_CLI" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
 			</Component>
-		</DirectoryRef>
-
+		</DirectoryRef>	
 		<Feature Id="ProductFeature" Title="FreeSWITCH Core" Level="1">
 			<!-- TODO: Remove the comments around this ComponentRef element and the Component above in order to add resources to this installer. -->
 			<!-- <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. -->
 			<ComponentGroupRef Id="Product.Generated" />
 			<?if $(var.Platform) != x64 ?>
@@ -87,12 +87,12 @@
 		<Feature Id="ProductFeatureFSCli" Title="FreeSWITCH Command Line Interface" Level="1">
 			<ComponentRef Id="FSCliShortcut" />
 		</Feature>
-    <Feature Id="ProductFeatureConf" Title="FreeSWITCH Configuration Sample" Level="1">
-      <ComponentGroupRef Id="FreeSWITCHConfFiles" />
-    </Feature>
-    <Feature Id="ProductFeatureSounds" Title="FreeSWITCH Sounds 8Khz" Level="1">
-      <ComponentGroupRef Id="FreeSWITCHSoundFiles8" />
-    </Feature>
+		<Feature Id="ProductFeatureConf" Title="FreeSWITCH Configuration Sample" Level="1">
+			<ComponentGroupRef Id="FreeSWITCHConfFiles" />
+		</Feature>
+		<Feature Id="ProductFeatureSounds" Title="FreeSWITCH Sounds 8Khz" Level="1">
+			<ComponentGroupRef Id="FreeSWITCHSoundFiles8" />
+		</Feature>
     <UIRef Id="WixUI_Mondo" />
   </Product>
 </Wix>
diff --git a/w32/Setup/Setup.wixproj b/w32/Setup/Setup.wixproj
index fcba3f0ceb..f7873cac08 100644
--- a/w32/Setup/Setup.wixproj
+++ b/w32/Setup/Setup.wixproj
@@ -36,6 +36,7 @@
   <ItemGroup>
     <Compile Include="Fragments\FreeSWITCHConfFiles.wxs" />
     <Compile Include="Fragments\FreeSWITCHSoundFiles8.wxs" />
+    <Compile Include="FreeSWITCHConsole.wxs" />
     <Compile Include="Product.wxs" />
   </ItemGroup>
   <ItemGroup>
@@ -791,6 +792,7 @@
       <Project>{1af3a893-f7be-43dd-b697-8ab2397c0d67}</Project>
       <Private>True</Private>
       <DoNotHarvest>
+         True
       </DoNotHarvest>
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLLOCATION</RefTargetDir>