Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/installer
diff options
context:
space:
mode:
Diffstat (limited to 'installer')
-rw-r--r--installer/Files.wxs129
-rw-r--r--installer/Product.wxs41
-rw-r--r--installer/Settings.wxi4
3 files changed, 115 insertions, 59 deletions
diff --git a/installer/Files.wxs b/installer/Files.wxs
index 1becd1355..d25e09ab6 100644
--- a/installer/Files.wxs
+++ b/installer/Files.wxs
@@ -2,31 +2,14 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?include "Settings.wxi" ?>
- <!-- Mumble -->
+ <!-- Mumble Version Specific -->
<Fragment>
- <DirectoryRef Id="INSTALLDIR">
- <Component Id="MumbleDesktopShortcutComponent" Guid="$(var.MumbleDesktopShortcutGuid)" KeyPath="yes">
- <Shortcut Id="MumbleDesktopShortcut"
- Directory="DesktopFolder"
- Name="Mumble"
- WorkingDirectory="INSTALLDIR"
- Target="[INSTALLDIR]mumble.exe">
- <ShortcutProperty Key="System.AppUserModel.ID" Value="net.sourceforge.mumble.Mumble" />
- </Shortcut>
- </Component>
-
- <Component Id="mumble.exe" Guid="$(var.MumbleExeGuid)">
- <File Id="mumble.exe" Source="$(var.SourceDir)\release\mumble.exe" KeyPath="yes">
- <Shortcut Id="MumbleShortcut" Directory="ApplicationProgramsFolder" Name="Mumble" WorkingDirectory="INSTALLDIR">
- <ShortcutProperty Key="System.AppUserModel.ID" Value="net.sourceforge.mumble.Mumble" />
- </Shortcut>
- </File>
+ <?ifdef VersionSubDir ?>
+ <DirectoryRef Id="VersionFolder">
+ <?else ?>
+ <DirectoryRef Id="INSTALLDIR">
+ <?endif ?>
- <RegistryValue Root="HKCR" Key="mumble" Value="URL:Mumble" Type="string" />
- <RegistryValue Root="HKCR" Key="mumble" Name="URL Protocol" Value="" Type="string" />
- <RegistryValue Root="HKCR" Key="mumble\DefaultIcon" Value="[#mumble.exe]" Type="string" />
- <RegistryValue Root="HKCR" Key="mumble\shell\open\command" Value="[#mumble.exe] &quot;%1&quot;" Type="string" />
- </Component>
<?ifdef StaticBuild ?>
<Component Id="mumble_app.dll">
<File Source="$(var.SourceDir)\release\mumble_app.dll" KeyPath="yes" />
@@ -85,6 +68,61 @@
</Component>
<?endif ?>
+ <?ifdef RedistDirVC12 ?>
+ <Component Id="msvcp120.dll">
+ <File Source="$(var.RedistDirVC12)\msvcp120.dll" KeyPath="yes" />
+ </Component>
+ <Component Id="msvcr120.dll">
+ <File Source="$(var.RedistDirVC12)\msvcr120.dll" KeyPath="yes" />
+ </Component>
+ <?endif ?>
+
+ <Component Id="dbghelp.dll">
+ <File Source="$(var.DebugToolsDir)\dbghelp.dll" KeyPath="yes" />
+ </Component>
+
+ <?ifdef D3DCompilerDLL ?>
+ <Component Id="d3dcompiler_43.dll">
+ <File Source="$(var.System32x86Dir)\d3dcompiler_43.dll" KeyPath="yes" />
+ </Component>
+ <Component Id="d3dcompiler_47.dll">
+ <File Source="$(var.Win81SDKDir)\Redist\D3D\x64\d3dcompiler_47.dll" KeyPath="yes" />
+ </Component>
+ <?endif ?>
+
+ <?ifdef VersionSubDir ?>
+ </DirectoryRef>
+ <?else ?>
+ </DirectoryRef>
+ <?endif ?>
+ </Fragment>
+
+ <!-- Mumble -->
+ <Fragment>
+ <DirectoryRef Id="INSTALLDIR">
+ <Component Id="MumbleDesktopShortcutComponent" Guid="$(var.MumbleDesktopShortcutGuid)" KeyPath="yes">
+ <Shortcut Id="MumbleDesktopShortcut"
+ Directory="DesktopFolder"
+ Name="Mumble"
+ WorkingDirectory="INSTALLDIR"
+ Target="[INSTALLDIR]mumble.exe">
+ <ShortcutProperty Key="System.AppUserModel.ID" Value="net.sourceforge.mumble.Mumble" />
+ </Shortcut>
+ </Component>
+
+ <Component Id="mumble.exe" Guid="$(var.MumbleExeGuid)">
+ <File Id="mumble.exe" Source="$(var.SourceDir)\release\mumble.exe" KeyPath="yes">
+ <Shortcut Id="MumbleShortcut" Directory="ApplicationProgramsFolder" Name="Mumble" WorkingDirectory="INSTALLDIR">
+ <ShortcutProperty Key="System.AppUserModel.ID" Value="net.sourceforge.mumble.Mumble" />
+ </Shortcut>
+ </File>
+
+ <RegistryValue Root="HKCR" Key="mumble" Value="URL:Mumble" Type="string" />
+ <RegistryValue Root="HKCR" Key="mumble" Name="URL Protocol" Value="" Type="string" />
+ <RegistryValue Root="HKCR" Key="mumble\DefaultIcon" Value="[#mumble.exe]" Type="string" />
+ <RegistryValue Root="HKCR" Key="mumble\shell\open\command" Value="[#mumble.exe] &quot;%1&quot;" Type="string" />
+ </Component>
+
<Component Id="MurmurDesktopShortcutComponent" Guid="$(var.MurmurDesktopShortcutGuid)" KeyPath="yes">
<Shortcut Id="MurmurDesktopShortcut"
Directory="DesktopFolder"
@@ -107,6 +145,20 @@
<File Source="$(var.SourceDir)\src\murmur\Murmur.ice" KeyPath="yes" />
</Component>
+ <?ifdef VersionSubDir ?>
+ <?ifdef RedistDirVC12 ?>
+ <Component Id="Murmur_msvcp120.dll">
+ <File Id="Murmur_msvcp120.dll" Source="$(var.RedistDirVC12)\msvcp120.dll" KeyPath="yes" />
+ </Component>
+ <Component Id="Murmur_msvcr120.dll">
+ <File Id="Murmur_msvcr120.dll" Source="$(var.RedistDirVC12)\msvcr120.dll" KeyPath="yes" />
+ </Component>
+ <?endif ?>
+ <Component Id="Murmur_dbghelp.dll">
+ <File Id="Murmur_dbghelp.dll" Source="$(var.DebugToolsDir)\dbghelp.dll" KeyPath="yes" />
+ </Component>
+ <?endif ?>
+
<?ifndef StaticBuild ?>
<Component Id="qt.conf">
<File Source="$(var.SourceDir)\scripts\qt.conf" KeyPath="yes" />
@@ -129,33 +181,12 @@
<File Source="$(var.SourceDir)\installer\qt.txt" KeyPath="yes" />
</Component>
- <Component Id="dbghelp.dll">
- <File Source="$(var.DebugToolsDir)\dbghelp.dll" KeyPath="yes" />
- </Component>
-
<?ifdef IntelCppDir ?>
<Component Id="libmmd.dll">
<File Source="$(var.IntelCppDir)\libmmd.dll" KeyPath="yes" />
</Component>
<?endif ?>
- <?ifdef RedistDirVC12 ?>
- <Component Id="msvcp120.dll">
- <File Source="$(var.RedistDirVC12)\msvcp120.dll" KeyPath="yes" />
- </Component>
- <Component Id="msvcr120.dll">
- <File Source="$(var.RedistDirVC12)\msvcr120.dll" KeyPath="yes" />
- </Component>
- <?endif ?>
-
- <?ifdef D3DCompilerDLL ?>
- <Component Id="d3dcompiler_43.dll">
- <File Source="$(var.System32x86Dir)\d3dcompiler_43.dll" KeyPath="yes" />
- </Component>
- <Component Id="d3dcompiler_47.dll">
- <File Source="$(var.Win81SDKDir)\Redist\D3D\x64\d3dcompiler_47.dll" KeyPath="yes" />
- </Component>
- <?endif ?>
</DirectoryRef>
</Fragment>
@@ -364,7 +395,15 @@
<!-- Directory tree -->
<Fragment>
<DirectoryRef Id="INSTALLDIR">
- <Directory Id="PluginFolder" Name="plugins" />
+ <?ifdef VersionSubDir ?>
+ <Directory Id="VersionContainerFolder" Name="Versions">
+ <Directory Id="VersionFolder" Name="$(var.VersionSubDir)">
+ <Directory Id="PluginFolder" Name="plugins" />
+ </Directory>
+ </Directory>
+ <?else ?>
+ <Directory Id="PluginFolder" Name="plugins" />
+ <?endif ?>
<?ifndef StaticBuild ?>
<Directory Id="QtPluginFolder" Name="QtPlugins">
<Directory Id="QtPluginIconEnginesFolder" Name="iconengines" />
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>
diff --git a/installer/Settings.wxi b/installer/Settings.wxi
index 4d9dc8e43..07a45607b 100644
--- a/installer/Settings.wxi
+++ b/installer/Settings.wxi
@@ -155,4 +155,8 @@
<?define D3DCompilerDLL = true ?>
<?endif ?>
+ <?ifdef env.MumbleVersionSubDir ?>
+ <?define VersionSubDir = "$(env.MumbleVersionSubDir)" ?>
+ <?endif ?>
+
</Include>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-01 11:36:00 +0300