MAINT(build): Modify helper folder and scripts to use custom zeroc-ic…

…e port
mumble-voip · Apr 15, 2022 · 4a533fa · 4a533fa
1 parent 0c2e398
commit 4a533fa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/helpers/vcpkg/ports/zeroc-ice/CONTROL → helpers/vcpkg/ports/zeroc-ice-mumble/CONTROL b/helpers/vcpkg/ports/zeroc-ice/CONTROL → helpers/vcpkg/ports/zeroc-ice-mumble/CONTROL
@@ -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.

diff --git a/helpers/vcpkg/ports/zeroc-ice/portfile.cmake → ...pkg/ports/zeroc-ice-mumble/portfile.cmake b/helpers/vcpkg/ports/zeroc-ice/portfile.cmake → ...pkg/ports/zeroc-ice-mumble/portfile.cmake
diff --git a/scripts/vcpkg/get_mumble_dependencies.ps1 b/scripts/vcpkg/get_mumble_dependencies.ps1
@@ -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

diff --git a/scripts/vcpkg/get_mumble_dependencies.sh b/scripts/vcpkg/get_mumble_dependencies.sh
@@ -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 ]