diff --git a/.ci/azure-pipelines/build_windows.bat b/.ci/azure-pipelines/build_windows.bat index 6e4a3d66c..70e8a08c5 100644 --- a/.ci/azure-pipelines/build_windows.bat +++ b/.ci/azure-pipelines/build_windows.bat @@ -19,8 +19,7 @@ :: AGENT_TOOLSDIRECTORY - The directory used by tasks such as :: Node Tool Installer and Use Python Version :: to switch between multiple versions of a tool. -:: We store our build environment there, in the -:: folder specified by MUMBLE_ENVIRONMENT_DIR. +:: We store Wix# there, in "WixSharp". :: :: Defined in .azure-pipelines.yml: :: @@ -40,6 +39,8 @@ cd /d %BUILD_BINARIESDIRECTORY% call "%VCVARS_PATH%" +set PATH=%PATH%;%AGENT_TOOLSDIRECTORY%\WixSharp + :: Delete MinGW, otherwise CMake picks it over MSVC. :: We don't delete the (Chocolatey) packages because it takes ~10 minutes... del C:\ProgramData\chocolatey\bin\gcc.exe @@ -77,3 +78,10 @@ cmake --install . if errorlevel 1 ( exit /b %errorlevel% ) + +copy installer\client\mumble_client*.msi %BUILD_ARTIFACTSTAGINGDIRECTORY% + +copy installer\server\mumble_server*.msi %BUILD_ARTIFACTSTAGINGDIRECTORY% + +7z a PDBs.7z *.pdb +copy PDBs.7z %BUILD_ARTIFACTSTAGINGDIRECTORY% diff --git a/.ci/azure-pipelines/install-environment_windows.ps1 b/.ci/azure-pipelines/install-environment_windows.ps1 index 513705986..885b484bf 100644 --- a/.ci/azure-pipelines/install-environment_windows.ps1 +++ b/.ci/azure-pipelines/install-environment_windows.ps1 @@ -17,8 +17,7 @@ # AGENT_TOOLSDIRECTORY - The directory used by tasks such as # Node Tool Installer and Use Python Version # to switch between multiple versions of a tool. -# We store our build environment there, in the -# folder specified by MUMBLE_ENVIRONMENT_DIR. +# We store Wix# there, in "WixSharp". # # Defined in .azure-pipelines.yml: # @@ -83,3 +82,14 @@ try { Write-Host "Failed to download G15 SDK: $PSItem" exit 1 } + +Write-Host "Downloading WixSharp..." + +try { + Invoke-WebRequest -Uri "https://github.com/oleg-shilo/wixsharp/releases/download/v1.15.0.0/WixSharp.1.15.0.0.7z" -OutFile "WixSharp.1.15.0.0.7z" +} catch { + Write-Host "Failed to download WixSharp : $PSItem" + exit 1 +} +Write-Host "Exracting WixSharp to $env:AGENT_TOOLSDIRECTORY/WixSharp..." +7z x "WixSharp.1.15.0.0.7z" -o"$env:AGENT_TOOLSDIRECTORY/WixSharp" diff --git a/.ci/azure-pipelines/steps_windows.yml b/.ci/azure-pipelines/steps_windows.yml index b2e6012d0..230b4d4de 100644 --- a/.ci/azure-pipelines/steps_windows.yml +++ b/.ci/azure-pipelines/steps_windows.yml @@ -5,14 +5,6 @@ steps: displayName: 'Install build environment' - script: .ci/azure-pipelines/build_windows.bat displayName: 'Build' - - powershell: | - cd $(Build.BinariesDirectory) - .\Create-Win32InstallerMUI.ps1 -PackageName 'Mumble_${{parameters.arch}}' -Version '1.4.0' - cp *.sha* $(Build.ArtifactStagingDirectory) - cp *.msi $(Build.ArtifactStagingDirectory) - 7z a PDBs.7z *.pdb - cp PDBs.7z $(Build.ArtifactStagingDirectory) - displayName: Build installer - template: task-publish-artifacts.yml parameters: name: 'Windows (${{parameters.arch}}) installer' diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b7af9623..a1b33b29e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,9 +63,9 @@ include(compiler) include(os) if (64_BIT) - set(ARCH "64bit") + set(ARCH "x64") else() - set(ARCH "32bit") + set(ARCH "x86") endif() message(STATUS "##################################################") @@ -120,9 +120,29 @@ if(plugins AND client) endif() if(packaging) + file(COPY + ${CMAKE_SOURCE_DIR}/installer/gpl.txt + ${CMAKE_SOURCE_DIR}/installer/lgpl.txt + ${CMAKE_SOURCE_DIR}/installer/Mumble.rtf + ${CMAKE_SOURCE_DIR}/installer/portaudio.txt + ${CMAKE_SOURCE_DIR}/installer/qt.txt + ${CMAKE_SOURCE_DIR}/installer/speex.txt + DESTINATION + ${CMAKE_BINARY_DIR}/licenses + ) if(WIN32) - file(COPY "${CMAKE_SOURCE_DIR}/scripts/Create-Win32InstallerMUI.ps1" DESTINATION ${CMAKE_BINARY_DIR}) + file(COPY + ${CMAKE_SOURCE_DIR}/installer/bannrbmp.bmp + ${CMAKE_SOURCE_DIR}/installer/dlgbmp.bmp + DESTINATION + ${CMAKE_BINARY_DIR}/installer + ) + + file(COPY + ${CMAKE_SOURCE_DIR}/icons/mumble.ico + ${CMAKE_SOURCE_DIR}/icons/murmur.ico + DESTINATION + ${CMAKE_BINARY_DIR}/installer/icons + ) endif() - - include(cmake/packaging.cmake) endif() diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake deleted file mode 100644 index 4b2f8ad4d..000000000 --- a/cmake/packaging.cmake +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 2020 The Mumble Developers. All rights reserved. -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file at the root of the -# Mumble source tree or at . - -if(WIN32) - set(CPACK_GENERATOR WIX) - - if(64_BIT) - set(CPACK_WIX_UPGRADE_GUID "E028BDFC-3FE2-4BEE-A33B-EB9C80611555") - elseif(32_BIT) - set(CPACK_WIX_UPGRADE_GUID "B0EEFCC7-8A9C-4471-AB10-CBD35BE3161D") - endif() - - set(CPACK_WIX_CULTURES "en-us") - set(CPACK_WIX_LCID "1033") - set(CPACK_WIX_UI_BANNER "${CMAKE_SOURCE_DIR}/installer/bannrbmp.bmp") - set(CPACK_WIX_UI_DIALOG "${CMAKE_SOURCE_DIR}/installer/dlgbmp.bmp") - set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/icons/mumble.ico") - set(CPACK_WIX_EXTENSIONS "WiXUtilExtension") - set(CPACK_WIX_TEMPLATE "wix-template.xml") -endif() - -set(CPACK_PACKAGE_EXECUTABLES "mumble;Mumble" "murmur;Murmur") -set(CPACK_CREATE_DESKTOP_LINKS "mumble;Mumble" "murmur;Murmur") -set(CPACK_PACKAGE_INSTALL_DIRECTORY "Mumble") - -if(client) - set(CPACK_PACKAGE_NAME "Mumble (client)") - set(CPACK_PACKAGE_FILE_NAME "mumble_client-${version}") - set(CPACK_PACKAGE_VENDOR "Mumble VoIP") - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mumble is a free, open source, low latency, high quality voice chat application.") - set(CPACK_PACKAGE_HOMEPAGE_URL "https://mumble.info") - set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/installer/gpl.rtf") - set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md") - set(CPACK_COMPONENTS_ALL mumble_client) - set(CPACK_COMPONENT_MUMBLE_CLIENT_DISPLAY_NAME "Client") - set(CPACK_COMPONENT_MUMBLE_CLIENT_DESCRIPTION "The Mumble VoIP Client") - #set(CPACK_WIX_PATCH_FILE "${CMAKE_SOURCE_DIR}/installer/client-shortcuts.xml") - set(CPACK_COMPONENT_MUMBLE_CLIENT_REQUIRED ON) - - install(FILES - "${CMAKE_SOURCE_DIR}/CHANGES" - "${CMAKE_SOURCE_DIR}/installer/gpl.txt" - "${CMAKE_SOURCE_DIR}/installer/qt.txt" - "${CMAKE_SOURCE_DIR}/installer/speex.txt" - DESTINATION "${MUMBLE_INSTALL_LICENSEDIR}" - COMPONENT mumble_client - ) -endif() - -if(server) - if(NOT client) - if(WIN32) - set(CPACK_WIX_UPGRADE_GUID "03E9476F-0F75-4661-BFC9-A9DAEB23D3A0") - endif() - - set(CPACK_PACKAGE_NAME "Mumble (server)") - set(CPACK_PACKAGE_FILE_NAME "mumble_server-${version}") - set(CPACK_PACKAGE_VENDOR "Mumble VoIP") - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mumble is a free, open source, low latency, high quality voice chat application.") - set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/installer/gpl.rtf") - set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README") - set(CPACK_COMPONENT_MUMBLE_SERVER_REQUIRED ON) - - install(FILES - "${CMAKE_SOURCE_DIR}/CHANGES" - "${CMAKE_SOURCE_DIR}/installer/gpl.txt" - "${CMAKE_SOURCE_DIR}/installer/qt.txt" - DESTINATION "${MUMBLE_INSTALL_LICENSEDIR}" - COMPONENT mumble_server - ) - endif() - - set(CPACK_COMPONENTS_ALL mumble_server) - set(CPACK_COMPONENT_MUMBLE_SERVER_DISPLAY_NAME "Server") - set(CPACK_COMPONENT_MUMBLE_SERVER_DESCRIPTION "The Mumble VoIP Server") - #set(CPACK_WIX_PATCH_FILE "${CMAKE_SOURCE_DIR}/installer/server-shortcuts.xml") - - install(FILES "${CMAKE_SOURCE_DIR}/scripts/murmur.ini" DESTINATION "${MUMBLE_INSTALL_EXECUTABLEDIR}" COMPONENT mumble_server) -endif() - -if(client AND server) - if(WIN32) - set(CPACK_PACKAGE_NAME "Mumble") - set(CPACK_PACKAGE_FILE_NAME "Mumble-${version}") - set(CPACK_PACKAGE_VENDOR "Mumble VoIP") - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mumble is a free, open source, low latency, high quality voice chat application.") - set(CPACK_COMPONENT_MUMBLE_SERVER_DISABLED ON) - # set(CPACK_WIX_PATCH_FILE - # "${CMAKE_SOURCE_DIR}/installer/client-shortcuts.xml" - # "${CMAKE_SOURCE_DIR}/installer/server-shortcuts.xml" - # ) - endif() - - set(CPACK_COMPONENTS_ALL mumble_client mumble_server) -endif() - -if(WIN32) - configure_file("${CMAKE_SOURCE_DIR}/installer/wix-template.xml" ${CMAKE_CURRENT_BINARY_DIR}) -endif() - -include(CPack) diff --git a/installer/ClientInstaller.cs b/installer/ClientInstaller.cs new file mode 100644 index 000000000..918345cdb --- /dev/null +++ b/installer/ClientInstaller.cs @@ -0,0 +1,202 @@ +// Copyright 2020 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at . + +//css_ref MumbleInstall.dll +//css_ref Wix_bin\SDK\Microsoft.Deployment.WindowsInstaller.dll; + +using System; +using System.Text.RegularExpressions; +using System.Windows.Forms; +using Microsoft.Deployment.WindowsInstaller; +using WixSharp; +using WixSharp.CommonTasks; + +public class ClientInstaller : MumbleInstall { + public ClientInstaller(string version, string arch) { + string upgradeGuid = "D269FC55-4F2C-4285-9AA9-4D034AF305C4"; + string[] binaries = null; + string[] plugins = { + "amongus.dll", + "aoc.dll", + "arma2.dll", + "bf1.dll", + "bf2.dll", + "bf3.dll", + "bf4.dll", + "bf4_x86.dll", + "bf1942.dll", + "bf2142.dll", + "bfbc2.dll", + "bfheroes.dll", + "blacklight.dll", + "borderlands.dll", + "borderlands2.dll", + "breach.dll", + "cod2.dll", + "cod4.dll", + "cod5.dll", + "codmw2.dll", + "codmw2so.dll", + "cs.dll", + "dys.dll", + "etqw.dll", + "ffxiv.dll", + "ffxiv_x64.dll", + "gmod.dll", + "gtaiv.dll", + "gtasa.dll", + "gtav.dll", + "gw.dll", + "insurgency.dll", + "jc2.dll", + "link.dll", + "lol.dll", + "lotro.dll", + "ql.dll", + "rl.dll", + "se.dll", + "sr.dll", + "ut3.dll", + "ut99.dll", + "ut2004.dll", + "wolfet.dll", + "wow.dll", + "wow_x64.dll" + }; + + string[] licenses = { + "qt.txt", + "portaudio.txt", + "gpl.txt", + "speex.txt", + "lgpl.txt", + "Mumble.rtf" + }; + + if (arch == "x64") { + // 64 bit + this.Platform = WixSharp.Platform.x64; + binaries = new string[] { + "celt0.0.7.0.dll", + "opus.dll", + "rnnoise.dll", + "speex.dll", + "mumble.exe", + "mumble_app.dll", + "mumble_ol.dll", + "mumble_ol_helper.exe", + "mumble_ol_helper_x64.exe", + "mumble_ol_x64.dll" + }; + } else if (arch == "x86") { + // 32 bit + this.Platform = WixSharp.Platform.x86; + binaries = new string[] { + "celt0.0.7.0.dll", + "opus.dll", + "rnnoise.dll", + "speex.dll", + "mumble.exe", + "mumble_app.dll", + "mumble_ol.dll", + "mumble_ol_helper.exe" + }; + } + + this.Name = "Mumble (client)"; + this.UpgradeCode = Guid.Parse(upgradeGuid); + this.Version = new Version(version); + this.OutFileName = "mumble_client-" + this.Version + "-" + arch; + + var progsDir = new Dir(@"%ProgramFiles%"); + var productDir = new Dir("Mumble"); + var installDir = new Dir("client"); + var pluginDir = new Dir("plugins"); + var licenseDir = new Dir("licenses"); + var menuDir = new Dir(@"%ProgramMenu%"); + var desktopDir = new Dir(@"%Desktop%"); + var shortcutDir = new Dir("Mumble"); + var menuShortcut = new ExeFileShortcut("Mumble", "[INSTALLDIR]mumble.exe", arguments: ""); + var deskShortcut = new ExeFileShortcut("Mumble", "[INSTALLDIR]mumble.exe", arguments: ""); + + deskShortcut.IconFile = @"..\icons\mumble.ico"; + menuShortcut.IconFile = @"..\icons\mumble.ico"; + + shortcutDir.Shortcuts = new ExeFileShortcut[] { menuShortcut }; + desktopDir.Shortcuts = new ExeFileShortcut[] { deskShortcut }; + + var binaryFiles = new File[binaries.Length]; + var licenseFiles = new File[licenses.Length]; + var pluginFiles = new File[plugins.Length]; + + for (int i = 0; i < binaries.Length; i++) { + binaryFiles[i] = new File(@"..\..\" + binaries[i]); + } + + for (int i = 0; i < licenses.Length; i++) { + licenseFiles[i] = new File(@"..\..\licenses\" + licenses[i]); + } + + for (int i = 0; i < plugins.Length; i++) { + pluginFiles[i] = new File(@"..\..\plugins\" + plugins[i]); + } + + installDir.Files = binaryFiles; + licenseDir.Files = licenseFiles; + pluginDir.Files = pluginFiles; + + menuDir.Dirs = new Dir[] { shortcutDir }; + installDir.Dirs = new Dir[] { licenseDir, pluginDir }; + productDir.Dirs = new Dir[] { installDir }; + progsDir.Dirs = new Dir[] { productDir}; + + this.Dirs = new Dir[] { + progsDir, + menuDir, + desktopDir + }; + } +} + +public class CustomActions +{ + [CustomAction] + public static ActionResult InstallDeskShortcut(Session session) { + if (DialogResult.Yes == MessageBox.Show("Would you like to create a shortcut on the Desktop?", "Desktop Shortcut", MessageBoxButtons.YesNo)) { + session["INSTALLDESKTOPSHORTCUT"] = "yes"; + } + return ActionResult.Success; + } +} + +class BuildInstaller +{ + public static void Main(string[] args) { + string version = ""; + string arch = ""; + bool isAllLangs = false; + + for (int i = 0; i < args.Length; i++) { + if (args[i] == "--version" && Regex.Match(args[i + 1], @"^\d+$.^\d+$.^\d+$", RegexOptions.None) != null) { + version = args[i + 1]; + } + + if (args[i] == "--arch" && (args[i + 1] == "x64" || args[i + 1] == "x86")) { + arch = args[i + 1]; + } + + if (args[i] == "--all-languages") { + isAllLangs = true; + } + } + + var clInstaller = new ClientInstaller(version, arch); + if (isAllLangs) { + clInstaller.BuildMultilanguageMsi(); + } else { + clInstaller.BuildMsi(); + } + } +} diff --git a/installer/Files.wxs b/installer/Files.wxs deleted file mode 100644 index 315ba3bed..000000000 --- a/installer/Files.wxs +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/Mumble.rtf b/installer/Mumble.rtf new file mode 100644 index 000000000..15e14336c Binary files /dev/null and b/installer/Mumble.rtf differ diff --git a/installer/MumbleInstall.cs b/installer/MumbleInstall.cs new file mode 100644 index 000000000..2e58233a8 --- /dev/null +++ b/installer/MumbleInstall.cs @@ -0,0 +1,27 @@ +// Copyright 2020 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at . + +using System; +using WixSharp; + +// base class with info across installers +public class MumbleInstall : Project { + public MumbleInstall() { + var allUsersProp = new Property("ALLUSERS", "1"); + this.Language = "en-US,cs-CZ,da-DK,de-DE,el-GR,es-ES,fi-FI,fr-FR,it-IT,ja-JP,nb-NO,nl-NL,pl-PL,pt-PT,ru-RU,sv-SE,tr-TR,zh-CN,zh-TW"; + this.MajorUpgradeStrategy = MajorUpgradeStrategy.Default; + this.MajorUpgradeStrategy.RemoveExistingProductAfter = Step.InstallInitialize; + this.PreserveTempFiles = true; + this.BackgroundImage = @"..\dlgbmp.bmp"; + this.BannerImage = @"..\bannrbmp.bmp"; + this.LicenceFile = @"..\..\licenses\Mumble.rtf"; + this.UI = WUI.WixUI_Minimal; + this.ControlPanelInfo.Comments = "Mumble is a free, open source, low latency, high quality voice chat application."; + this.ControlPanelInfo.Manufacturer = "Mumble VoIP"; + this.ControlPanelInfo.ProductIcon = @"..\icons\mumble.ico"; + this.ControlPanelInfo.UrlInfoAbout = "https://mumble.info"; + this.Properties = new Property[] { allUsersProp }; + } +} diff --git a/installer/MumbleInstall.sln b/installer/MumbleInstall.sln deleted file mode 100644 index 6491f4ca1..000000000 --- a/installer/MumbleInstall.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MumbleInstall", "MumbleInstall.wixproj", "{84AFEA8B-15E5-4CC7-B77D-27DD17030944}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Debug|x64.ActiveCfg = Debug|x86 - {84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Debug|x86.ActiveCfg = Debug|x86 - {84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Debug|x86.Build.0 = Debug|x86 - {84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Release|x64.ActiveCfg = Release|x64 - {84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Release|x64.Build.0 = Release|x64 - {84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Release|x86.ActiveCfg = Release|x86 - {84AFEA8B-15E5-4CC7-B77D-27DD17030944}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/installer/MumbleInstall.wixproj b/installer/MumbleInstall.wixproj deleted file mode 100644 index b25850c9c..000000000 --- a/installer/MumbleInstall.wixproj +++ /dev/null @@ -1,105 +0,0 @@ - - - - $(MUMBLE_PREFIX)\wix\ - $(WixToolPath)Wix.targets - $(WixToolPath)wixtasks.dll - - - Debug - x86 - 3.5 - {84afea8b-15e5-4cc7-b77d-27dd17030944} - 2.0 - Mumble - Package - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - - - bin\$(Configuration)\ - obj\$(Configuration)\ - Debug - - - en-us - ICE43;ICE57 - - - bin\$(Configuration)\ - obj\$(Configuration)\ - - - -cc obj -reusecab - True - True - - - Debug - - en-us - ICE43;ICE57 - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - - - - -cc obj -reusecab - True - True - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WIX)\bin\WixUIExtension.dll - WixUIExtension - - - - - \ No newline at end of file diff --git a/installer/MumbleUCRTComponentRefs.wxi b/installer/MumbleUCRTComponentRefs.wxi deleted file mode 100644 index 70dcbcb12..000000000 --- a/installer/MumbleUCRTComponentRefs.wxi +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/MumbleUCRTComponents.wxi b/installer/MumbleUCRTComponents.wxi deleted file mode 100644 index 083f88ae2..000000000 --- a/installer/MumbleUCRTComponents.wxi +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/MurmurUCRTComponentRefs.wxi b/installer/MurmurUCRTComponentRefs.wxi deleted file mode 100644 index cf5280e73..000000000 --- a/installer/MurmurUCRTComponentRefs.wxi +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/MurmurUCRTComponents.wxi b/installer/MurmurUCRTComponents.wxi deleted file mode 100644 index 775c83f00..000000000 --- a/installer/MurmurUCRTComponents.wxi +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/Plugins.wxs b/installer/Plugins.wxs deleted file mode 100644 index d6d4c1be1..000000000 --- a/installer/Plugins.wxs +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/Product.wxs b/installer/Product.wxs deleted file mode 100644 index eff00b411..000000000 --- a/installer/Product.wxs +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - Uninstalling old version - - - - - - - - LAUNCHAPPONEXIT - - - - - - - - VersionNT > 501 OR (VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 1) - - - - - - - - - - - - - - mumble.ico - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NOT Installed AND NSISINSTALL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSISINSTALL - NSISINSTALL AND NOT Installed - WIX_UPGRADE_DETECTED - - - diff --git a/installer/ServerInstaller.cs b/installer/ServerInstaller.cs new file mode 100644 index 000000000..ff40f7008 --- /dev/null +++ b/installer/ServerInstaller.cs @@ -0,0 +1,110 @@ +// Copyright 2020 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at . + +//css_ref MumbleInstall.dll +//css_ref Wix_bin\SDK\Microsoft.Deployment.WindowsInstaller.dll; + +using System; +using System.Text.RegularExpressions; +using Microsoft.Deployment.WindowsInstaller; +using WixSharp; +using WixSharp.CommonTasks; + +public class ServerInstaller : MumbleInstall { + public ServerInstaller(string version, string arch) { + string upgradeGuid = "03E9476F-0F75-4661-BFC9-A9DAEB23D3A0"; + string[] binaries = { + "murmur.exe", + "murmur.ini", + "Murmur.ice" + }; + + string[] licenses = { + "qt.txt", + "gpl.txt", + "speex.txt", + "lgpl.txt", + "Mumble.rtf" + }; + + if (arch == "x64") { + // 64 bit + this.Platform = WixSharp.Platform.x64; + + } else if (arch == "x86") { + // 32 bit + this.Platform = WixSharp.Platform.x86; + } + + this.Name = "Mumble (server)"; + this.UpgradeCode = Guid.Parse(upgradeGuid); + this.Version = new Version(version); + this.OutFileName = "mumble_server-" + this.Version + "-" + arch; + + var progsDir = new Dir(@"%ProgramFiles%"); + var productDir = new Dir("Mumble"); + var installDir = new Dir("server"); + var licenseDir = new Dir("licenses"); + var menuDir = new Dir(@"%ProgramMenu%"); + var shortcutDir = new Dir("Mumble"); + var menuShortcut = new ExeFileShortcut("Murmur", "[INSTALLDIR]murmur.exe", arguments: ""); + menuShortcut.IconFile = @"..\icons\murmur.ico"; + shortcutDir.Shortcuts = new ExeFileShortcut[] { menuShortcut }; + + var binaryFiles = new File[binaries.Length]; + var licenseFiles = new File[licenses.Length]; + + for (int i = 0; i < binaries.Length; i++) { + binaryFiles[i] = new File(@"..\..\" + binaries[i]); + } + + for (int i = 0; i < licenses.Length; i++) { + licenseFiles[i] = new File(@"..\..\licenses\" + licenses[i]); + } + + installDir.Files = binaryFiles; + licenseDir.Files = licenseFiles; + + menuDir.Dirs = new Dir[] { shortcutDir }; + installDir.Dirs = new Dir[] { licenseDir }; + productDir.Dirs = new Dir[] { installDir }; + progsDir.Dirs = new Dir[] { productDir }; + + this.Dirs = new Dir[] { + progsDir, + menuDir + }; + } +} + +class BuildInstaller +{ + public static void Main(string[] args) { + string version = ""; + string arch = ""; + bool isAllLangs = false; + + for (int i = 0; i < args.Length; i++) { + if (args[i] == "--version" && Regex.Match(args[i + 1], @"^\d+$.^\d+$.^\d+$", RegexOptions.None) != null) { + version = args[i + 1]; + } + + if (args[i] == "--arch" && (args[i + 1] == "x64" || args[i + 1] == "x86")) { + arch = args[i + 1]; + } + + if (args[i] == "--all-languages") { + isAllLangs = true; + } + } + + var srvInstaller = new ServerInstaller(version, arch); + if (isAllLangs) { + srvInstaller.BuildMultilanguageMsi(); + } else { + srvInstaller.BuildMsi(); + } + } +} diff --git a/installer/Settings.wxi b/installer/Settings.wxi deleted file mode 100644 index 918d0e3dd..000000000 --- a/installer/Settings.wxi +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/Translations/Czech.wxl b/installer/Translations/Czech.wxl deleted file mode 100644 index 3afe1c385..000000000 --- a/installer/Translations/Czech.wxl +++ /dev/null @@ -1,54 +0,0 @@ - - - 1029 - - - Vytvořit zástupce na ploše - Přispět na projekt Mumble - DBus daemon,který Mumble používá je právě spuštěn. Ukončit daemon aby mohl být aktualizován? - Mumble potřebuje SSE, což je funkce processorů Intel Pentium III, AMD Athlon XP nebo novějších. SSE nebylo nalezeno na vašem processoru, a Mumble asi nebude fungovat. Chcete i přes to nainstalovat Mumble? - Mumble bude fungovat jen na Windows XP SP2 nebo novějších. Byl nalezen starši, nebo nekompatibilní operační systém, a Mumble asi nebude fungovat. Chcete i přes to nainstalovat Mumble? - Spustit Mumble - - - Mumble Čti Mě - Mumble Licence - Qt Licence - Speex Licence - Odninstalovat Mumble - Mumble (Zpětně Kompatibilní) - - - Plná instalace - Jen Klient - Jen Server - - - Mumble (klient) - Mumble (zpětně kompatibilní klient) - Murmur (server) - Bonjour pro Windows - Mumble klient, je potřeba k připojení na server. - Mumble klient k připojení na starší servery. - Server pro Mumble. Obsahuje všechno co je třeba k rozběhnutí vlastního serveru. - Bonjour zapne ohlášení a zpřístupění Murmur serverů na vaší LAN. Toto stáhne a spustí Bonjour instalátor. - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - - - Mumble a Murmur - Nastavení a Databáze - Odinstalování programů Mumble a Murmur. - Odinstaluje všechny stopy po Mumble a Murmur, včetně nastavení a databází. - - - Mumble je již nainstalováno. Je doporučena odinstalace stávájící verze před instalováním nové. Vyberte operaci kterou chcete uskutečnit a stiskněte Další. - Již Nainstalováno - Zvolte, jak chcete odinstalovat Mumble. - Odinstalovat před instalací - Neodinstalovat - diff --git a/installer/Translations/Danish.wxl b/installer/Translations/Danish.wxl deleted file mode 100644 index 40d2e35b4..000000000 --- a/installer/Translations/Danish.wxl +++ /dev/null @@ -1,51 +0,0 @@ - - - 1030 - - Opret genvej på skrivebordet - Donér til Mumble projektet - DBus-dæmonen, som Mumble bruger, kører i øjeblikket. Afslut dæmonen så den kan blive opdateret? - Mumble kræver SSE, som er en funktion, der kun er tilgængelig på Intel Pentium III, AMD Athlon XP og nyere processorer. SSE blev ikke detekteret på din processor, og derfor vil Mumble sansynligvis ikke fungere. Ønsker du stadig at installere Mumble? - Mumble vil kun virke på Windows XP SP2 eller nyere. Et ældre og ikke kompatibelt operativsystem blev detekteret, og derfor vil Mumble sansynligvis ikke fungere. Ønsker du stadig at installere Mumble? - Start Mumble - - - Mumble Læsmig - Mumble Licens - Qt Licens - Speex Licens - Afinstaller Mumble - Mumble (Bagudkompatibel) - - - Fuld - Kun klient - Kun server - - - Mumble (klient) - Mumble (Bagudkompatibel klient) - Murmur (server) - Bonjour for Windows - Mumble-klienten, som du behøver for at kunne oprette forbindelse til en server. - Mumble-klienten til at oprette forbindelse til ældre servere. - Serveren for Mumble. Inkluderer alt hvad der er nødvendigt for at køre din egen server. - Bonjour annoncerer og opdager Murmur-servere på dit LAN-netværk. Dette vil downloade og køre Bonjour-installationsprogrammet. - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble og Murmur - Indstillinger og databaser - Afinstallerer Mumble og Murmur programmerne - Afinstallerer alle spor af Mumble og Murmur, inklusiv indstillinger og databaser. - - - Mumble er allerede installeret. Det anbefales at du først afinstallerer den nuværende version, før du installerer. Vælg operationen du ønsker at udføre og klik Næste for at fortsætte. - Allerede installeret - Vælg hvordan du vil installere Mumble. - Afinstaller før installering - Afinstaller ikke - diff --git a/installer/Translations/Dutch.wxl b/installer/Translations/Dutch.wxl deleted file mode 100644 index 646330ed7..000000000 --- a/installer/Translations/Dutch.wxl +++ /dev/null @@ -1,52 +0,0 @@ - - - 1043 - - - Maak bureaublad snelkoppeling aan - Donateer aan het Mumble project - De DBus daemon die wordt gebruikt door Mumble is op dit moment actief. Sluit de daemon af zodat hij kan worden geupdate? - Mumble vereist SSE, dit is een eigenschap alleen gevonden op Intel Pentium III, AMD Athlon XP of nieuwere processoren. SSE is niet op deze processor gevonden, het is daarom onwaarschijnlijk dat Mumble werkt. Wilt u nog steeds Mumble installeren? - Mumble werkt alleen op Windows XP SP2 of nieuwer. Een ouder en niet compatibel besturingsysteeem is gedetecteerd, het is daarom onwaarschijnlijk dat Mumble werkt. Wilt u nog steeds Mumble installeren? - Start Mumble - - - Mumble Leesmij - Mumble Licentie - Qt Licentie - Speex Licentie - Deinstalleer Mumble - Mumble (Achterwaarts compatibel) - - - Compleet - Alleen client - Alleen server - - - Mumble (client) - Mumble (achterwaarts compatibele client) - Murmur (server) - Bonjour voor windows - De Mumble client, die u nodig heeft om verbinding te maken met een server. - De Mumble client om verbinding te maken met oudere (versie)servers. - De server voor Mumble. Bevat alles om je eigen server te maken. - Bonjour ontdekt en geeft aan of er Murmur servers op uw netwerk aanwezig zijn. Dit downloadt en installeert de Bonjour installatie. - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble en Murmur - Voorkeuren en databases - Verwijder Mumble en Murmur programmas - Verwijder alle sporen van Mumble of Murmur, inclusief voorkeuren en databases. - - - Mumble is reeds geinstalleerd. Het is aanbevolen dat u de reeds geinstalleerde versie verwijdert voordat u verder gaat met de installatie. Selecteer de bewerking die u wilt uitvoeren en klik op Volgende om verder te gaan. - Reeds geinstalleerd - Kies hoe u Mumble wilt installeren. - Verwijder voor installeren - Niet verwijderen - diff --git a/installer/Translations/English.wxl b/installer/Translations/English.wxl deleted file mode 100644 index 4961748be..000000000 --- a/installer/Translations/English.wxl +++ /dev/null @@ -1,52 +0,0 @@ - - - 1033 - - - Create Desktop Shortcut - Donate to the Mumble project - The DBus daemon used by Mumble is currently running. Terminate the daemon so it can be updated? - Mumble requires SSE, which is a feature only found on the Intel Pentium III, AMD Athlon XP or newer processors. SSE was not detected on your processor, and Mumble is unlikely to work. Do you still wish to install Mumble? - Mumble will only work on Windows XP SP2 or newer. An older and incompatible operating system was detected, and Mumble is unlikely to work. Do you still wish to install Mumble? - Start Mumble - - - Mumble Readme - Mumble License - Qt License - Speex License - Uninstall Mumble - Mumble (Backwards Compatible) - - - Full - Client only - Server only - - - Mumble (client) - Mumble (backwards compatible client) - Murmur (server) - Bonjour for Windows - The Mumble client, which you will need to connect to a server. - The Mumble client for connecting to older servers. - The server for Mumble. Includes everything needed to run your own server. - Bonjour enables announcement and discovery of Murmur servers on your LAN. This will download and run the Bonjour installer. - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble and Murmur - Preferences and Databases - Uninstall Mumble and Murmur programs - Uninstall all traces of Mumble and Murmur, including preferences and databases. - - - Mumble is already installed. It's recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue. - Already Installed - Choose how you want to install Mumble. - Uninstall before installing - Do not uninstall - diff --git a/installer/Translations/Finnish.wxl b/installer/Translations/Finnish.wxl deleted file mode 100644 index 7e7a544c1..000000000 --- a/installer/Translations/Finnish.wxl +++ /dev/null @@ -1,52 +0,0 @@ - - - 1035 - - - Luo pikakuvake työpöydälle - Lahjoita Mumble-projektille - Mumblen käyttämä taustaprosessi DBus on tällä hetkellä päällä. Sammutetaanko taustaprosessi päivittämistä varten? - Mumble vaatii SSE-tuen, joka löytyy vain Intel Pentium III:sta, AMD Athlon XP:stä tai uudemmista prosessoreista. Prosessorissasi ei tunnistettu olevan SSE-tukea, eikä Mumble luultavasti tule toimimaan. Haluatko kuitenkin asentaa Mumblen? - Mumble toimii vain järjestelmissä, joissa on Windows XP SP2 tai uudempi. Vanha ja tukematon käyttöjärjestelmä tunnistettiin, eikä Mumble luultavasti tule toimimaan. Haluatko kuitenkin asentaa Mumblen? - Käynnistä Mumble - - - Mumblen Lue minut - Mumble-lisenssi - Qt-lisenssi - Speex-lisenssi - Poista Mumble - Mumble (takaisinpäin yhteensopiva) - - - Täysi - Vain asiakasohjelma - Vain palvelin - - - Mumble (asiakasohjelma) - Mumble (takaisinpäin yhteensopiva asiakasohjelma) - Murmur (palvelin) - Bonjour Windowsille - Mumble-asiakasohjelma, jota tarvitset yhdistääksesi palvelimeen. - Mumble-asiakasohjelma vanhempiin palvelimiin yhdistämistä varten. - Mumble-palvelin. Sisältää kaiken tarvittavan oman palvelimesi ajamiseen. - Bonjour mahdollistaa Mumble-palvelimiesi ilmoittamisen ja löytämisen lähiverkon yli. Tämä lataa ja ajaa Bonjour-asennusohjelman. - Työpöydän pikakuvake - Luo pikakuvakkeen työpöydälle - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble ja Murmur - Asetukset ja tietokannat - Poista Mumble- ja Murmur-ohjelmat - Poistaa kaikki jäljet Mumble- ja Murmur-ohjelmista, mukaan lukien asetukset ja tietokannat. - - - Mumble on jo asennettu. On suositeltavaa, että poistat nykyisen version ennen kuin asennat uuden. Valitse suoritettava toiminto ja paina Seuraava jatkaaksesi. - Valmiiksi asennettu - Valitse, kuinka haluat asentaa Mumblen. - Poista ennen asennusta - Älä poista - diff --git a/installer/Translations/French.wxl b/installer/Translations/French.wxl deleted file mode 100644 index 79bf5fe3b..000000000 --- a/installer/Translations/French.wxl +++ /dev/null @@ -1,52 +0,0 @@ - - - 1036 - - - Créer un raccourci sur le bureau - Faire un don au projet Mumble - Le démon DBus utilisé par Mumble est en cours d'utilisation. Terminer le processus démon pour procéder à la mise à jour ? - Mumble a besoin des instructions SSE, fonctionnalité uniquement présente sur les Intel Pentium III, AMD Athlon XP ou processeurs plus récents. Les instructions SSE n'ont pas été détectées sur votre processeur, Mumble risque de ne pas fonctionner correctement. Désirez-vous quand même poursuivre l'installation ? - Mumble fonctionne seulement avec Windows XP SP2 ou plus récent. Un système d'exploitation plus ancien et incompatible a été détecté, Mumble risque donc de ne pas fonctionner. Désirez-vous quand même installer Mumble ? - Démarrer Mumble - - - Fichier README de Mumble - Licence de Mumble - Licence de Qt - Licence de Speex - Désinstallation de Mumble - Mumble (Rétrocompatible) - - - Complète - Client seulement - Serveur seulement - - - Mumble (client) - Mumble (client de rétrocompatibilité) - Murmur (serveur) - Bonjour pour Windows - Client Mumble nécessaire pour vous connecter à un serveur. - Client Mumble pour se connecter aux anciens serveurs - Le serveur pour Mumble. Inclut tout ce dont vous avez besoin pour installer votre propre serveur. - Bonjour permet d'annoncer et de découvrir les serveurs Murmur sur votre réseau local. Télécharge et lance le programme d'installation de Bonjour. - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble et Murmur - Préférences et Bases de données - Désinstaller les programmes Mumble et Murmur - Désinstaller toutes traces de Mumble et Murmur, incluant les préférences et les bases de données. - - - Mumble est déjà installé. Il est recommandé de désinstaller l'ancienne version avant de procéder à cette installation. Choisissez une option et cliquez sur Suivant pour continuer. - Mumble est déjà installé - Choisissez comment installer Mumble. - Désinstaller avant d'installer cette version - Ne pas désinstaller - diff --git a/installer/Translations/German.wxl b/installer/Translations/German.wxl deleted file mode 100644 index 8be657ace..000000000 --- a/installer/Translations/German.wxl +++ /dev/null @@ -1,51 +0,0 @@ - - - 1031 - - Desktop-Verknüpfung erstellen - Spende an das Mumble Projekt - Momentan läuft der von Mumble verwendete DBus-Daemon. Soll er beendet werden, damit er aktualisiert werden kann? - Mumble benötigt SSE, ein Feature was nur auf Intel Pentium III, AMD Athlon XP und neueren Prozessoren zu finden ist. Da keine SSE Unterstützung gefunden wurde, wird Mumble wahrscheinlich nicht funktionieren. Möchten Sie Mumble trotzdem installieren? - Mumble läuft nur auf Windows XP SP2 oder einer neueren Version. Ein älteres und inkompatibles Betriebssystem wurde gefunden, weshalb Mumble wahrscheinlich nicht funktionieren wird. Möchten Sie Mumble trotzdem installieren? - Mumble starten - - - Mumble Liesmich - Mumble Lizenz - Mumble (Abwärtskompatibel) - Qt Lizenz - Speex Lizenz - Mumble Deinstallieren - - - Vollständig - Nur Client (Nutzerprogramm) - Nur Server - - - Mumble (Client) - Murmur (Server) - Mumble (Abwärtskompatibler Client) - Bonjour für Windows - Der Mumble Client, welchen Sie zum Verbinden mit einem Server benötigen. - Der Mumble Client, welchen Sie zum Verbinden mit einem älteren Server benötigen. - Der Server für Mumble. Beinhaltet alles, was Sie zum Starten ihres eigenen Servers benötigen. - Bonjour ermöglicht das Bekanntmachen und Finden von Murmur Servern im LAN. Diese Option lädt Bonjour herunter und startet die Installationsroutine. - Desktop shortcut - Erzeugt einen shortcut auf dem Desktop - Startmenü-Eintrag - Erzeugt einen Startmenü-Eintrag - - - Mumble und Murmur - Einstellungen und Datenbanken - Mumble und Murmur deinstallieren - Alles von Mumble und Murmur deinstallieren, einschließlich der Einstellungen und Datenbanken. - - - Mumble ist bereits installiert. Es wird empfohlen die aktuelle Version zunächst zu deinstallieren. Wählen Sie die auszuführende Aktion aus und klicken Sie auf Weiter um fortzufahren. - Bereits installiert - Wählen Sie, wie Sie Mumble installieren möchten. - Vor der Installation deinstallieren - Nicht deinstallieren - diff --git a/installer/Translations/Greek.wxl b/installer/Translations/Greek.wxl deleted file mode 100644 index c3a10a290..000000000 --- a/installer/Translations/Greek.wxl +++ /dev/null @@ -1,51 +0,0 @@ - - - 1032 - - Δημιουργία συντόμευσης στην Επιφάνεια Εργασίας - Δωρεά στο Mumble - Ο δαίμονας DBus που χρησιμοποιείται από το Mumble βρίσκεται σε εκτέλεση. Τερματισμός του δαίμονα έτσι ώστε να μπορέσει να ενημερωθεί; - Το Mumble χρειάζεται το SSE, το οποίο είναι ενα χαρακτηριστικό που υπάρχει στους Intel Pentium III, AMD Athlon XP ή και σε νεότερους επεξεργαστές. Το χαρακτηριστικό SSE δεν εντοπίστηκε στον επεξεργαστή σας, και ως εκ τούτου το Mumble μάλλον δεν θα λειτουργεί. Θέλετε ακόμα να εγκαταστήσετε το Mumble; - Το Mumble λειτουργεί σε Windows XP SP2 ή νεότερα. Ανιχνεύθηκε ένα παλαιότερο και μη συμβατό λειτουργικό σύστημα, στο οποίο μάλλον δεν θα λειτουργεί το Mumble. Θέλετε ακόμα να εγκαταστήσετε το Mumble; - Εκκίνηση του Mumble - - - Mumble ΔιάβασέΜε - Άδεια του Mumble - Άδεια του Qt - Άδεια του Speex - Απεγκατάσταση του Mumble - Mumble (Παλαιότερη Συμβατότητα) - - - Πλήρης - Μόνο την εφαρμογή - Μόνο τον διακομιστή - - - Mumble (εφαρμογή) - Mumble (εφαρμογή παλαιότερης συμβατότητας) - Murmur (διακομιστής) - Bonjour για Windows - Η εφαρμογή Mumble, την οποία θα χρειαστείτε για να συνδεθείτε σε κάποιον διακομιστή. - Η εφαρμογή Mumble για σύνδεση σε παλαιότερους διακομιστές. - Ο διακομιστής για το Mumble. Περιλαμβάνει όσα χρειάζονται για να τρέξετε τον δικό σας διακομιστή. - Το Bonjour είναι για ανακοίνωση και ανίχνευση διακομιστών Murmur στο τοπικό σας δίκτυο. Αυτό θα κατεβάσει και θα τρέξει την εγκατάσταση του Bonjour. - Συντόμευση στην επιφάνεια εργασίας - Δημιουργεί μια συντόμευση στην επιφάνεια εργασίας - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble και Murmur - Επιλογές και Βάσεις Δεδομένων - Απεγκατάσταση των εφαρμογών Mumble και Murmur - Απεγκατάσταση όλων των υπολειμμάτων των Mumble και Murmur, συμπεριλαμβανομένου τις επιλογές και τις βάσεις δεδομένων. - - - Το Mumble είναι ήδη εγκατεστημένο. Συνιστάται η απεγκατάσταση της τωρινής έκδοσης πριν την εγκατάσταση. Επιλέξτε τη λειτουργία που θέλετε να εκτελέσετε και κάντε κλικ στο Επόμενο για να συνεχίσετε. - Είναι ήδη εγκατεστημένο - Επιλέξτε πώς θέλετε να εγκαταστήσετε το Mumble. - Απεγκατάσταση πριν την εγκατάσταση - Να μην γίνει απεγκατάσταση - diff --git a/installer/Translations/Italian.wxl b/installer/Translations/Italian.wxl deleted file mode 100644 index c9fe39e5f..000000000 --- a/installer/Translations/Italian.wxl +++ /dev/null @@ -1,52 +0,0 @@ - - - 1040 - - - Crea collegamento sul Desktop - Effettua una donazione al progetto Mumble - Il DBus utilizzato da Mumble è attualmente in uso. Terminarlo in modo da poter installare l'aggiornamento? - Mumble richiede SSE, che è una caratteristica degli Intel Pentium III, AMD Athlon XP o dei processori più nuovi. SSE non è stato trovato sul tuo processore e Mumble potrebbe non funzionare, vuoi continuare l'installazione? - Mumble funziona solo su Windows XP SP2 o superiore. Un sistema operativo vecchio è stato riconosciuto e Mumble potrebbe non funzionare, vuoi continuare l'installazione? - Avvia Mumble - - - Leggimi di Mumble - Licenza di Mumble - Licenza di Qt - Licenza di Speex - Disinstalla Mumble - Mumble (Modalità retrocompatibile) - - - Completa - Solo Client - Solo Server - - - Mumble (Client) - Mumble (Client modalità retrocompatibile) - Murmur (server) - Bonjour per Windows - Client di Mumble, quello di cui hai bisogno per connetterti ai server - Client di Mumble, quello di cui hai bisogno per connetterti ai server vecchi - Il server per Mumble. Include tutto ciò di cui hai bisogno per eseguire il tuo server - Bonjour abilita la possibilità di trovare un server Murmur all'interno della tua rete LAN. Questa funzione scaricherà e installerà Bonjour - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble e Murmur - Preferenze e Dati - Disinstalla Mumble e Murmur - Disinstallazione completa di Mumble e Murmur, comprese le impostazioni e i dati - - - Mumble è già installato. Si raccomanda di disinstallare la versione precedente prima di procedere. Seleziona l'operazione che vuoi portare a termine e premi avanti per continuare - Già Installato - Scegli come vuoi installare Mumble - Disinstallare prima di installare - Non disinstallare - diff --git a/installer/Translations/Japanese.wxl b/installer/Translations/Japanese.wxl deleted file mode 100644 index b7ba87987..000000000 --- a/installer/Translations/Japanese.wxl +++ /dev/null @@ -1,52 +0,0 @@ - - - 1041 - - - デスクトップへショートカットを作成する - Mumble プロジェクトに寄付する - Mumble で使われている DBus デーモンが起動中です。アップデートのために DBus デーモンを停止させますか？ - Mumble の実行には SSE が必要です。Intel Pentium III、AMD Athlon XP、またはそれより新しいプロセッサである必要があります。SSE はあなたのプロセッサで検出されませんでした。Mumble は正常に動作しないかもしれません。 あなたはそれでも Mumble をインストールしますか？ - Mumble は Windows XP SP2 以上の環境でのみ動作します。古いか互換性のないOSが検出されました。Mumble は正常に動作しないかもしれません。 あなたはそれでも Mumble をインストールしますか？ - Mumbleを起動 - - - Mumble Readme - Mumble License - Qt License - Speex License - Mumble のアンインストール - Mumble (1.1.x 互換) - - - すべて - クライアントのみ - サーバのみ - - - Mumble (クライアント) - Mumble (1.1.x 互換クライアント) - Murmur (サーバ) - Bonjour for Windows - サーバに接続するために必要な Mumble クライアントです。 - 古いサーバに接続するための Mumble クライアントです。 - Mumbe のためのサーバ。サーバを実行するために必要なファイルを含みます。 - Bonjour を使用すると LAN 上の Murmur サーバの通知と探索が可能です。これを選択すると Bonjour のインストーラがダウンロードされ実行されます。 - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble と Murmur - 設定 と データベース - Mumble と Murmur をアンイストールする - 設定 と データベースを含む Mumble と Murmur のすべての痕跡をアンインストールします。 - - - Mumble はすでにインストールされています。インストールを行う前に古いバージョンを削除することが推奨されます。あなたが実行したい操作を選択し、次へをクリックしてください。 - すでにインストールされています。 - Mumble のインストール方法を選択してください。 - インストール前に古いバージョンを削除する - 古いバージョンを削除しない - diff --git a/installer/Translations/Norwegian.wxl b/installer/Translations/Norwegian.wxl deleted file mode 100644 index f6a2e437a..000000000 --- a/installer/Translations/Norwegian.wxl +++ /dev/null @@ -1,51 +0,0 @@ - - - 1044 - - Lag snarvei på skrivebordet - Doner til Mumble - DBus demonen som Mumble bruker kjører for øyeblikket. Avslutte demonen så den kan oppdateres? - Mumble krever SSE, en prosessorutvidelse som bare finnes på Intel Pentium III, AMD Athlon XP og nyerer prosessorer. SSE er ikke støttet av din prosessor, og det er usannsynlig at Mumble vil fungere. Ønsker du fortsatt å installerer Mumble? - Mumble krever Windows XP SP2 eller nyere. Du bruker et eldre og inkompatibelt operativsystem, og det er usannsynlig at Mumble vil fungere. Ønsker du fortsatt å installerer Mumble? - Start Mumble - - - Mumble Lesmeg - Mumble Lisens - Qt Lisens - Speex Lisens - Avinstallere Mumble - Mumble (Bakoverkompatibel) - - - Full - Bare klient - Bare server - - - Mumble (klient) - Mumble (bakoverkompatibel klient) - Murmur (server) - Bonjour for Windows - Klienten for Mumble, som du trenger for å koble deg til en server. - Bakoverkompatibel klient for bruk mot eldre servere. - Serveren for Mumble. Inkluderer alt som trengs for å kjøre din egen server. - Bonjour annonserer og oppdater Murmur servere på ditt lokale nettverk. Dette vil laste ned og installere Bonjour. - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble og Murmur - Brukerinstillinger og databaser - Avinstallere Mumble og Murmur programmer - Avinstallere Mumble og Murmur og fjern alle spor av dem, inkludert brukerinstillinger og databaser. - - - Mumble er allerede installert. Det anbefales at du avinstallerer den nåværende versjonen før du installerer. Velg operasjonen du ønsker å gjøre og trykk Neste for å fortsette. - Allerede installert - Velg hvordan du ønsker å installere Mumble. - Avinstaller gammel versjon først - Installer over gammel versjon - diff --git a/installer/Translations/Polish.wxl b/installer/Translations/Polish.wxl deleted file mode 100644 index 6dd14abc7..000000000 --- a/installer/Translations/Polish.wxl +++ /dev/null @@ -1,53 +0,0 @@ - - - 1045 - - - - Utwórz skrót na pulpicie - Wesprzyj projekt Mumble - Proces DBus jest w tej chwili uruchomiony. Czy chcesz zakończyć działanie procesu, aby dokonać aktualizacji? - Mumble wymaga SSE, jest to funkcja którą posiadają Intel Pentium III, AMD Athlon XP oraz nowsze procesory. SSE nie zostało wykryte w twoim procesorze więc jest małe prawdopodobieństwo, aby Mumble działało. Czy nadal chcesz zainstalować Mumble? - Mumble działa tylko na Windows XP SP2 lub nowszym. Wykryto starszy lub niekompatybilny system operacyjny więc jest małe prawdopodobieństwo, aby Mumble działało. Czy nadal chcesz zainstalować Mumble? - Uruchom Mumble - - - Plik Czytaj To - Licencja Mumble - Mumble (Klient Kompatybilny Wstecz) - Licencja Qt - Licencja Speex - Deinstalacja Mumble - - - Pełny - Tylko Klient - Tylko Serwer - - - Mumble (Klient) - Mumble (Klient Kompatybilny Wstecz) - Murmur (Serwer) - Bonjour dla Windows - Klient Mumble, pozwalający na połączenia do serwerów. - Klient Mumble, pozwalający na połączenia do starszych serwerów. - Serwer Mumble. Zawiera wszystko czego potrzebujesz by uruchomić swój własny serwer. - Bonjour pozwala na automatyczne rozgłaszanie i wykrywanie serwerów Murmur w sieci LAN. Zaznaczając tę opcję instalator Bonjour zostanie pobrany i uruchomiony. - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble i Murmur - Preferencje i bazy danych - Usuwa Mumble oraz Murmur. - Usuwa wszystkie pliki programu, ustawienia oraz bazy danych (adresy serwerów, loginy, hasła). - - - Mumble jest już zainstalowany na tym komputerze. Zalecane jest usunięcie poprzedniej wersji programu przed instalacją nowej. Wskaż żądaną akcję i kliknij 'Dalej', aby kontynuować. - Program jest już zainstalowany - Wybierz sposób zainstalacji Mumble. - Usuń poprzednią wersję Mumble - Nie usuwaj - diff --git a/installer/Translations/Portuguese.wxl b/installer/Translations/Portuguese.wxl deleted file mode 100644 index df80179ec..000000000 --- a/installer/Translations/Portuguese.wxl +++ /dev/null @@ -1,51 +0,0 @@ - - - 1046 - - Criar Atalho no Desktop - Doar para o projeto do Mumble - O DBus, serviço usado pelo Mumble está executando atualmente. Parar o serviço para que ele possa ser atualizado? - O Mumble requer SSE, disponível somente nos processadores Intel Pentium III, AMD Athlon XP e mais recentes. SSE não foi detectado em seu processador, e o Mumble provavelmente não funcionará. Você ainda quer instalá-lo? - O Mumble funcionará somente no Windows XP SP2 ou mais recente. Uma versão incompatível foi detectada, e o Mumble provavelmente não funcionará. Ainda pretende instalá-lo? - Iniciar o Mumble - - - Leiame do Mumble - Licença do Mumble - Licença do Qt - Licença do Speex - Desinstalar o Mumble - Mumble (Compatibilidade Antiga) - - - Completa - Apenas o Cliente - Apenas o Servidor - - - Mumble (cliente) - Mumble (cliente compatível com versões antigas) - Murmur (servidor) - Bonjour para Windows - O cliente do Mumble, que você precisará para conectar a um servidor. - O cliente do Mumble para conectar a servidores antigos. - O servidor para o Mumble. Inclui todo o necessário para rodar seu próprio servidor. - Bonjour permite anúncio e descobrimento de servidores Murmur na sua LAN. Isso baixará e executará o instalador do Bonjour. - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble e Murmur - Preferências e Base de Dados - Desinstalar os programas Mumble e Murmur - Desinstalar todos os traços do Mumble e do Murmur, inclusive preferências e as bases de dados. - - - O Mumble já está instalado. É recomendado que você desinstale a versão atual antes de reinstalá-lo. Selecione a operação que deseja realizar e clique Proximo para continuar. - Já Instalado - Selecione como quer instalar o Mumble. - Desinstalar antes de reinstalar - Não desinstalar - diff --git a/installer/Translations/Russian.wxl b/installer/Translations/Russian.wxl deleted file mode 100644 index d13f3cab9..000000000 --- a/installer/Translations/Russian.wxl +++ /dev/null @@ -1,51 +0,0 @@ - - - 1049 - - Создать ярлык на Рабочем столе - Пожертвовать проекту Mumble - Демон DBus, который используется Mumble уже запущен. Завершить его процесс, чтобы его можно было обновить? - Mumble использует SSE (потоковое SIMD-расширение процессора), которое используется только на процессорах Intel Pentium III, AMD Athlon XP или более новых. SSE не был обнаружен на Вашем процессоре и Mumble может не работать. Вы все еще желаете установить Mumble? - Mumble работает только на Windows XP SP2 или более новых версиях Windows. Была обнаружена старая или несовместимая операционная система. Mumble может не работать. Вы все еще желаете установить Mumble? - Запуск Mumble - - - Mumble инфо - Лицензия Mumble - Лицензия Qt - Лицензия Speex - Удалить Mumble - Mumble (обратная совместимость) - - - Полная - Только клиент - Только сервер - - - Mumble (клиент) - Mumble (клиент обратной совместимости) - Murmur (сервер) - Bonjour для Windows - Mumble клиент, который нужен Вам для подключения к серверу. - Mumble клиент для подключения к старым серверам. - Сервер для Mumble. Включает в себя все необходимое для запуска своего собственного сервера. - Bonjour позволяет анонсировать и находить сервера Murmur в Вашей локальной сети. Это позволит загрузить и запустить программу установки Bonjour. - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble и Murmur - Настройки и Базы данных - Удалить Mumble и Murmur - Удалить все следы Mumble и Murmur, включая настройки и базы данных. - - - Mumble уже установлен на Вашем компьютере. Рекомендуется удалить текущую версию перед установкой. Выберите операцию, которую Вы желаете выполнить и нажмите кнопку Далее. - Уже установлено - Выберите, каким образом Вы хотите установить Mumble. - Удалить перед установкой - Не удалять - diff --git a/installer/Translations/SimpChinese.wxl b/installer/Translations/SimpChinese.wxl deleted file mode 100644 index 7858c8e77..000000000 --- a/installer/Translations/SimpChinese.wxl +++ /dev/null @@ -1,51 +0,0 @@ - - - 2052 - - 创建桌面快捷方式 - 向 Mumble 项目捐款 - Mumble 依赖的 DBus 守护进程目前正在运行。终止该进程然后继续升级？ - Mumble 需要 SSE，该功能仅被 Intel Pentium III、AMD Athlon XP 或较新的 CPU 所支持。您的 CPU 不支持 SSE，Mumble 可能无法正常工作。您仍然要继续安装 Mumble 吗？ - Mumble 只能运行在 Windows XP SP2 或较新的操作系统上。检测到较旧的或者不兼容的操作系统，Mumble 可能无法正常工作。您仍然要继续安装 Mumble 吗? - 启动 Mumble - - - Mumble 自述文件 - Mumble 许可 - Qt 许可 - Speex 许可 - 卸载 Mumble - Mumble（与旧版兼容） - - - 完全安装 - 仅客户端 - 仅服务端 - - - Mumble（客户端） - Mumble（与旧版兼容的客户端） - Murmur（服务端） - Windows 版 Bonjour - 该 Mumble 客户端用于连接到一个服务器。 - 该 Mumble 客户端用于连接到旧版服务器。 - Mumble 服务端，包含所有您自行部署服务器所需的文件。 - Bonjour 用于启用局域网内的 Mumble 服务器广播与发现。将会下载并运行 Bonjour 安装程序。 - 桌面快捷方式 - 在桌面上创建快捷方式 - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble 和 Murmur - 个人设置和数据库 - 卸载 Mumble 和 Murmur 应用程序 - 完全卸载 Mumble 和 Murmur，包括个人设置和数据库。 - - - Mumble 已经安装。建议您在安装之前卸载现有版本。选择您想要进行的操作然后点击“下一步”以继续。 - 已经安装 - 选择安装 Mumble 的方式。 - 安装前卸载现有版本 - 不要卸载现有版本 - diff --git a/installer/Translations/Spanish.wxl b/installer/Translations/Spanish.wxl deleted file mode 100644 index d7cfcd29c..000000000 --- a/installer/Translations/Spanish.wxl +++ /dev/null @@ -1,51 +0,0 @@ - - - 1034 - - Crear acceso directo en el escritorio - Donar al proyecto Mumble - El servicio DBus usado por Mumble se está ejecutando actualmente. ¿Detener el servicio para que pueda ser actualizado? - Mumble requiere SSE, que es una característica que sólo está presente en procesadores Intel Pentium III, AMD Athlon XP o superiores. No se detectó SSE en su procesador, y es probable que Mumble no funcione. ¿Aún desea instalar Mumble? - Mumble funciona sólo sobre Windows XP SP2 o posteriores. Se ha detectado un sistema operativo anterior e incompatible, y es probable que Mumble no funcione. ¿Aún desea instalar Mumble? - Iniciar Mumble - - - Léame de Mumble - Licencia de Mumble - Licencia de Qt - Licencia de Speex - Desinstalar Mumble - Mumble (compatible con versiones anteriores) - - - Completa - Sólo el cliente - Sólo el servidor - - - Mumble (cliente) - Mumble (cliente compatible con versiones anteriores) - Murmur (servidor) - Bonjour para Windows - El cliente Mumble, necesario para conectar a un servidor. - El cliente Mumble para conectar a servidores antiguos. - El servidor para Mumble. Incluye todo lo necesario para ejecutar su propio servidor. - Bonjour posibilita el anuncio y descubrimiento de servidores Murmur en su LAN. Ésto descargará y ejecutará el instalador Bonjour. - Icono escritorio - Creates un acceso directo en el escritorio - Icono menú inicio - Crea un acceso directo en el menú inicio - - - Mumble y Murmur - Preferencias y bases de datos - Desinstalar los programas Mumble y Murmur - Eliminar completamente Mumble y Murmur, incluyendo las preferencias y las bases de datos. - - - Mumble ya se encuentra instalado. Se recomienda desinstalar la versión actual antes de continuar con la instalación. Seleccione la operación que desea realizar y haga click en Siguiente para continuar. - Ya instalado - Elija como desea instalar Mumble. - Desinstalar antes de instalar - No desinstalar - diff --git a/installer/Translations/Swedish.wxl b/installer/Translations/Swedish.wxl deleted file mode 100644 index 93c9a227d..000000000 --- a/installer/Translations/Swedish.wxl +++ /dev/null @@ -1,51 +0,0 @@ - - - 1053 - - Skapa genväg på skrivbordet - Donera till projektet för Mumble - DBus-demonen som används av Mumble körs för närvarande. Avsluta demonen så att den kan uppdateras? - Mumble kräver SSE som är en funktion hittad på processorer såsom Intel Pentium III, AMD Athlon XP eller nyare. SSE hittades inte på din processor och Mumble verkar inte fungera. Vill du fortfarande installera Mumble? - Mumble fungerar bara på Windows XP SP2 eller senare. Ett äldre och inkompatibelt operativsystem hittades och Mumble verkar inte fungera. Vill du fortfarande installera Mumble? - Starta Mumble - - - Läs mig för Mumble - Licens för Mumble - Licens för Qt - Licens för Speex - Avinstallera Mumble - Mumble (Bakåtkompatibel) - - - Fullständig - Endast klient - Endast server - - - Mumble (klient) - Mumble (bakåtkompatibel klient) - Murmur (server) - Bonjour för Windows - Klienten för Mumble, som du behöver för att ansluta till servrar. - Klienten för Mumble att ansluta till äldre servrar. - Servern för Mumble. Inkluderar allt du behöver för att köra din egen server. - Bonjour tillåter annonsering och upptäckning av Murmur servrar på ditt LAN. Detta kommer att ladda ner och köra installationen för Bonjour. - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble och Murmur - Inställningar och databaser - Avinstallera program för Mumble och Murmur - Avinstallera Mumble och Murmur fullständigt, vilket inkluderar inställningar och databaser. - - - Mumble är redan installerat. Det är rekommenderat att du avinstallerar den nuvarande versionen innan du påbörjar den nya installation. Välj vad du vill utföra och tryck på Nästa för att fortsätta. - Redan installerat - Välj hur du vill installera Mumble. - Avinstallera före installation - Avinstallera inte - diff --git a/installer/Translations/TradChinese.wxl b/installer/Translations/TradChinese.wxl deleted file mode 100644 index 0cbff7944..000000000 --- a/installer/Translations/TradChinese.wxl +++ /dev/null @@ -1,51 +0,0 @@ - - - 1028 - - 創建桌面快捷圖標 - 向 Mumble 項目捐款 - Mumble 依賴的 DBus 守護進程目前正在運行。 終止該進程然后繼續升級？ - Mumble 需要 SSE，該功能被 Intel Pentium III， AMD Athlon XP 或者較新的 CPU 所支持。 您的 CPU 不支持 SSE， Mumble 不能正常工作。您依然要繼續安裝 Mumble 嗎？ - Mumble 只能運行在 Windows XP SP2 或較新的操作系統上。 現在檢測到了一個老的或者不兼容的操作系統，Mumble 不能正常工作。您依然要繼續安裝 Mumble 嗎? - 啟動 Mumble - - - Mumble 自我描敘 - Mumble 許可 - Qt 許可 - Speex 許可 - 卸載 Mumble - Mumble（與老版本兼容） - - - 完全 - 僅客戶端 - 僅服務器端 - - - Mumble（客戶端） - Mumble（與老版本兼容的客戶端） - Murmur（服務器端） - Bonjour for Windows - 該 Mumble 客戶端用于連接到一個服務器。 - 該 Mumble 客戶端用于連接到一個老的服務器。 - Mumble 服務器端包含所有您運行個人服務器所必須的文件。 - Bonjour enables announcement and discovery of Murmur servers on your LAN. This will download and run the Bonjour installer. - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble 和 Murmur - 個人偏好和數據庫 - 卸載 Mumble 和 Murmur 應用程序 - 完全卸載 Mumble 和 Murmur， 包括個人偏好和數據庫。 - - - Mumble 已經安裝。 我們建議您安裝之前卸載現有版本。 選擇您想要進行的操作然后點下一步。 - 已安裝 - 選擇怎樣安裝 Mumble。 - 安裝前卸載現有版本 - 不要卸載現有版本 - diff --git a/installer/Translations/Turkish.wxl b/installer/Translations/Turkish.wxl deleted file mode 100644 index 4aadc850b..000000000 --- a/installer/Translations/Turkish.wxl +++ /dev/null @@ -1,52 +0,0 @@ - - - 1055 - - - Masaüstünde kısayol oluştur - Mumble projesine bağışta bulun - Mumble tarafından kullanılan DBus servisi (daemon) hâlihazırda çalışmaktadır. Güncellenebilmesi için servis durdurulsun mu? - Mumble sadece Intel Pentium III, AMD Athlon XP ve daha yeni mikroişlemcilerde bulunan SSE komut kümesine ihtiyaç duyar. SSE mikroişlemcinizde tespit edilememiştir ve Mumble muhtemelen çalışamayacaktır. Buna rağmen Mumble'ı kurmak istiyor musunuz? - Mumble sadece Windows XP SP2 ve daha yeni sürümlerde çalışır. Daha eski ve uyumsuz bir işletim sistemi tespit edilmiştir ve Mumble muhtemelen çalışmayacaktır. Buna rağmen Mumble'ı kurmak istiyor musunuz? - Mumble'ı Başlat - - - Mumble Readme - Mumble Lisansı - Qt Lisansı - Speex Lisansı - Mumble'ı Kaldır - Mumble (Geriye Uyumlu) - - - Tam kurulum - Sadece istemci - Sadece sunucu - - - Mumble (istemci) - Mumble (geriye uyumlu istemci) - Murmur (sunucu) - Windows için Bonjour - Bir sunucuya bağlanmak için ihtiyaç duyacağınız Mumble istemcisi. - Eski sunuculara bağlanmak için Mumble istemcisi. - Mumble için sunucu. Kendi sunucunuzu işletmeniz için gereken her şeyi içerir. - Bonjour yerel ağınızda Murmur sunucularının duyurulmalarına ve keşiflerine imkân sağlar. Bu seçenek Bonjour kurucusunu indirir ve çalıştırır. - Desktop shortcut - Creates a shortcut on the desktop - Start menu shortcut - Creates a shortcut on the start menu - - - Mumble ve Murmur - Tercihler ve Veritabanları - Mumble ve Murmur programlarını Kaldır - Mumble ve Murmur'ın tüm izlerini sil, ki bu tercihleri ve veritabanlarını da kapsar. - - - Mumble zaten kuruludur. Kurulumdan önce mevcut sürümü kaldırmanız tavsiye edilir. Gerçekleştirmek istediğiniz işlemi seçiniz ve devam etmek için İleri düğmesine tıklayınız. - Zaten Kurulu - Mumble'ı nasıl kurmak istediğinizi seçiniz. - Kurulumdan evvel kaldır - Kaldırma - diff --git a/installer/UI.wxs b/installer/UI.wxs deleted file mode 100644 index 9fd3f8a63..000000000 --- a/installer/UI.wxs +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - 1 - - NOT Installed - Installed AND PATCH - - 1 - LicenseAccepted = "1" - - Installed - NOT Installed - 1 - - NOT Installed OR WixUI_InstallMode = "Change" - Installed AND NOT PATCH - Installed AND PATCH - - 1 - - 1 - 1 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/build_installer.pl b/installer/build_installer.pl deleted file mode 100755 index 08ad9f185..000000000 --- a/installer/build_installer.pl +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/perl - -use File::Copy; - -my @LANG; -$x64dir = "bin\\x64\\Release"; -$dir = "bin\\Release\\"; -$platform = "Intel"; -if (-d $x64dir) { - $dir = $x64dir; - $platform = "x64"; -} - -opendir($D, "Translations"); -while ($x = readdir($D)) { - next unless $x =~ /\.wxl$/; - next if $x eq "English.wxl"; - - open(F, ") { - if ($_ =~ /Culture="([a-z]{2}-[a-z]{2})"/) { - $culture = $1; - } elsif ($_ =~ /Id="LANG">(\d+)/) { - $langcode = $1; - } - } - close(F); - system("msitran -g $dir\\en-us\\Mumble.msi $dir\\$culture\\Mumble.msi $langcode"); - print "\n"; - push @LANG, $langcode; -} - -copy("$dir\\en-us\\Mumble.msi", "$dir\\Mumble.msi"); -foreach (@LANG) { - print "$_\n"; - system("msidb -d $dir\\Mumble.msi -r $_"); - unlink("$_"); -} - -system("msiinfo $dir\\Mumble.msi /p $platform;1033," . join(",", @LANG)); diff --git a/installer/client-shortcuts.xml b/installer/client-shortcuts.xml deleted file mode 100644 index c46f58e9d..000000000 --- a/installer/client-shortcuts.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - diff --git a/installer/gen-ucrt.py b/installer/gen-ucrt.py deleted file mode 100644 index c2fd09939..000000000 --- a/installer/gen-ucrt.py +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env python -# Copyright 2005-2020 The Mumble Developers. All rights reserved. -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file at the root of the -# Mumble source tree or at . - -from __future__ import (unicode_literals, print_function, division) - -import os -import codecs - -def mangleComponentId(fn): - # Component IDs in WiX can't contain dashes. Mangle them with _ instead. - return fn.replace('-', '_') - -def fileHeader(f): - f.write('\r\n') - f.write('\r\n') - f.write('\r\n') - f.write('\r\n') - f.write('\r\n') - -def fileFooter(f): - f.write('\r\n') - f.write('\r\n') - -def gencomponents(f, files, prefix=''): - for fn in files: - f.write('\r\n'.format(mangleComponentId(prefix+fn))) - f.write(' \r\n'.format(mangleComponentId(prefix+fn), fn)) - f.write('\r\n') - -def gencomponentrefs(f, files, prefix=''): - for fn in files: - f.write('''\r\n'''.format(mangleComponentId(prefix+fn))) - -def main(): - ucrtx64 = 'C:\\Program Files (x86)\\Windows Kits\\10\\Redist\\ucrt\\DLLs\\x64' - ucrtx86 = 'C:\\Program Files (x86)\\Windows Kits\\10\\Redist\\ucrt\\DLLs\\x86' - - filesx86 = os.listdir(ucrtx86) - filesx64 = os.listdir(ucrtx64) - - # Perform a quick sanity test to ensure that both x86 and x64 UCRT variants - # use the same filenames. - if set(filesx86) != set(filesx64): - raise Exception('Fatal error: x86 UCRT files are not equivalent to x64 UCRT files') - - # ...Since they're the same, let's just use the - # filenames from x86. - files = filesx86 - - with codecs.open('MumbleUCRTComponents.wxi', 'wb', 'utf-8') as f: - fileHeader(f) - gencomponents(f, files) - fileFooter(f) - - with codecs.open('MurmurUCRTComponents.wxi', 'wb', 'utf-8') as f: - fileHeader(f) - gencomponents(f, files, 'Murmur_') - fileFooter(f) - - with codecs.open('MumbleUCRTComponentRefs.wxi', 'wb', 'utf-8') as f: - fileHeader(f) - gencomponentrefs(f, files) - fileFooter(f) - - with codecs.open('MurmurUCRTComponentRefs.wxi', 'wb', 'utf-8') as f: - fileHeader(f) - gencomponentrefs(f, files, 'Murmur_') - fileFooter(f) - -if __name__ == '__main__': - main() diff --git a/installer/server-shortcuts.xml b/installer/server-shortcuts.xml deleted file mode 100644 index ac822ed10..000000000 --- a/installer/server-shortcuts.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - diff --git a/installer/wix-template.xml b/installer/wix-template.xml deleted file mode 100644 index 0f1778bc3..000000000 --- a/installer/wix-template.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - ProductIcon.ico - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 3c0305175..46609e18a 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -54,5 +54,9 @@ foreach(ITEM ${ITEMS}) set_target_properties(${ITEM} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/plugins") install(TARGETS ${ITEM} LIBRARY DESTINATION "${MUMBLE_INSTALL_PLUGINDIR}" COMPONENT mumble_client) endif() + + if(packaging) + add_dependencies(mumble ${ITEM}) + endif() endif() endforeach() diff --git a/scripts/Create-Win32InstallerMUI.ps1 b/scripts/Create-Win32InstallerMUI.ps1 deleted file mode 100644 index 06dddaec9..000000000 --- a/scripts/Create-Win32InstallerMUI.ps1 +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 2020 The Mumble Developers. All rights reserved. -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file at the root of the -# Mumble source tree or at . - -param( - [Parameter(Mandatory=$true)]$packageName, - [Parameter(Mandatory=$true)]$version, - [switch]$allCultures -) - -Function Build-Installer { - [cmdletbinding()] - Param ( - [string]$culture, - [string]$lcid - ) - - Process { - Write-Host "Creating installer for $culture..." - cpack -C Release -D CPACK_PACKAGE_FILE_NAME="$installerName-$culture" -D CPACK_WIX_CULTURES=$culture -D CPACK_WIX_LCID=$lcid - } -} - -# TODO: Check whether WiX is in PATH? -if(-Not (Test-Path $env:WIX)) { - Write-Host "Error: \"WIX\" environment variable not found, is WiX installed?" - exit 1 -} - -if(-Not (Test-Path -Path "EmbedTransform.exe")) { - Write-Host "Downloading EmbedTransform from FireGiant (WiX)..." - - try { - Invoke-WebRequest https://www.firegiant.com/system/files/samples/EmbedTransform.zip -OutFile ".\EmbedTransform.zip" - } catch { - Write-Host "URL for FireGiant has been removed or is not available. Aborting..." - exit 1 - } - - Write-Host "Extracting EmbedTransform archive..." - - try { - Expand-Archive -Path "EmbedTransform.zip" -DestinationPath "." - } catch { - Write-Host "EmbedTransform archive missing or corrupt. Aborting..." - exit 1 - } - - Remove-Item "EmbedTransform.zip" -} - -$mainCulture = "en-US" -if ($allCultures.isPresent) { - $extraCultures = - "cs-CZ", - "da-DK", - "de-DE", - "el-GR", - "es-ES", - "fi-FI", - "fr-FR", - "it-IT", - "ja-JP", - "nb-NO", - "nl-NL", - "pl-PL", - "pt-PT", - "ru-RU", - "sv-SE", - "tr-TR", - "zh-CN", - "zh-TW" -} else { - # Only use a few languages in order to save time - $extraCultures = - "de-DE", - "es-ES" -} - -$wixBinaryDir = $env:WIX + "bin" -$installerName = "$packageName-$version" -$lcids = New-Object System.Collections.Generic.List[System.Object] - -$cultureInfo = New-Object system.globalization.cultureinfo($mainCulture) -$cultureLCID = $cultureInfo.TextInfo.LCID -Build-Installer -culture $mainCulture -lcid $cultureLCID -$lcids.Add($cultureLCID) - -# The main culture installer is used as base for the multi-language one. -Copy-Item -Path "$installerName-$mainCulture.msi" "$installerName.msi" - -foreach($culture in $extraCultures) { - $cultureInfo = New-Object system.globalization.cultureinfo($culture) - $cultureLCID = $cultureInfo.TextInfo.LCID - Build-Installer -culture $culture -lcid $cultureLCID - Write-Host "Creating language transform for $culture..." - & $wixBinaryDir\torch.exe -p -t language "$installerName.msi" "$installerName-$culture.msi" -out $cultureLCID - Write-Host "Embedding transform for $culture..." - & .\EmbedTransform.exe "$installerName.msi" $cultureLCID - $lcids.Add($cultureLCID) -} - -if ([Environment]::Is64BitProcess) { - $platform = "x64" -} else { - $platform = "Intel" -} - -Write-Host "Updating template string..." -# Inspired by https://stackoverflow.com/a/53203626/6658002. -$windowsInstaller = New-Object -ComObject WindowsInstaller.Installer -$msi = $windowsInstaller.OpenDatabase("$PSScriptRoot\$installerName.msi", 2) -$summaryInfo = $msi.SummaryInformation(4) - -Write-Host "Original: " $summaryInfo.Property(7) -$lcidsString = [system.String]::Join(",", $lcids) -$summaryInfo.Property(7) = "$platform;$lcidsString" -Write-Host "Updated: " $summaryInfo.Property(7) - -$summaryInfo.Persist() -$msi.Commit() - -# If we don't release the objects, we cannot interact with the file we opened until PowerShell is closed. -[System.Runtime.Interopservices.Marshal]::ReleaseComObject($summaryInfo) | Out-Null -[System.Runtime.Interopservices.Marshal]::ReleaseComObject($msi) | Out-Null -[System.Runtime.Interopservices.Marshal]::ReleaseComObject($windowsInstaller) | Out-Null - -Write-Host "Generating checksum (SHA1)..." -$checksum = Get-FileHash "$installerName.msi" -Algorithm SHA1 | Select-Object -ExpandProperty Hash -$checksumOutput = "$installerName - $checksum" -Out-File -InputObject $checksumOutput -FilePath "$installerName.sha1" - -Write-Host "Deleting temporary files..." -foreach($lcid in $lcids) { - $cultureInfo = New-Object system.globalization.cultureinfo($lcid) - $culture = $cultureInfo.TextInfo.CultureName - if (-Not ($culture -eq $mainCulture)) { - Remove-Item $lcid - } - - Remove-Item "$installerName-$culture.msi" -} - -Write-Host "Done!" diff --git a/src/mumble_exe/CMakeLists.txt b/src/mumble_exe/CMakeLists.txt index 0a11b7414..e420315db 100644 --- a/src/mumble_exe/CMakeLists.txt +++ b/src/mumble_exe/CMakeLists.txt @@ -45,3 +45,26 @@ endif() target_link_libraries(mumble_exe PRIVATE shlwapi.lib) install(TARGETS mumble_exe RUNTIME DESTINATION "${MUMBLE_INSTALL_EXECUTABLEDIR}" COMPONENT mumble_client) + +if(packaging) + set(overlay ON) + set(plugins ON) + + if(translations) + set(installer_vars "--all-languages") + endif() + + file(COPY + ${CMAKE_SOURCE_DIR}/installer/MumbleInstall.cs + ${CMAKE_SOURCE_DIR}/installer/ClientInstaller.cs + DESTINATION + ${CMAKE_BINARY_DIR}/installer/client + ) + + add_custom_command(TARGET mumble_exe + POST_BUILD + COMMAND cscs.exe -cd MumbleInstall.cs + COMMAND cscs.exe ClientInstaller.cs --version ${version_short} --arch ${ARCH} ${installer_vars} + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/installer/client + ) +endif() diff --git a/src/murmur/CMakeLists.txt b/src/murmur/CMakeLists.txt index dc09b606d..65a252b8f 100644 --- a/src/murmur/CMakeLists.txt +++ b/src/murmur/CMakeLists.txt @@ -325,12 +325,38 @@ if(ice) $ $ ) + + file(COPY "Murmur.ice" DESTINATION ${CMAKE_BINARY_DIR}) endif() install(TARGETS murmur RUNTIME DESTINATION "${MUMBLE_INSTALL_EXECUTABLEDIR}" COMPONENT mumble_server) +file(COPY "${CMAKE_SOURCE_DIR}/scripts/murmur.ini" DESTINATION ${CMAKE_BINARY_DIR}) + if(UNIX) # Install Murmur man files install(FILES "${CMAKE_SOURCE_DIR}/man/murmurd.1" DESTINATION "${MUMBLE_INSTALL_MANDIR}" COMPONENT doc) install(FILES "${CMAKE_SOURCE_DIR}/man/murmur-user-wrapper.1" DESTINATION "${MUMBLE_INSTALL_MANDIR}" COMPONENT doc) endif() + +if(packaging) + if(WIN32) + if(translations) + set(installer_vars "--all-languages") + endif() + + file(COPY + ${CMAKE_SOURCE_DIR}/installer/MumbleInstall.cs + ${CMAKE_SOURCE_DIR}/installer/ServerInstaller.cs + DESTINATION + ${CMAKE_BINARY_DIR}/installer/server + ) + + add_custom_command(TARGET murmur + POST_BUILD + COMMAND cscs.exe -cd MumbleInstall.cs + COMMAND cscs.exe ServerInstaller.cs --version ${version_short} --arch ${ARCH} ${installer_vars} + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/installer/server + ) + endif() +endif()