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/.ci
diff options
context:
space:
mode:
authorNik Reist <zeroability@tutanota.com>2020-11-08 06:26:44 +0300
committerNik Reist <zeroability@tutanota.com>2020-12-12 06:07:25 +0300
commit88e17868493b7e08fe3339069c11cbc5c39e62e5 (patch)
tree36e49efb3b97795eaf978e4a25a536a6f9734fd8 /.ci
parent919f1f7a3f489a1d43475b07b6ae35196889c474 (diff)
REFAC(installer-msi) Simplify WiX component 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
Diffstat (limited to '.ci')
-rw-r--r--.ci/azure-pipelines/build_windows.bat12
-rw-r--r--.ci/azure-pipelines/install-environment_windows.ps114
-rw-r--r--.ci/azure-pipelines/steps_windows.yml8
3 files changed, 22 insertions, 12 deletions
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'