Merge PR #5625: MAINT(build): Modify helper folder and scripts to use custom zeroc-ice port

This commit is contained in:
Davide Beatrici 2022-04-16 19:59:00 +02:00 committed by GitHub
commit cdffda8f52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
Source: zeroc-ice
Source: zeroc-ice-mumble
Version: 3.7.3
Homepage: https://github.com/zeroc-ice/ice
Description: Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.

View File

@ -19,7 +19,7 @@ $mumble_deps = "qt5-base",
"libmariadb",
"mdnsresponder",
"zlib",
"zeroc-ice"
"zeroc-ice-mumble"
$ErrorActionPreference = 'Stop'
@ -59,9 +59,9 @@ try {
}
if (Test-Path $vcpkgdir) {
if (-not (Test-Path $vcpkgdir/ports/zeroc-ice)) {
Write-Host "Adding ports for ZeroC Ice..."
Copy-Item -Path $PSScriptRoot/../../helpers/vcpkg/ports/zeroc-ice -Destination $vcpkgdir/ports -Recurse
if (-not (Test-Path $vcpkgdir/ports/zeroc-ice-mumble)) {
Write-Host "Adding port for ZeroC Ice..."
Copy-Item -Path $PSScriptRoot/../../helpers/vcpkg/ports/zeroc-ice-mumble -Destination $vcpkgdir/ports -Recurse
}
cd $vcpkgdir

View File

@ -53,7 +53,7 @@ mumble_deps='qt5-base,
libsndfile,
libmariadb,
zlib,
zeroc-ice'
zeroc-ice-mumble'
# Determine vcpkg triplet from OS https://github.com/Microsoft/vcpkg/blob/master/docs/users/triplets.md
# Available triplets can be printed with `vcpkg help triplet`
@ -74,7 +74,7 @@ fi
if [ -d "$VCPKGDIR" ]
then
# copy ZeroC Ice port files
cp -R helpers/vcpkg/ports/zeroc-ice $VCPKGDIR/ports
cp -R helpers/vcpkg/ports/zeroc-ice-mumble $VCPKGDIR/ports
cd $VCPKGDIR
if [ ! -x $VCPKGDIR/vcpkg ]