diff options
| author | Nik Reist <zeroability@tutanota.com> | 2021-01-10 04:02:10 +0300 |
|---|---|---|
| committer | Davide Beatrici <git@davidebeatrici.dev> | 2021-01-10 04:02:12 +0300 |
| commit | e845f51220f4942f314295a4f0a35e5578031856 (patch) | |
| tree | 0549936235b179e17778a6164e0ad62d31c27a1c /src/murmur | |
| parent | 41bbab9e8b9014bcb5925c102c5d9e62c856b70b (diff) | |
FEAT(installer): Add support for snapshot builds
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.
Diffstat (limited to 'src/murmur')
| -rw-r--r-- | src/murmur/CMakeLists.txt | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/murmur/CMakeLists.txt b/src/murmur/CMakeLists.txt index 70d3168f3..2eefca6c5 100644 --- a/src/murmur/CMakeLists.txt +++ b/src/murmur/CMakeLists.txt @@ -342,20 +342,25 @@ endif() if(packaging) if(WIN32) if(translations) - set(installer_vars "--all-languages") + list(APPEND 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 + + list(APPEND installer_vars + "--version" ${PROJECT_VERSION} + "--arch" ${ARCH} + ) + + 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 ${PROJECT_VERSION} --arch ${ARCH} ${installer_vars} + COMMAND cscs.exe ServerInstaller.cs ${installer_vars} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/installer/server ) endif() |