diff options
| author | Robert Adam <dev@robert-adam.de> | 2021-01-11 10:51:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 10:51:53 +0300 |
| commit | f6e997e1e20c7228da88f0a9a7703f46320f02ed (patch) | |
| tree | 3ae35cd413992f6e66af49ed0e6d11604ba43dd6 /scripts | |
| parent | c331322552dc3fe31d0350caa95311ba140d2e4e (diff) | |
| parent | 6b7897c7e5c95ae728af3f092121f9cc685ab3ed (diff) | |
Merge pull request #4675: BUILD(vcpkg) Fix --clean-after-build issue affecting qt5-base
The following changes were performed:
- Modify function to accept a string array param
- Add mdnsresponder to the packages array
- Remove individual package installs affected by previous --clean-after-build issue
- Remove iterator that installs packages independently
- Remove unneeded double quotes for variables
- Remove opus as it is supplied via submodule
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/vcpkg/get_mumble_dependencies.ps1 | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/scripts/vcpkg/get_mumble_dependencies.ps1 b/scripts/vcpkg/get_mumble_dependencies.ps1 index f821fa14a..0b3b31ec1 100644 --- a/scripts/vcpkg/get_mumble_dependencies.ps1 +++ b/scripts/vcpkg/get_mumble_dependencies.ps1 @@ -6,29 +6,30 @@ $mumble_deps = "qt5-base", "qt5-tools",
"grpc",
"boost-accumulators",
- "opus",
"poco",
"libvorbis",
"libogg",
"libflac",
"libsndfile",
"libmariadb",
- "zlib",
+ "mdnsresponder",
+ "zlib",
"zeroc-ice"
$ErrorActionPreference = 'Stop'
function vcpkg_install {
Param(
- [string] $package,
+ [string[]] $packages,
+
[string] $targetTriplet,
[switch] $cleanAfterBuild = $false
)
if ($cleanAfterBuild) {
- ./vcpkg.exe install "$package" --triplet "$targetTriplet" --clean-after-build
+ ./vcpkg.exe install $packages --triplet $targetTriplet --clean-after-build
} else {
- ./vcpkg.exe install "$package" --triplet "$targetTriplet"
+ ./vcpkg.exe install $packages --triplet $targetTriplet
}
if (-not $?) {
@@ -65,23 +66,14 @@ try { ./bootstrap-vcpkg.bat -disableMetrics
}
- vcpkg_install -package mdnsresponder -targetTriplet $triplet
- vcpkg_install -package icu -targetTriplet $triplet
-
if ($Env:PROCESSOR_ARCHITECTURE -eq "AMD64") {
Write-Host "Installing cross compile packages..."
- vcpkg_install -package boost-optional:$xcompile_triplet -targetTriplet $xcompile_triplet -cleanAfterBuild
+ vcpkg_install -package boost-optional -targetTriplet $xcompile_triplet -cleanAfterBuild
}
Write-Host "Beginning package install..."
- foreach ($dep in $mumble_deps) {
- Write-Host("---------------------------------------")
- Write-Host("> Installing Mumble dependency $dep ...")
- Write-Host("---------------------------------------")
-
- vcpkg_install -package $dep -targetTriplet $triplet -cleanAfterBuild
- }
+ vcpkg_install -package $mumble_deps -targetTriplet $triplet -cleanAfterBuild
}
} catch {
# rethrow
|