diff --git a/coin/provisioning/common/linux/install-vcpkg-ports-android.sh b/coin/provisioning/common/linux/install-vcpkg-ports-android.sh index 5e0677f8..b946e17f 100755 --- a/coin/provisioning/common/linux/install-vcpkg-ports-android.sh +++ b/coin/provisioning/common/linux/install-vcpkg-ports-android.sh @@ -4,9 +4,7 @@ echo "Installing vcpkg android ports" -pushd "${BASH_SOURCE%/*}/vcpkg" || exit -cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" . - +pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit "$VCPKG_ROOT/vcpkg" install --triplet x86-android-qt --x-install-root x86-android-qt-tmp --debug "$VCPKG_ROOT/vcpkg" install --triplet x86_64-android-qt --x-install-root x86_64-android-qt-tmp --debug diff --git a/coin/provisioning/common/linux/install-vcpkg-ports.sh b/coin/provisioning/common/linux/install-vcpkg-ports.sh index d223429c..9c8875ee 100755 --- a/coin/provisioning/common/linux/install-vcpkg-ports.sh +++ b/coin/provisioning/common/linux/install-vcpkg-ports.sh @@ -7,8 +7,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" echo "Installing vcpkg ports" -pushd "${BASH_SOURCE%/*}/vcpkg" || exit -cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" . +pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit install_root=x64-linux-qt-tmp diff --git a/coin/provisioning/common/shared/vcpkg-configuration.json b/coin/provisioning/common/shared/vcpkg/vcpkg-configuration.json similarity index 84% rename from coin/provisioning/common/shared/vcpkg-configuration.json rename to coin/provisioning/common/shared/vcpkg/vcpkg-configuration.json index 65057d09..6deaacf9 100644 --- a/coin/provisioning/common/shared/vcpkg-configuration.json +++ b/coin/provisioning/common/shared/vcpkg/vcpkg-configuration.json @@ -5,5 +5,5 @@ "repository": "https://git.qt.io/aledelev/vcpkg", "baseline": "9c5c2a0ab75aff5bcd08142525f6ff7f6f7ddeee" }, - "overlay-triplets": [ "./../../shared/triplets" ] + "overlay-triplets": [ "./../triplets" ] } diff --git a/coin/provisioning/common/linux/vcpkg/vcpkg.json b/coin/provisioning/common/shared/vcpkg/vcpkg.json similarity index 100% rename from coin/provisioning/common/linux/vcpkg/vcpkg.json rename to coin/provisioning/common/shared/vcpkg/vcpkg.json diff --git a/coin/provisioning/common/windows/install-vcpkg-ports-android.ps1 b/coin/provisioning/common/windows/install-vcpkg-ports-android.ps1 index 1f4656e2..8ab614cc 100644 --- a/coin/provisioning/common/windows/install-vcpkg-ports-android.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg-ports-android.ps1 @@ -7,9 +7,7 @@ $vcpkgExe = "$env:VCPKG_ROOT\vcpkg.exe" $vcpkgRoot = "$env:VCPKG_ROOT" $vcpkgInstallRoot = "armeabi-v7a-android-qt-tmp" -Set-Location -Path "$PSScriptRoot\vcpkg" -Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg" - +Set-Location -Path "$PSScriptRoot\..\shared\vcpkg" Run-Executable "$vcpkgExe" "install --triplet armeabi-v7a-android-qt --x-install-root $vcpkgInstallRoot --debug" New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force diff --git a/coin/provisioning/common/windows/install-vcpkg-ports.ps1 b/coin/provisioning/common/windows/install-vcpkg-ports.ps1 index 07761095..79f9ea3f 100644 --- a/coin/provisioning/common/windows/install-vcpkg-ports.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg-ports.ps1 @@ -10,9 +10,7 @@ $vcpkgExe = "$env:VCPKG_ROOT\vcpkg.exe" $vcpkgRoot = "$env:VCPKG_ROOT" $vcpkgInstallRoot = "$arch-windows-qt-tmp" -Set-Location -Path "$PSScriptRoot\vcpkg" -Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg" - +Set-Location -Path "$PSScriptRoot\..\shared\vcpkg" Run-Executable "$vcpkgExe" "install --triplet $arch-windows-qt --x-install-root $vcpkginstallroot --debug" New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force diff --git a/coin/provisioning/common/windows/vcpkg/vcpkg.json b/coin/provisioning/common/windows/vcpkg/vcpkg.json deleted file mode 100644 index 20fa590c..00000000 --- a/coin/provisioning/common/windows/vcpkg/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "overrides": [ - { - "name": "openssl", - "version": "3.0.7", - "port-version": 2 - } - ], - "dependencies": [ - "openssl", - "protobuf", - "grpc" - ] -}