lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-25 00:15:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move linux vcpkg and vcpkg-ports installation files to a common unix directory

Browse Source 
These scripts are generic for both linux and macos, we may parameterize
them and reuse on both platforms.

Change-Id: Ia61cfbbf5c91e2135e38253c4a96605015d2d1b6
Reviewed-by: Alexey Edelev <semlanik@gmail.com>
This commit is contained in:
Alexey Edelev
2025-08-12 12:10:04 +02:00
committed by Joerg Bornemann
parent da911f9b20
commit 4456a7f592
27 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/shared/vcpkg_tool_release_tag.txt
View File

@@ -1,4 +1,4 @@
vcpkg_tool_release_tag=2025-09-03
windows_x64_checksum=4523B5B2CE77BD0F6DCA55140D831EA6EB03046D5F4496C85DF94AC1A7EFAB01
windows_arm64_checksum=1E8653243C0E7D73FF1F0F3F25A55C8154888F331510F9545AD200EDD3CCB962
linux_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed
unix_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed

4
coin/provisioning/common/linux/install-vcpkg-ports.sh → coin/provisioning/common/unix/install-vcpkg-ports.sh
View File

@@ -9,9 +9,9 @@ echo "Installing vcpkg ports"
pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
install_root=x64-linux-qt-tmp
install_root=$1-tmp
"$VCPKG_ROOT/vcpkg" install --triplet x64-linux-qt --x-install-root $install_root --debug
"$VCPKG_ROOT/vcpkg" install --triplet $1 --x-install-root $install_root --debug
cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\
"-DVCPKG_INSTALL_ROOT=$PWD/$install_root"\

4
coin/provisioning/common/linux/install-vcpkg.sh → coin/provisioning/common/unix/install-vcpkg.sh
View File

@@ -34,7 +34,7 @@ do
"vcpkg_tool_release_tag")
vcpkgToolReleaseTag=${keyValue[1]}
;;
"linux_checksum")
"unix_checksum")
vcpkgToolChecksum=${keyValue[1]}
;;
esac
@@ -86,7 +86,7 @@ SetEnvVar "VCPKG_ROOT" "$vcpkgRoot"
export VCPKG_ROOT="$vcpkgRoot"
# Set a source for vcpkg Binary and Asset Cache
# The `coin/provisioning/common/linux/mount-vcpkg-cache-drive.sh` script is
# The `coin/provisioning/common/<platform>/mount-vcpkg-cache-drive.sh` script is
# mounting the SMB share located in `vcpkg-server.ci.qt.io/vcpkg` to
# $HOME/vcpkg-cache/
export VCPKG_BINARY_SOURCES="files,$HOME/vcpkg-cache/binaries,readwrite"

2
coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-vcpkg.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg.sh"
"$BASEDIR/../common/unix/install-vcpkg.sh"

2
coin/provisioning/qtci-linux-RHEL-8.10-x86_64/42-install-vcpkg-ports.sh
View File

@@ -8,7 +8,7 @@ echo "ANDOID_NDK_HOME: ${ANDROID_NDK_HOME}"
# Installing common ports
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
# Installing platform specific ports
"$BASEDIR/../common/linux/install-vcpkg-ports-android.sh"

2
coin/provisioning/qtci-linux-RHEL-8.8-x86_64/41-install-vcpkg.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg.sh"
"$BASEDIR/../common/unix/install-vcpkg.sh"

2
coin/provisioning/qtci-linux-RHEL-8.8-x86_64/42-install-vcpkg-ports.sh
View File

@@ -8,7 +8,7 @@ echo "ANDOID_NDK_HOME: ${ANDROID_NDK_HOME}"
# Installing common ports
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
# Installing platform specific ports
"$BASEDIR/../common/linux/install-vcpkg-ports-android.sh"

2
coin/provisioning/qtci-linux-RHEL-9.2-x86_64/41-install-vcpkg.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg.sh"
"$BASEDIR/../common/unix/install-vcpkg.sh"

2
coin/provisioning/qtci-linux-RHEL-9.2-x86_64/42-install-vcpkg-ports.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt

2
coin/provisioning/qtci-linux-RHEL-9.4-x86_64/41-install-vcpkg.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg.sh"
"$BASEDIR/../common/unix/install-vcpkg.sh"

2
coin/provisioning/qtci-linux-RHEL-9.4-x86_64/42-install-vcpkg-ports.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt

2
coin/provisioning/qtci-linux-RHEL-9.6-x86_64/41-install-vcpkg.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg.sh"
"$BASEDIR/../common/unix/install-vcpkg.sh"

2
coin/provisioning/qtci-linux-RHEL-9.6-x86_64/42-install-vcpkg-ports.sh Normal file → Executable file
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt

2
coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/41-install-vcpkg.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg.sh"
"$BASEDIR/../common/unix/install-vcpkg.sh"

2
coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/42-install-vcpkg-ports.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt

2
coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/41-install-vcpkg.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg.sh"
"$BASEDIR/../common/unix/install-vcpkg.sh"

2
coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/42-install-vcpkg-ports.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt

2
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/41-install-vcpkg.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg.sh"
"$BASEDIR/../common/unix/install-vcpkg.sh"

2
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/42-install-vcpkg-ports.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt

2
coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/41-install-vcpkg.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg.sh"
"$BASEDIR/../common/unix/install-vcpkg.sh"

2
coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/42-install-vcpkg-ports.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt

2
coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/41-install-vcpkg.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg.sh"
"$BASEDIR/../common/unix/install-vcpkg.sh"

2
coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/42-install-vcpkg-ports.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt

2
coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/41-install-vcpkg.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg.sh"
"$BASEDIR/../common/unix/install-vcpkg.sh"

2
coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/42-install-vcpkg-ports.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt

2
coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/41-install-vcpkg.sh Normal file → Executable file
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg.sh"
"$BASEDIR/../common/unix/install-vcpkg.sh"

2
coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/42-install-vcpkg-ports.sh Normal file → Executable file
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt