continuation of msbuild enabled automated installers for Win32/X64

This commit is contained in:
Jeff Lenk 2010-10-20 09:46:27 -05:00
parent 3baa433e0b
commit 1cabe88302

View File

@ -12,7 +12,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<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"> <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">
<Package InstallerVersion="200" Compressed="yes" /> <Package InstallerVersion="300" Compressed="yes" />
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" /> <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
@ -29,6 +29,18 @@
<!-- <Component Id="ProductComponent" Guid="6f1498a7-d029-430b-b9d9-fe12e17bdbab"> --> <!-- <Component Id="ProductComponent" Guid="6f1498a7-d029-430b-b9d9-fe12e17bdbab"> -->
<!-- TODO: Insert files, registry keys, and other resources here. --> <!-- TODO: Insert files, registry keys, and other resources here. -->
<!-- </Component> --> <!-- </Component> -->
<?if $(var.Platform) != x86 ?>
<Merge Id="CrtFiles_x86"
SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm"
DiskId="1"
Language="1033"/>
<?endif ?>
<?if $(var.Platform) = x64 ?>
<Merge Id="CrtFiles_x64"
SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x64.msm"
DiskId="1"
Language="1033"/>
<?endif ?>
</Directory> </Directory>
</Directory> </Directory>
</Directory> </Directory>
@ -39,6 +51,12 @@
<!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. --> <!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. -->
<ComponentGroupRef Id="Product.Generated" /> <ComponentGroupRef Id="Product.Generated" />
<?if $(var.Platform) != x86 ?>
<MergeRef Id="CrtFiles_x86"/>
<?endif ?>
<?if $(var.Platform) = x64 ?>
<MergeRef Id="CrtFiles_x64"/>
<?endif ?>
</Feature> </Feature>
<Feature Id="ProductFeatureConf" Title="FreeSWITCH Configuration Sample" Level="1"> <Feature Id="ProductFeatureConf" Title="FreeSWITCH Configuration Sample" Level="1">
<ComponentGroupRef Id="FreeSWITCHConfFiles" /> <ComponentGroupRef Id="FreeSWITCHConfFiles" />