mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-17 01:36:32 +08:00
Unify the vcpkg manifest location
There is not particular reason to hold multiple manifests for the vcpkg for different platforms, since we expect that the direct dependency set that is used from vcpkg will remain the same on each platform. Keeping copies of the vcpkg manifest doesn't make much sense. The vcpkg manifest and configuration file are now in the coin/provisioning/common/shared/vcpkg directory. Change-Id: Icc9c88592c68cb591216f3d0668f9984592d6c7b Reviewed-by: Simo Fält <simo.falt@qt.io>
This commit is contained in:
committed by
Joerg Bornemann
parent
406dca5bf3
commit
da911f9b20
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -5,5 +5,5 @@
|
||||
"repository": "https://git.qt.io/aledelev/vcpkg",
|
||||
"baseline": "9c5c2a0ab75aff5bcd08142525f6ff7f6f7ddeee"
|
||||
},
|
||||
"overlay-triplets": [ "./../../shared/triplets" ]
|
||||
"overlay-triplets": [ "./../triplets" ]
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
{
|
||||
"overrides": [
|
||||
{
|
||||
"name": "openssl",
|
||||
"version": "3.0.7",
|
||||
"port-version": 2
|
||||
}
|
||||
],
|
||||
"dependencies": [
|
||||
"openssl",
|
||||
"protobuf",
|
||||
"grpc"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user