FS-4768 add wix 3.7 support this is a work in progress

diff --git a/w32/Setup/Product.2012.wxs b/w32/Setup/Product.2012.wxs
new file mode 100644 (file)
index 0000000..e90bc42
--- /dev/null
+++ b/w32/Setup/Product.2012.wxs
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!-- Platform specific variables -->\r
+<?if $(var.Platform) = x64 ?>\r
+<?define Win64 = "yes" ?>\r
+<?define ProductName = "FreeSWITCH (64 bit)" ?>\r
+<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>\r
+<?else ?>\r
+<?define Win64 = "no" ?>\r
+<?define ProductName = "FreeSWITCH" ?>\r
+<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>\r
+<?endif ?>\r
+\r
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
+       <Product Id="b004a325-1272-47e5-a415-a74e9fc99865" Name="$(var.ProductName)" Language="1033" Version="1.0.0.0" Manufacturer="FreeSWITCH" UpgradeCode="3af7020b-1348-45e8-a0cf-80909d4eb421">\r
+               <Package InstallerVersion="405" Compressed="yes" />\r
+\r
+               <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />\r
+\r
+               <Directory Id="TARGETDIR" Name="SourceDir">\r
+                       <Directory Id="$(var.PlatformProgramFilesFolder)">\r
+                               <Directory Id="INSTALLLOCATION" Name="FreeSWITCH">\r
+                                        <Directory Id="MODLOCATION" Name="mod">\r
+                                        </Directory>\r
+                                        <Directory Id="CONFLOCATION" Name="conf">\r
+                                        </Directory>\r
+                                        <Directory Id="SOUNDLOCATION" Name="sounds">\r
+                                        </Directory>\r
+                                       <!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->\r
+                                       <!-- <Component Id="ProductComponent" Guid="6f1498a7-d029-430b-b9d9-fe12e17bdbab"> -->\r
+                                               <!-- TODO: Insert files, registry keys, and other resources here. -->\r
+                                       <!-- </Component> -->\r
+                                       <?if $(var.Platform) != x64 ?>\r
+                                               <Merge Id="CrtFiles_x86"\r
+                                               SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC110_CRT_x86.msm"\r
+                                               DiskId="1"\r
+                                               Language="1033"/>\r
+                                       <?endif ?>\r
+                                       <?if $(var.Platform) = x64 ?>\r
+                                               <Merge Id="CrtFiles_x64"\r
+                                               SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC110_CRT_x64.msm"\r
+                                               DiskId="1"\r
+                                               Language="1033"/>\r
+                                       <?endif ?>\r
+                               </Directory>\r
+                       </Directory>\r
+                       <Directory Id="ProgramMenuFolder">\r
+                               <Directory Id="ApplicationProgramsFolder" Name="FreeSWITCH"/>\r
+                       </Directory>\r
+               </Directory>\r
+\r
+               <DirectoryRef Id="ApplicationProgramsFolder">\r
+                       <Component Id="ApplicationShortcut" Guid="B554D1D1-C8C6-4d46-A3E7-4BA836EF929B">\r
+                               <Shortcut Id="ApplicationStartMenuShortcut"\r
+                                                        Name="FreeSWITCH"\r
+                                                        Description="FreeSWITCH Telephony SoftSwitch"\r
+                                                        Target="[INSTALLLOCATION]FreeSwitchConsole.exe"\r
+                                                        WorkingDirectory="INSTALLLOCATION"/>\r
+                               <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>\r
+                               <RegistryValue Root="HKCU" Key="Software\FreeSWITCH\FreeSWITCH" Name="installed" Type="integer" Value="1" KeyPath="yes"/>\r
+                       </Component>\r
+                       <Component Id="FSCliShortcut" Guid="D209546C-C728-4d8f-BDB2-29AED8824282">\r
+                               <Shortcut Id="FSCliStartMenuShortcut"\r
+                                                        Name="FS_Cli"\r
+                                                        Description="FreeSWITCH Command Line Interface"\r
+                                                        Target="[INSTALLLOCATION]fs_cli.exe"\r
+                                                        WorkingDirectory="INSTALLLOCATION"/>\r
+                               <RegistryValue Root="HKCU" Key="Software\FreeSWITCH\FS_CLI" Name="installed" Type="integer" Value="1" KeyPath="yes"/>\r
+                       </Component>\r
+               </DirectoryRef> \r
+               <Feature Id="ProductFeature" Title="FreeSWITCH Core" Level="1">\r
+                       <!-- TODO: Remove the comments around this ComponentRef element and the Component above in order to add resources to this installer. -->\r
+                       <!-- <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
+                       <ComponentGroupRef Id="FreeSWITCHBaseFiles" />\r
+                       <?if $(var.Platform) != x64 ?>\r
+                         <MergeRef Id="CrtFiles_x86"/>\r
+                       <?endif ?>\r
+                       <?if $(var.Platform) = x64 ?>\r
+                         <MergeRef Id="CrtFiles_x64"/>\r
+                       <?endif ?>\r
+               </Feature>\r
+               <Feature Id="ProductFeatureFreeSWITCH" Title="FreeSWITCH" Level="1">\r
+                       <ComponentRef Id="ApplicationShortcut" />\r
+               </Feature>\r
+               <Feature Id="ProductFeatureFSCli" Title="FreeSWITCH Command Line Interface" Level="1">\r
+                       <ComponentRef Id="FSCliShortcut" />\r
+               </Feature>\r
+               <Feature Id="ProductFeatureConf" Title="FreeSWITCH Configuration Sample" Level="1">\r
+                       <ComponentGroupRef Id="FreeSWITCHConfFiles" />\r
+               </Feature>\r
+               <Feature Id="ProductFeatureSounds" Title="FreeSWITCH Sounds 8Khz" Level="1">\r
+                       <ComponentGroupRef Id="FreeSWITCHSoundFiles8" />\r
+               </Feature>\r
+    <UIRef Id="WixUI_Mondo" />\r
+  </Product>\r
+</Wix>\r

diff --git a/w32/Setup/Setup.2012.wixproj b/w32/Setup/Setup.2012.wixproj
new file mode 100644 (file)
index 0000000..5d22d00
--- /dev/null
+++ b/w32/Setup/Setup.2012.wixproj
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <ProductVersion>3.5</ProductVersion>\r
+    <ProjectGuid>{47213370-b933-487d-9f45-bca26d7e2b6f}</ProjectGuid>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <OutputName>FreeSWITCH</OutputName>\r
+    <OutputType>Package</OutputType>\r
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>\r
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">\r
+    <OutputPath>bin\x86\Debug\</OutputPath>\r
+    <IntermediateOutputPath>obj\X86\$(Configuration)\</IntermediateOutputPath>\r
+    <DefineConstants>Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\Win32\debug\sounds;FreeSWITCHBaseDir=$(SolutionDir)$(Platform)\$(Configuration);</DefineConstants>\r
+    <WixVariables>\r
+    </WixVariables>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">\r
+    <OutputPath>bin\x86\release\</OutputPath>\r
+    <IntermediateOutputPath>obj\X86\$(Configuration)\</IntermediateOutputPath>\r
+    <DefineConstants>Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\Win32\release\sounds;FreeSWITCHBaseDir=$(SolutionDir)$(Platform)\$(Configuration);</DefineConstants>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">\r
+    <OutputPath>bin\x64\Debug\</OutputPath>\r
+    <IntermediateOutputPath>obj\X64\$(Configuration)\</IntermediateOutputPath>\r
+    <DefineConstants>Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\x64\debug\sounds;FreeSWITCHBaseDir=$(SolutionDir)$(Platform)\$(Configuration);</DefineConstants>\r
+    <WixVariables>\r
+    </WixVariables>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">\r
+    <OutputPath>bin\x64\Release\</OutputPath>\r
+    <IntermediateOutputPath>obj\X64\$(Configuration)\</IntermediateOutputPath>\r
+    <DefineConstants>Debug;FreeSWITCHConfFilesDir=$(ProjectDir)..\..\conf\vanilla;FreeSWITCHSoundFilesDir=$(ProjectDir)..\..\x64\release\sounds;FreeSWITCHBaseDir=$(SolutionDir)$(Platform)\$(Configuration);</DefineConstants>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Compile Include="Fragments\FreeSWITCHConfFiles.wxs" />\r
+    <Compile Include="Fragments\FreeSWITCHSoundFiles8.wxs" />\r
+    <Compile Include="Fragments\FreeSWITCHBaseFiles.wxs" />\r
+    <Compile Include="FreeSWITCHConsole.wxs" />\r
+    <Compile Include="Product.2012.wxs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <WixExtension Include="WixUIExtension">\r
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>\r
+      <Name>WixUIExtension</Name>\r
+    </WixExtension>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Folder Include="Fragments" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="..\Console\FreeSwitchConsole.2012.vcxproj">\r
+      <Name>FreeSwitchConsole</Name>\r
+      <Project>{1af3a893-f7be-43dd-b697-8ab2397c0d67}</Project>\r
+      <Private>True</Private>\r
+      <DoNotHarvest>True</DoNotHarvest>\r
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>\r
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <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)$(Platform)\$(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)$(Platform)\$(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
+       Other similar extension points exist, see Wix.targets.\r
+       <Target Name="BeforeBuild">\r
+       </Target>\r
+       <Target Name="AfterBuild">\r
+       </Target>\r
+       -->\r
+</Project>
\ No newline at end of file

diff --git a/w32/Setup/filter.xslt b/w32/Setup/filter.xslt
new file mode 100644 (file)
index 0000000..e96851d
--- /dev/null
+++ b/w32/Setup/filter.xslt
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<xsl:stylesheet version="1.0"\r
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\r
+    xmlns="http://schemas.microsoft.com/wix/2006/wi"\r
+    xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">\r
+\r
+ <!-- <xsl:key name="unusedcomponent-search" match="wix:Component[not (contains(wix:File/@Source, '.dll')) or contains(wix:File/@Source, 'mod')]" use="@Id"/> -->\r
+ <xsl:key name="unusedcomponent-search" match="wix:Component[not (contains(wix:File/@Source, '.dll'))]" use="@Id"/>\r
+\r
+  <!-- strip all extraneous whitespace -->\r
+  <xsl:strip-space  elements="*"/>\r
+\r
+  <!-- Copy all attributes and elements to the output. -->\r
+  <xsl:template match="@*|*">\r
+    <xsl:copy>\r
+      <xsl:apply-templates select="@*" />\r
+      <xsl:apply-templates select="*" />\r
+    </xsl:copy>\r
+  </xsl:template>\r
+\r
+  <!-- Exclude all File elements that are not a .dll file -->\r
+  <xsl:template match="wix:Component[not(contains(wix:File/@Source, \r
+'.dll'))]" />\r
+\r
+  <!-- Exclude Directory elements -->\r
+  <!--<xsl:template match="wix:Directory[not(contains(*/@Source, '.pdb'))]"/>-->\r
+  <xsl:template match="wix:Directory[@Name='conf']"/>\r
+  <xsl:template match="wix:Directory[@Name='sounds']"/>\r
+  <xsl:template match="wix:Directory[@Name='grammar']"/>\r
+\r
+  \r
+  <!-- Remove ComponentRefs. --> \r
+  <xsl:template match="wix:ComponentRef[key('unusedcomponent-search', @Id)]"/>\r
+\r
+</xsl:stylesheet>\r