Now that we reached build number 10 the current expression is not valid anymore.
As a result, the version is not set and the build fails.
This commit rewrites the regex so that it accepts multiple digits and is also shorter.
Co-Authored-By: Jan Klass <kissaki@posteo.de>
This commit:
- Adds null checks and error messages for "--arch" and "--version" to WixSharp projects.
- Sets cabinet file name to "Mumble.cab", for consistency with our previous installers.
- Cleans up ClientInstaller.
- Fixes regex patterns for string input safety and to simplify conditions.
Since the ini file would be removed or overwritten by installs,
upgrades, and uninstalls it should be created at app runtime or manually
copied to the install path after install.
Remove CPack and previous WiX installer projects and sources
Add toolset and for WixSharp to facilitate client and server builds
individually or collectively.
Add multilanguage build with packaging=ON and translations=ON, and
standard build with packaging=ON. Builds are also aware of client and
server option settings.
Add correct LICENSE to installer
Mainting 2 README files that should basically contain the same content
is very error prone in case someone edits one and forgets about the
other.
Thus the Windows installer will now ship the markdown version of the
README as well. It should still be readable - just a little less pretty
if no Markdown-viewer is available.
CELT 0.11.0 provides better quality in comparison to CELT 0.7.0, but the two versions of the codecs are not compatible, which is why we provided both of them.
Opus was introduced in Mumble 1.2.4 (7586a61226), thus we expect that most (if not all) users are using it.
By removing CELT 0.11.0 we don't break backwards compatibility, because it's provided by CELT 0.7.0.
The main reason for removing the codec is the fact that its discontinued (in favor of Opus).
Also, CELT 0.11.0 was removed from the Debian package back in 2012: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682010
1.3.0 has been released. master now represents the current state of
development towards the next feature release 1.4.0.
Bugfixes for 1.3 will happen in the 1.3.x branch.
Compared to earlier version bumps we bump a lot more files because of
we produce more artifacts; overlay process, dll and exe split, etc.
This should have happened right after the 1.3.x branch was split off.
Fixes#3761
Waiting on response from xPoke in that ticket concerning theme version. That will have to be landed first, and then this PR updated with the landed commit in mumble-theme.
Feel free to already review independent of xPoke response.
As the mumble-theme commit did not land yet checking out this PR will not work (for others than me who has the commit locally).
1.3.0 has been released. master now represents the current state of
development towards the next feature release 1.4.0.
Bugfixes for 1.3 will happen in the 1.3.x branch.
Compared to earlier version bumps we bump a lot more files because of
we produce more artifacts; overlay process, dll and exe split, etc.
This should have happened right after the 1.3.x branch was split off.
Modify the following entry
<String Id="MUMBLE_CREATE_SHORTCUT">创建桌面快捷方式</String>
<String Id="MUMBLE_CREATE_SHORTCUT">Create Desktop Shortcut</String>
<String Id="DESC_SectionBonjour">Bonjour现在可以在您的网络上报告和发现Murmur服务器。是否下载并运行Bonjour安装程序。</String>
<String Id="DESC_SectionBonjour">Bonjour enables announcement and discovery of Murmur servers on your LAN. This will download and run the Bonjour installer.</String>
<String Id="MUMBLE_SEC_DesktopShortcut">桌面快捷方式</String>
<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">创建桌面快捷方式</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>
This reverts commit 3d4663465e.
That commit was done because of reports that stale files from
old versions of Mumble were left behind. In particular, in
the "Versions" subdirectory.
I just tested this locally, and I can't reproduce that problem.
Reverting this commit should hopefully resolve a lot issues
such as:
mumble-voip/mumble#2901mumble-voip/mumble#1917mumble-voip/mumble#1845mumble-voip/mumble#1700
Perhaps more.
Only older versions of dbghelp.dll are redistributable by themselves.
Newer versions only allow redistribution via MSI files, which are
useless for us.
To sidestep this problem, we'll simply go back to relying on the OSes
version of dbghelp.dll. Shipping an outdated version of dbghelp.dll
isn't sensible. We're better off allowing Windows 10 to use a modern
(its own) version of dbghelp.dll than using a year-old version.
To give some context on how we use dbghelp.dll:
In Mumble, we use dbghelp.dll for writing our Minidumps.
In Murmur, Ice uses it for symbolicating stack traces in
Ice exceptions.
MSVC2015 uses a new CRT called the Universal CRT.
This CRT is distributed in different ways, depending on your
OS.
For Windows XP, the official distribution is a VCRedist installer.
(Or, for Windows XP only -- merge modules).
For Vista through 8.1, UCRT is distributed via Windows Update.
For Windows 10, it's shipped as part of Windows.
This commit amends our installer to install an app-local copy of
the Universal CRT. This is the sanest way for us to distribute the
Universal CRT across all supported targets.
Even if we could drop Windows XP support, the fact that earlier
Windows versions deploy the Universal CRT through Windows Update
makes it a hard pill to swallow. People's hacked up machines might
not be able to get the update from Windows Update for whatever reason.
(Maybe they disabled the Windows Update service for performance reasons,
because a guide on the web told them to?)
So, for now, this is what we'll do. Perhaps it makes more sense to
statically link the UCRT instead of this massive soup of DLLs. But
this is a quick fix to keep our snapshots going until we can work
out the details for statically linking UCRT.
Note: Because Murmur is outside the versioned root-dir, we ship a
separate CRT copy for Murmur. Now that we have to ship the UCRT as
well, that's suddenly a lot more files we'll have to carry. That's
also an unfortunate side-effect of the UCRT. But if you look at it
from the perspective that shipping the VCRUNTIME+UCRT on MSVC2015
"the same thing" as shipping MSVCRT on MSVC2013, we're not really
doing anything much different. Except, we're being "punished" by
the fact that Microsoft decided to split up the CRT into tiny pieces.
Future work: Ideally, we wouldn't include these .wxi files in the
repo, and instead depend on gen-ucrt.py being run before building
the installer. However, that would require buildenv changes, and
require us to redeploy buildenvs, which takes time. To get the UCRT
fix out into a snapshot, let's add them to the repo for now, and we
can clean it up later.
This uses the mechanism documented at
http://wixtoolset.org/documentation/manual/v3/msbuild/daily_builds.html
to use a local copy of WiX instead of using the WiX MSI package.
Previously, we required people to install WiX globally.
That's yet another tedious dependency required in order to build Mumble.
We'll now be distributing WiX in our buildenvs, so tell our .wixproj
to use that version.
I accidently neglected to rename this one instance to the new name in
MSVC2015. (The "msvcr" file is now "vcruntime".)
The rest of the references should be OK.
