diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-27 17:02:18 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-06 06:25:50 +0100 |
commit | e1bc1c4885b709b0dee1766019a3562f00994d8f (patch) | |
tree | dcc3b81300fc178b3202f65d5022101918fd923f /coin | |
parent | 2a405a8df3a6acbc905a3242e14a399eea98e512 (diff) |
Remove vcpkg provisioning and configure arguments
Now that qtbase supports building bundled 3rd party libraries, we
should have no need for vcpkg in Coin anymore.
Change-Id: I7aa7b0323416b60ffb0cd70eec287e5f25963d9a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin')
-rw-r--r-- | coin/platform_configs/qtbase.yaml | 4 | ||||
-rw-r--r-- | coin/platform_configs/qtsvg.yaml | 4 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/vcpkg.sh | 73 | ||||
-rw-r--r-- | coin/provisioning/common/shared/vcpkg_version.txt | 1 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-vcpkg.ps1 | 69 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh | 5 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 | 2 |
7 files changed, 4 insertions, 154 deletions
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index f78aa52e..5a36e2c9 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -40,7 +40,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' + Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -52,4 +52,4 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DVCPKG_TARGET_TRIPLET=arm64-android -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU'] diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index a2ac4e29..dc6897dd 100644 --- a/coin/platform_configs/qtsvg.yaml +++ b/coin/platform_configs/qtsvg.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' + Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -27,4 +27,4 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DVCPKG_TARGET_TRIPLET=arm64-android -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU'] diff --git a/coin/provisioning/common/linux/vcpkg.sh b/coin/provisioning/common/linux/vcpkg.sh deleted file mode 100755 index 35f2ece8..00000000 --- a/coin/provisioning/common/linux/vcpkg.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -ex - -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -# This script installs VcPkg. It is used to provide third-party libraries when cross-compiling -# for example for Emscripten or Android. - -# Refresh to make sure we have the EMSCRIPTEN environment variable, needed for the vcpkg wasm build. -source ~/.bashrc - -source "${BASH_SOURCE%/*}/../shared/vcpkg_version.txt" - -officialUrl="https://codeload.github.com/tronical/vcpkg/tar.gz/$vcpkg_version" -targetFile="vcpkg.tar.gz" -targetFolder="$HOME/vcpkg" - -wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$officialUrl" - -if [ ! -d "${targetFolder}" ]; then - mkdir -p $targetFolder -fi - -tar -C $targetFolder --strip-components=1 -xvzf $targetFile -rm -rf $targetFile - -SetEnvVar "VCPKG_ROOT" "$targetFolder" - -cd $targetFolder -./bootstrap-vcpkg.sh - -./vcpkg install --triplet arm-android @qt-packages-android.txt -./vcpkg install --triplet arm64-android @qt-packages-android.txt -./vcpkg install --triplet x86-android @qt-packages-android.txt -./vcpkg install --triplet x64-android @qt-packages-android.txt - -rm -rf packages buildtrees downloads - -echo "VCPKG = $vcpkg_version" >> ~/versions.txt diff --git a/coin/provisioning/common/shared/vcpkg_version.txt b/coin/provisioning/common/shared/vcpkg_version.txt deleted file mode 100644 index 7bff414a..00000000 --- a/coin/provisioning/common/shared/vcpkg_version.txt +++ /dev/null @@ -1 +0,0 @@ -vcpkg_version=qt-snapshot-2019-12-05 diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 deleted file mode 100644 index 52f1518f..00000000 --- a/coin/provisioning/common/windows/install-vcpkg.ps1 +++ /dev/null @@ -1,69 +0,0 @@ -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# -. "$PSScriptRoot\helpers.ps1" - -# This script will install vcpkg - -Write-Host "Installing vcpkg" - -$n = Get-Content "$PSScriptRoot\..\shared\vcpkg_version.txt" -$n = $n.Split('=') -New-Variable -Name $n[0] -Value $n[1] - -$officialUrl = "https://codeload.github.com/tronical/vcpkg/zip/$vcpkg_version" -$zip = "C:\Utils\vcpkg.zip" - -Download "$officialUrl" "" "$zip" -Extract-7Zip "$zip" c:\utils -Remove-Item $zip - -$installationFolder = "c:\utils\vcpkg-$vcpkg_version" - -cd $installationFolder - -cmd /c bootstrap-vcpkg.bat - -if(![System.IO.File]::Exists("$installationFolder\vcpkg.exe")){ - Write-Host "Can't find $installationFolder\vcpkg.exe. Installation probably failed!" - exit 1 -} - -Set-EnvironmentVariable VCPKG_DEFAULT_TRIPLET "qt-x64-windows-static" -Set-EnvironmentVariable VCPKG_ROOT "$installationFolder" - -cmd /c $installationFolder\vcpkg.exe install --triplet qt-x64-windows-static @qt-packages-windows.txt -cmd /c $installationFolder\vcpkg.exe install --triplet qt-x86-windows-static @qt-packages-windows.txt - -Remove-Item -Recurse -Force packages -Remove-Item -Recurse -Force buildtrees -Remove-Item -Recurse -Force downloads diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh deleted file mode 100755 index 5c7f3f1d..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -"$(dirname "$0")/../common/linux/vcpkg.sh" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 deleted file mode 100644 index c898da22..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-vcpkg.ps1" - |