diff options
Diffstat (limited to 'installer/Product.wxs')
| -rw-r--r-- | installer/Product.wxs | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/installer/Product.wxs b/installer/Product.wxs index af19483cd..05746d5e7 100644 --- a/installer/Product.wxs +++ b/installer/Product.wxs @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" + xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> <?include "Settings.wxi" ?> <Product Id="*" Name="$(var.ProductName) $(var.ProductVersion)" Language="!(loc.LANG)" Version="$(var.ProductVersion)" Manufacturer="$(var.ProductManufacturer)" UpgradeCode="$(var.ProductUpgradeCode)"> @@ -15,6 +16,8 @@ <ProgressText Action="NSISUninstall">Uninstalling old version</ProgressText> </UI> + <util:CloseApplication Id="CloseMumble" RebootPrompt="no" EndSessionMessage="yes" Target="mumble.exe" /> + <Property Id="WixShellExecTarget" Value="[#mumble.exe]" /> <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" /> <UI> @@ -41,6 +44,7 @@ <Property Id="ARPURLINFOABOUT" Value="http://www.mumble.info/" /> <Property Id="ARPURLUPDATEINFO" Value="http://www.mumble.info/" /> <Property Id='ARPPRODUCTICON'>mumble.ico</Property> + <Property Id="MSIRESTARTMANAGERCONTROL" Value="Disable" /> <WixVariable Id="WixUILicenseRtf" Value="$(var.SourceDir)\installer\gpl.rtf" /> <WixVariable Id="WixUIBannerBmp" Value="$(var.SourceDir)\installer\bannrbmp.bmp" /> @@ -116,8 +120,6 @@ <ComponentRef Id="Changes.txt" /> <ComponentRef Id="qt.txt" /> - <ComponentRef Id="dbghelp.dll" /> - <?ifndef StaticBuild ?> <?ifdef ProtoBufDir ?> <ComponentRef Id="libprotobuf.dll" /> @@ -130,16 +132,6 @@ <?ifdef IntelCppDir ?> <ComponentRef Id="libmmd.dll"/> <?endif ?> - - <?ifdef RedistDirVC12 ?> - <ComponentRef Id="msvcp120.dll" /> - <ComponentRef Id="msvcr120.dll" /> - <?endif ?> - - <?ifdef D3DCompilerDLL ?> - <ComponentRef Id="d3dcompiler_43.dll" /> - <ComponentRef Id="d3dcompiler_47.dll" /> - <?endif ?> </ComponentGroup> <Feature Id="Mumble" Title="!(loc.MUMBLE_SEC_MUMBLE)" Description="!(loc.DESC_SectionMumble)" Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLDIR" Display="expand"> @@ -176,6 +168,18 @@ <ComponentRef Id="mumble_g15_helper.exe" /> <?endif ?> + <?ifdef RedistDirVC12 ?> + <ComponentRef Id="msvcp120.dll" /> + <ComponentRef Id="msvcr120.dll" /> + <?endif ?> + + <ComponentRef Id="dbghelp.dll" /> + + <?ifdef D3DCompilerDLL ?> + <ComponentRef Id="d3dcompiler_43.dll" /> + <ComponentRef Id="d3dcompiler_47.dll" /> + <?endif ?> + <Feature Id="MumbleDesktopShortcutFeature" Title="!(loc.MUMBLE_SEC_DesktopShortcut)" Description="!(loc.DESC_DesktopShortcut)" InstallDefault="followParent" AllowAdvertise="no"> <ComponentRef Id="MumbleDesktopShortcutComponent" /> </Feature> @@ -196,7 +200,15 @@ <ComponentRef Id="murmur.exe" /> <ComponentRef Id="murmur.ini" /> <ComponentRef Id="Murmur.ice" /> - + + <?ifdef VersionSubDir ?> + <?ifdef RedistDirVC12 ?> + <ComponentRef Id="Murmur_msvcp120.dll" /> + <ComponentRef Id="Murmur_msvcr120.dll" /> + <?endif ?> + <ComponentRef Id="Murmur_dbghelp.dll" /> + <?endif ?> + <Feature Id="MurmurDesktopShortcutFeature" Title="!(loc.MUMBLE_SEC_DesktopShortcut)" Description="!(loc.DESC_DesktopShortcut)" InstallDefault="followParent" AllowAdvertise="no"> <ComponentRef Id="MurmurDesktopShortcutComponent" /> </Feature> @@ -220,6 +232,7 @@ <AppSearch Sequence='1' /> <Custom Action="SetNSISPath" After="AppSearch">NSISINSTALL</Custom> <Custom Action='NSISUninstall' After='InstallInitialize'>NSISINSTALL AND NOT Installed</Custom> + <Custom Action="WixCloseApplications" Before="InstallValidate">WIX_UPGRADE_DETECTED</Custom> </InstallExecuteSequence> </Product> </Wix> |