提交 f1987bb9 authored 作者: Mitch Capper's avatar Mitch Capper

merged setup changes

blaaaaaah
blaaaaaah
blaaaaaah
blaaaaaah
...@@ -14,54 +14,54 @@ ...@@ -14,54 +14,54 @@
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"> xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.0.1.0" Manufacturer="FreeSWITCH" UpgradeCode="7668FAEF-2AB3-4079-A986-07A33739B42E"> <Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.0.1.0" Manufacturer="FreeSWITCH" UpgradeCode="7668FAEF-2AB3-4079-A986-07A33739B42E">
<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" />
<PropertyRef Id="NETFRAMEWORK40CLIENT"/> <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
<Condition Message="This application requires .NET Framework 4.0 Client. Please run Setup"> <Condition Message="This application requires .NET Framework 4.0 Client. Please run Setup">
<![CDATA[Installed OR NETFRAMEWORK40CLIENT]]> <![CDATA[Installed OR NETFRAMEWORK40CLIENT]]>
</Condition> </Condition>
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.PlatformProgramFilesFolder)"> <Directory Id="$(var.PlatformProgramFilesFolder)">
<Directory Id="INSTALLLOCATION" Name="FSClient"> <Directory Id="INSTALLLOCATION" Name="FSClient">
<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. --> <!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
<!-- <Component Id="ProductComponent" Guid="594203af-235a-4a7d-aff8-045997f872ec"> --> <!-- <Component Id="ProductComponent" Guid="594203af-235a-4a7d-aff8-045997f872ec"> -->
<!-- TODO: Insert files, registry keys, and other resources here. --> <!-- TODO: Insert files, registry keys, and other resources here. -->
<!-- </Component> --> <!-- </Component> -->
<Directory Id="MODLOCATION" Name="Mod"> <Directory Id="MODLOCATION" Name="Mod">
</Directory> </Directory>
<Directory Id="CONFLOCATION" Name="Conf"> <Directory Id="CONFLOCATION" Name="Conf">
</Directory> </Directory>
<Directory Id="PLUGINLOCATION" Name="Plugins"> <Directory Id="PLUGINLOCATION" Name="Plugins">
</Directory> </Directory>
</Directory> </Directory>
</Directory> </Directory>
<?if $(var.Platform) != x64 ?> <?if $(var.Platform) != x64 ?>
<Merge Id="CrtFiles_x86" <Merge Id="CrtFiles_x86"
SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm" SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm"
DiskId="1" DiskId="1"
Language="1033"/> Language="1033"/>
<?endif ?> <?endif ?>
<?if $(var.Platform) = x64 ?> <?if $(var.Platform) = x64 ?>
<Merge Id="CrtFiles_x64" <Merge Id="CrtFiles_x64"
SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x64.msm" SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x64.msm"
DiskId="1" DiskId="1"
Language="1033"/> Language="1033"/>
<?endif ?> <?endif ?>
<Directory Id="ProgramMenuFolder"> <Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="FSClient"/> <Directory Id="ApplicationProgramsFolder" Name="FSClient"/>
</Directory> </Directory>
</Directory> </Directory>
<DirectoryRef Id="ApplicationProgramsFolder"> <DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="ApplicationShortcut" Guid="20BC8446-684B-44F5-A1E3-AF6010EAF37C"> <Component Id="ApplicationShortcut" Guid="20BC8446-684B-44F5-A1E3-AF6010EAF37C">
<Shortcut Id="ApplicationStartMenuShortcut" <Shortcut Id="ApplicationStartMenuShortcut"
Name="FSClient" Name="FSClient"
Description="FreeSWITCH Windows Phone" Description="FreeSWITCH Windows Phone"
Target="[INSTALLLOCATION]FSClient.exe" Target="[INSTALLLOCATION]FSClient.exe"
WorkingDirectory="INSTALLLOCATION"/> WorkingDirectory="INSTALLLOCATION"/>
<util:InternetShortcut Id="OnlineDocumentationShortcut" <util:InternetShortcut Id="OnlineDocumentationShortcut"
Name="Online Documentation" Name="Online Documentation"
Target="http://wiki.freeswitch.com/wiki/FSClient"/> Target="http://wiki.freeswitch.com/wiki/FSClient"/>
...@@ -71,31 +71,31 @@ ...@@ -71,31 +71,31 @@
Arguments="/x [ProductCode]" Arguments="/x [ProductCode]"
Description="Uninstalls FSClient" /> Description="Uninstalls FSClient" />
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/> <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\FreeSWITCH\FSClient" Name="installed" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Root="HKCU" Key="Software\FreeSWITCH\FSClient" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<Feature Id="ProductFeature" Title="FSClient Core" Level="1"> <Feature Id="ProductFeature" Title="FSClient Core" Level="1">
<!-- TODO: Remove the comments around this ComponentRef element and the Component above in order to add resources to this installer. --> <!-- TODO: Remove the comments around this ComponentRef element and the Component above in order to add resources to this installer. -->
<!-- <ComponentRef Id="ProductComponent" /> --> <!-- <ComponentRef Id="ProductComponent" /> -->
<ComponentGroupRef Id="FSCoreComp"/> <ComponentGroupRef Id="FSCoreComp"/>
<ComponentGroupRef Id="FSCoreModComp"/> <ComponentGroupRef Id="FSCoreModComp"/>
<ComponentRef Id="FSCoreConfComp"/> <ComponentRef Id="FSCoreConfComp"/>
<ComponentGroupRef Id="FSClientComp"/> <ComponentGroupRef Id="FSClientComp"/>
<ComponentRef Id="ApplicationShortcut" /> <ComponentRef Id="ApplicationShortcut" />
<!-- 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) != x64 ?> <?if $(var.Platform) != x64 ?>
<MergeRef Id="CrtFiles_x86"/> <MergeRef Id="CrtFiles_x86"/>
<?endif ?> <?endif ?>
<?if $(var.Platform) = x64 ?> <?if $(var.Platform) = x64 ?>
<MergeRef Id="CrtFiles_x64"/> <MergeRef Id="CrtFiles_x64"/>
<?endif ?> <?endif ?>
</Feature> </Feature>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" /> <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
<UIRef Id="WixUI_InstallDir" /> <UIRef Id="WixUI_InstallDir" />
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch FSClient" /> <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch FSClient" />
<Property Id="WixShellExecTarget" Value="[INSTALLLOCATION]FSClient.exe" /> <Property Id="WixShellExecTarget" Value="[INSTALLLOCATION]FSClient.exe" />
<CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" /> <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
...@@ -108,5 +108,5 @@ ...@@ -108,5 +108,5 @@
<Property Id="ARPPRODUCTICON" Value="icon.ico" /> <Property Id="ARPPRODUCTICON" Value="icon.ico" />
<MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." AllowSameVersionUpgrades="yes" /> <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." AllowSameVersionUpgrades="yes" />
</Product> </Product>
</Wix> </Wix>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑!
请 注册 或者 后发表评论