From bc14adc8317e75ed58f25b255eed95ac93141ea5 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 6 Mar 2019 10:58:55 +0100 Subject: Shrink build configurations and modules This change disables all modules except qtbase from the build and also reduces the build to one configuration. This is not intended to be merged back to qt5/dev but rather a starting point to build up cmake builds in the CI platform by platform and module by module. Change-Id: I899da885dacb32188a0d02b2301df3d4450c0589 Reviewed-by: Alexandru Croitor Reviewed-by: Tobias Hunger --- coin/platform_configs/default.txt | 27 +-------------------------- coin/platform_configs/qt5.txt | 22 ---------------------- coin/platform_configs/qtbase.txt | 7 ------- 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 coin/platform_configs/qt5.txt delete mode 100644 coin/platform_configs/qtbase.txt (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 90095639..0b81d97d 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,28 +1,3 @@ Template Target OS Target arch Compiler Target Compiler Features ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples -qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation -qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch -qtci-linux-openSUSE-15.0-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite -qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests -qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo -qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release -qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch -qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests -qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release -qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC Release DisableTests -qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck -qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt deleted file mode 100644 index 3de18a74..00000000 --- a/coin/platform_configs/qt5.txt +++ /dev/null @@ -1,22 +0,0 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt deleted file mode 100644 index edaf168f..00000000 --- a/coin/platform_configs/qtbase.txt +++ /dev/null @@ -1,7 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo -qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests - -- cgit v1.2.3 From 36f7ccc586e41180889de9ecfe64d473a3e2e53e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 12 Feb 2019 10:54:16 +0100 Subject: Cmake: install latest 3.14.0-rc3 packages on Linux Change-Id: I5d88ac6c9180c24538de7c386d026f2d6547ccf4 Reviewed-by: Alexandru Croitor --- coin/provisioning/common/linux/cmake_linux.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 2b8d71d0..4a773c43 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -33,7 +33,7 @@ ## ############################################################################# -# This script installs CMake 3.6.2 +# This script installs CMake # CMake is needed for autotests that verify that Qt can be built with CMake @@ -42,10 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="3.6.2" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" -SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +majorminorversion="3.14" +version="3.14.0-rc3" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" +SHA1="4dcd279a90aa7522c9a1d4be11b86395c5d1c729" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" -- cgit v1.2.3 From d9bf3742ad11eda2345053e651f01d884791e187 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 13 Mar 2019 15:48:43 +0100 Subject: Add double-conversion to the list of installed packages This external dependency is now required by QtCore on Linux. Change-Id: I910a3e17ec4d6c10ad4e1a9dfc31d1340fe110de Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index f0585186..509c6747 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -166,6 +166,8 @@ installPackages+=(git-lfs) installPackages+=(chrpath) installPackages+=(gawk) installPackages+=(texinfo) +# Needed for QtCore +installPackages+=(libdouble-conversion-dev) echo "Running update for apt" waitLoop -- cgit v1.2.3 From 7343e226d42c8425577a26d161ac9d9738571548 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 15 Mar 2019 10:54:00 +0100 Subject: Provisioning: build cmake from source Change-Id: I6b4006250a7e019d7c38eaf3c29ae75a3a65300c Reviewed-by: Alexandru Croitor Reviewed-by: Simon Hausmann --- coin/provisioning/common/unix/install_cmake.sh | 70 ++++++++++++++++++++++ .../qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh | 5 -- .../40-install-cmake.sh | 5 ++ 3 files changed, 75 insertions(+), 5 deletions(-) create mode 100755 coin/provisioning/common/unix/install_cmake.sh delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh (limited to 'coin') diff --git a/coin/provisioning/common/unix/install_cmake.sh b/coin/provisioning/common/unix/install_cmake.sh new file mode 100755 index 00000000..1e33c007 --- /dev/null +++ b/coin/provisioning/common/unix/install_cmake.sh @@ -0,0 +1,70 @@ +#!/usr/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +set -ex + +# This script will install Cmake + +version="e1af2489fda9129e735007a069fae018c4ab3431" +sha1="357ad8003b30ec23037b59b750b96a75e52f78bb" +internalUrl="http://ci-files01-hki.intra.qt.io/input/cmake/CMake-$version.zip" +externalUrl="https://codeload.github.com/Kitware/CMake/zip/$version" + +targetDir="$HOME/CMake-$version" +targetFile="$targetDir.zip" +installFolder="$HOME" +cmakeHome="$HOME/cmake" +DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile" +unzip "$targetFile" -d "$HOME" +sudo rm "$targetFile" + +echo "Configuring and building cmake" +cd "$targetDir" +if uname -a |grep -qv Darwin; then + ./bootstrap --prefix="$cmakeHome" + make + make install +fi + +sudo rm -r "$targetDir" + +SetEnvVar "PATH" "$cmakeHome/bin:\$PATH" + +echo "CMake = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh deleted file mode 100755 index db8a3ff5..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/cmake_linux.sh" - diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh new file mode 100755 index 00000000..0d799bff --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install_cmake.sh" + -- cgit v1.2.3 From 38b6cbfd4261433548674aa4d109fff8a007c636 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 15 Mar 2019 22:29:35 +0100 Subject: Provisioning: Add pcre2 to the list of installed packages This external dependency is now required by QtCore on Linux. Change-Id: I47ba758e86e110c33f9e2bc7607ff9352892470a Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 509c6747..15b8397b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -168,6 +168,7 @@ installPackages+=(gawk) installPackages+=(texinfo) # Needed for QtCore installPackages+=(libdouble-conversion-dev) +installPackages+=(libpcre2-dev) echo "Running update for apt" waitLoop -- cgit v1.2.3 From 05eaaeda4b8c34b1df44e8427d364263e91a4cb6 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 18 Mar 2019 09:11:23 +0100 Subject: Add macOS 10.13 to test cmake build Change-Id: I676db571d3a14f2abd823d41905b95a070c66f59 Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 0b81d97d..d6e936a8 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,3 +1,4 @@ Template Target OS Target arch Compiler Target Compiler Features ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests +qtci-macos-10.13-x86_64-2 Clang DisableTests -- cgit v1.2.3 From 8b0a10d1c1030739045b085e4084861d477fed3d Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 18 Mar 2019 13:16:13 +0100 Subject: Provisioning: build cmake from source on macOS 10.13 Change-Id: Ifada0cf62d1e75e8cab3e3bbe6250718747d0703 Reviewed-by: Alexandru Croitor --- coin/provisioning/common/unix/install_cmake.sh | 12 +++++++----- coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh | 6 ------ .../provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh | 6 ++++++ 3 files changed, 13 insertions(+), 11 deletions(-) delete mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh (limited to 'coin') diff --git a/coin/provisioning/common/unix/install_cmake.sh b/coin/provisioning/common/unix/install_cmake.sh index 1e33c007..e76d2c6d 100755 --- a/coin/provisioning/common/unix/install_cmake.sh +++ b/coin/provisioning/common/unix/install_cmake.sh @@ -57,14 +57,16 @@ sudo rm "$targetFile" echo "Configuring and building cmake" cd "$targetDir" -if uname -a |grep -qv Darwin; then +if uname -a |grep -q Darwin; then + ./bootstrap --prefix="$(xcrun --sdk macosx --show-sdk-path)/usr/local" + SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin" +else ./bootstrap --prefix="$cmakeHome" - make - make install + SetEnvVar "PATH" "$cmakeHome/bin:\$PATH" fi +make +sudo make install sudo rm -r "$targetDir" -SetEnvVar "PATH" "$cmakeHome/bin:\$PATH" - echo "CMake = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh deleted file mode 100755 index 4f4d405e..00000000 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/cmake.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh new file mode 100755 index 00000000..a87667fe --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install_cmake.sh" -- cgit v1.2.3 From 705696e1d151b4d3ff1d0f74d2ee852ef2b6300f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 19 Mar 2019 15:09:01 +0100 Subject: Provisioning: Add pcre2 to the list of installed packages This external dependency is now required by QtCore on macOS. Change-Id: I4eef98e8e54f00861c1e9469dfbac61979d652e8 Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh (limited to 'coin') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh new file mode 100755 index 00000000..f8af516b --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install pcre2 -- cgit v1.2.3 From cb860d794d4f79f1d371e893788139061fdac055 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 20 Mar 2019 13:52:36 +0100 Subject: Provisioning: Add freetype to the list of installed packages on macOS Change-Id: Ic2df763fc027e3a588723a37a70354d3becc29a6 Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh (limited to 'coin') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh new file mode 100755 index 00000000..0faec4b4 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install freetype -- cgit v1.2.3 From ad2f91e41476f68f8426b902c0ee4593b7e662d4 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 29 Mar 2019 13:41:54 +0100 Subject: Provisioning: Add Windows 10+MSVC2017 to test cmake build Change-Id: I7acd16f12ed0e5d0fb7a9961c9099b9e4f1a2401 Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index d6e936a8..3867956a 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,3 +2,4 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests qtci-macos-10.13-x86_64-2 Clang DisableTests +qtci-windows-10-x86_64-14 MSVC2017 DisableTests -- cgit v1.2.3 From 4c655a140b55502179e69930c019bbb4abb3271a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 1 Apr 2019 08:53:27 +0200 Subject: Provisioning: install latest cmake - 3.14.1 on Windows Change-Id: I461589be02c26e048d5975d59600376022d728fd Reviewed-by: Alexandru Croitor --- coin/provisioning/common/windows/cmake.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index ec84d706..1c19c980 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## 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. @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.6" -$version = "3.6.2" +$majorminorversion = "3.14" +$version = "3.14.1" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" +Verify-Checksum $zip "C1626FD07B09C76736F5AC9DA7B4374919EB9964" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 21604cf7da1e9645cec1b944d413a27b3e420193 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 2 Apr 2019 10:48:34 +0200 Subject: Provisioning: install vcpkg and some packages on Windows 10 Change-Id: Ib8ba5b30ebcfb5e66ce5de65c9287807943d7166 Reviewed-by: Alexandru Croitor --- coin/provisioning/common/windows/install-vcpkg.ps1 | 65 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/90-install-vcpkg.ps1 | 2 + 2 files changed, 67 insertions(+) create mode 100644 coin/provisioning/common/windows/install-vcpkg.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 (limited to 'coin') diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 new file mode 100644 index 00000000..673274da --- /dev/null +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -0,0 +1,65 @@ +############################################################################# +## +## 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 + +$version = "08ad9d88ecabf9f8111bd4df0ca74723550503cd" +$sha1 = "43b471aebc2f46bee00c86710d0311ef6fb7bb19" +$officialUrl = "https://codeload.github.com/liangqi/vcpkg/zip/qt" +$cachedUrl = "http://ci-files01-hki.ci.local/input/vcpkg/vcpkg-$version.zip" +$zip = "C:\Utils\vcpkg-$version.zip" +$installationFolder = "C:\Utils\vcpkg" + +Write-Host "Installing vcpkg" +Download "$officialUrl" "$cachedUrl" "$zip" +Verify-Checksum "$zip" "$sha1" +Extract-7Zip "$zip" C:\Utils +cmd /c mklink /d "$installationFolder" "C:\Utils\vcpkg-qt" +cd "C:\Utils\vcpkg-qt\" +cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && 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 "x64-windows" +Set-EnvironmentVariable VCPKG_CMAKE_TOOLCHAIN_FILE "$installationFolder\scripts\buildsystems\vcpkg.cmake" + +# pcre2-16.dll was used when generating qvulkanfunctions.h +Add-Path "C:\Utils\vcpkg\installed\x64-windows\bin" + +cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && $installationFolder\vcpkg.exe --triplet x64-windows install zlib pcre2 double-conversion harfbuzz openssl" + +Remove-Item "$zip" 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 new file mode 100644 index 00000000..c898da22 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-vcpkg.ps1" + -- cgit v1.2.3 From 20e8121c775a307d68e600095b1410d408a487b2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 25 Apr 2019 11:43:00 +0200 Subject: Use yaml configuration file for cmake support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is needed by new coin to support cmake build as only there configuration arguments are separated from features. Change-Id: I960ec693f80803fd86de472efc953a38358ae14e Reviewed-by: Jędrzej Nowacki --- coin/platform_configs/default.yaml | 13 +++++++++++++ coin/platform_configs/qt3d-runtime.txt | 21 --------------------- coin/platform_configs/qtconnectivity.txt | 3 --- coin/platform_configs/qtdeclarative.txt | 4 ---- coin/platform_configs/qtsaferenderer.txt | 3 --- coin/platform_configs/qtsdk.txt | 4 ---- coin/platform_configs/qtwebkit.txt | 4 ---- coin/platform_configs/tqtc-qt-rta.txt | 6 ------ 8 files changed, 13 insertions(+), 45 deletions(-) create mode 100644 coin/platform_configs/default.yaml delete mode 100644 coin/platform_configs/qt3d-runtime.txt delete mode 100644 coin/platform_configs/qtconnectivity.txt delete mode 100644 coin/platform_configs/qtdeclarative.txt delete mode 100644 coin/platform_configs/qtsaferenderer.txt delete mode 100644 coin/platform_configs/qtsdk.txt delete mode 100644 coin/platform_configs/qtwebkit.txt delete mode 100644 coin/platform_configs/tqtc-qt-rta.txt (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml new file mode 100644 index 00000000..5df190c4 --- /dev/null +++ b/coin/platform_configs/default.yaml @@ -0,0 +1,13 @@ +- Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} {{.SourceDir}}' +# Disabled for now +# - Template: 'qtci-macos-10.13-x86_64-2' +# Compiler: 'Clang' +# Features: ['DisableTests'] +# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 {{.SourceDir}}' +# - Template: 'qtci-windows-10-x86_64-14' +# Compiler: 'MSVC2017' +# Features: ['DisableTests'] +# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH=c:{{.InstallDir}} -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -G NMake Makefiles JOM {{.SourceDir}}' diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt deleted file mode 100644 index 1001d869..00000000 --- a/coin/platform_configs/qt3d-runtime.txt +++ /dev/null @@ -1,21 +0,0 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt deleted file mode 100644 index 15f11bd1..00000000 --- a/coin/platform_configs/qtconnectivity.txt +++ /dev/null @@ -1,3 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt deleted file mode 100644 index e2b69559..00000000 --- a/coin/platform_configs/qtdeclarative.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt deleted file mode 100644 index ec14f610..00000000 --- a/coin/platform_configs/qtsaferenderer.txt +++ /dev/null @@ -1,3 +0,0 @@ -Template Target OS Target arch Compiler Features ------------------------------------ ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples diff --git a/coin/platform_configs/qtsdk.txt b/coin/platform_configs/qtsdk.txt deleted file mode 100644 index 3011926d..00000000 --- a/coin/platform_configs/qtsdk.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic -qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt deleted file mode 100644 index 27782f88..00000000 --- a/coin/platform_configs/qtwebkit.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt deleted file mode 100644 index 8fbb5a00..00000000 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ /dev/null @@ -1,6 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic - -- cgit v1.2.3 From 79bc4f077108237d31a4160d7f262f3c5966e35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 22 May 2019 16:23:00 +0200 Subject: Move some configure arguments to qtbase instructions These arguments are specific to the build and changes to them are _not_ affecting configuration. Change-Id: I701b7d83511c5f80b88c5aab09eae3ecb6df74a1 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 5df190c4..e41c240b 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,13 +1,13 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Features: ['DisableTests'] - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} {{.SourceDir}}' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' # Disabled for now # - Template: 'qtci-macos-10.13-x86_64-2' # Compiler: 'Clang' # Features: ['DisableTests'] -# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 {{.SourceDir}}' +# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' # - Template: 'qtci-windows-10-x86_64-14' # Compiler: 'MSVC2017' # Features: ['DisableTests'] -# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH=c:{{.InstallDir}} -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -G NMake Makefiles JOM {{.SourceDir}}' +# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -G NMake Makefiles JOM' -- cgit v1.2.3 From aabcc8128cd8f74f082943b314c6e38de8b78919 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 23 May 2019 21:52:56 +0200 Subject: Provisioning: Add ninja to the list of installed packages Change-Id: I018e7812fc95c1db841720294a700a391246251d Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh (limited to 'coin') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh new file mode 100755 index 00000000..c9d3e309 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install ninja -- cgit v1.2.3 From 086439b018b2323a68b644986c0e2a7705fdaaf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Wed, 5 Jun 2019 11:12:48 +0200 Subject: Upgrade CMake to 3.15.0-rc1 Change-Id: I374631637a6521621dfa702aa2390998ef124d24 Reviewed-by: Simon Hausmann --- coin/provisioning/common/linux/cmake_linux.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 4a773c43..bfe7a9c5 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.14" -version="3.14.0-rc3" +majorminorversion="3.15" +version="3.15.0-rc1" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" -SHA1="4dcd279a90aa7522c9a1d4be11b86395c5d1c729" +SHA1="5e4d2b4478485f1a16c91463fc91eea3a9487b7a" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" -- cgit v1.2.3 From d44a7a5f145ebdd49e09da358850d102f089c0df Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 5 Jun 2019 14:39:44 +0200 Subject: Install cmake from binaries instead of from source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The from-source installation originates from a point in time where there was no cmake release with binaries that were sufficient. That is not the case with 3.15-rc1. Change-Id: I385016969f21c194b25334e3af8af7283fc5873f Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/unix/install_cmake.sh | 72 ---------------------- .../40-install-cmake.sh | 2 +- 2 files changed, 1 insertion(+), 73 deletions(-) delete mode 100755 coin/provisioning/common/unix/install_cmake.sh (limited to 'coin') diff --git a/coin/provisioning/common/unix/install_cmake.sh b/coin/provisioning/common/unix/install_cmake.sh deleted file mode 100755 index e76d2c6d..00000000 --- a/coin/provisioning/common/unix/install_cmake.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -# shellcheck source=../unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -set -ex - -# This script will install Cmake - -version="e1af2489fda9129e735007a069fae018c4ab3431" -sha1="357ad8003b30ec23037b59b750b96a75e52f78bb" -internalUrl="http://ci-files01-hki.intra.qt.io/input/cmake/CMake-$version.zip" -externalUrl="https://codeload.github.com/Kitware/CMake/zip/$version" - -targetDir="$HOME/CMake-$version" -targetFile="$targetDir.zip" -installFolder="$HOME" -cmakeHome="$HOME/cmake" -DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile" -unzip "$targetFile" -d "$HOME" -sudo rm "$targetFile" - -echo "Configuring and building cmake" -cd "$targetDir" -if uname -a |grep -q Darwin; then - ./bootstrap --prefix="$(xcrun --sdk macosx --show-sdk-path)/usr/local" - SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin" -else - ./bootstrap --prefix="$cmakeHome" - SetEnvVar "PATH" "$cmakeHome/bin:\$PATH" -fi -make -sudo make install - -sudo rm -r "$targetDir" - -echo "CMake = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh index 0d799bff..cafbd3a5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh @@ -1,5 +1,5 @@ #!/bin/bash BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install_cmake.sh" +"$BASEDIR/../common/linux/install_cmake.sh" -- cgit v1.2.3 From 463235a0bcdf42ece5be2d0b27dfb81cb46d5dfb Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 5 Jun 2019 14:46:03 +0200 Subject: Bump cmake to 3.15-rc1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Same as for the recent Linux change. Change-Id: I073411bcfa8cbd692a7770cdaad3a368c6f7108d Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/macos/cmake.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index e22425b7..742422a0 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -42,10 +42,10 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.11.3-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.11/cmake-3.11.3-Darwin-x86_64.tar.gz" -SHA1="3d13de8020ce560159fa5cecb669498c48552d96" -appPrefix="cmake-3.11.3-Darwin-x86_64" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.0-rc1-Darwin-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.15/cmake-3.15.0-rc1-Darwin-x86_64.tar.gz" +SHA1="94b6aa5f36fd20811eb6c5c036bb2ec154f2d652" +appPrefix="cmake-3.15.0-rc1-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" -- cgit v1.2.3 From 716cb8185a769265cf1fd3f88926bfce4cb5361b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 6 Jun 2019 08:57:36 +0200 Subject: Fix path to cmake installation script Amends commit d44a7a5f145ebdd49e09da358850d102f089c0df Change-Id: I52926a8e8c488beaeb70c9bf0222c7caa0ccfe9c Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh index cafbd3a5..db8a3ff5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh @@ -1,5 +1,5 @@ #!/bin/bash BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/install_cmake.sh" +"$BASEDIR/../common/linux/cmake_linux.sh" -- cgit v1.2.3 From 36d634a7dd2d588d8a0d113ac684a57410162041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 6 Jun 2019 09:26:27 +0200 Subject: Fix paths when installing cmake on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ammends d44a7a5f145ebdd49e09da358850d102f089c0df. Change-Id: I8e8644a1f8677e6e62fb6356cc6c3533ec40e454 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh index a87667fe..4f4d405e 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install_cmake.sh" +"$BASEDIR/../common/macos/cmake.sh" -- cgit v1.2.3 From 7df4f93cb1fb9d09c40850d351ebd24eaa94c5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 6 Jun 2019 09:33:40 +0200 Subject: Fix provisioning of cmake on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script contains a bit of data duplication, one of the fields was not updated. This amends 463235a0bcdf42ece5be2d0b27dfb81cb46d5dfb. Change-Id: Idb9e88eba1f1415a0ca29f2c3a003c8a844bb024 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/macos/cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index 742422a0..ed49de81 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -51,4 +51,4 @@ InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH" -echo "CMake = 3.11.3" >> ~/versions.txt +echo "CMake = 3.15.0-rc1" >> ~/versions.txt -- cgit v1.2.3 From a6d159c9e714a6b743ae13b96e2ebcd241c50a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 6 Jun 2019 09:48:28 +0200 Subject: Bump cmake to 3.15-rc1 on Windows Same as for the recent Linux and macOS change. Change-Id: Ic7ae30333f8cd58925f697c19ca046ceac49cd32 Reviewed-by: Simon Hausmann --- coin/provisioning/common/windows/cmake.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 1c19c980..cc7015a8 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.14" -$version = "3.14.1" +$majorminorversion = "3.15" +$version = "3.15.0-rc1" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "C1626FD07B09C76736F5AC9DA7B4374919EB9964" +Verify-Checksum $zip "F196900509D7CA1947F04084DB8BEAA1DB1F7B59" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 2e5b5cc075bb03e1f28dcc02b29296ad50c3e1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 6 Jun 2019 15:50:22 +0200 Subject: Update cmake sha1 for Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It amends a6d159c9e714a6b743ae13b96e2ebcd241c50a01. Seems that I computed sha1 for a wrong file. Change-Id: Ie524b2c825189a91cd6b809ff7991af20bd301b1 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/windows/cmake.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index cc7015a8..3367440b 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "F196900509D7CA1947F04084DB8BEAA1DB1F7B59" +Verify-Checksum $zip "3739F2FF0CAD6EC15475A32D419EBEB0864C4800" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 8f2b2dba786e28429a207c209190d5a260981e05 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 22 May 2019 14:08:10 +0200 Subject: Enable windows and macOS builds for yaml and cmake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I91aea0fe59e77cf95f7441c646e95d038f0e0032 Reviewed-by: Jędrzej Nowacki --- coin/platform_configs/default.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index e41c240b..ddb6b725 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -2,12 +2,11 @@ Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' -# Disabled for now -# - Template: 'qtci-macos-10.13-x86_64-2' -# Compiler: 'Clang' -# Features: ['DisableTests'] -# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' -# - Template: 'qtci-windows-10-x86_64-14' -# Compiler: 'MSVC2017' -# Features: ['DisableTests'] -# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -G NMake Makefiles JOM' +- Template: 'qtci-macos-10.13-x86_64-2' + Compiler: 'Clang' + Features: ['DisableTests'] + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' +- Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2017' + Features: ['DisableTests'] + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_freetype=OFF' -- cgit v1.2.3 From cfd35cc49849643ce2e1b37c8bebcf0acca8f2bb Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 12 Jun 2019 16:11:56 +0200 Subject: Add a new Linux config that builds a static developer build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8e40ed674cf0a72223a0180296db8eaa6eb6da06 Reviewed-by: Jędrzej Nowacki --- coin/platform_configs/default.yaml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index ddb6b725..1a2df74f 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -2,6 +2,10 @@ Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' +- Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['DisableTests'] -- cgit v1.2.3 From b62c39f49f7dbf15df282bce2b4f5126dd68b885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 12 Jun 2019 17:03:44 +0200 Subject: Increase CI test coverage by changing GCC to ICC There is already other place in which we compile with GCC on Linux. As we use ninja now, it has to be installed on open suse too. Cmake port depends on system libraries therefore pcre2 needs to be installed. Change-Id: I92e16cc31fa60b4c591e71b58cd7235540065ac6 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 6 +++--- .../qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 1a2df74f..f5daef6d 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -2,10 +2,10 @@ Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' -- Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' +- Template: 'qtci-linux-openSUSE-15.0-x86_64' + Compiler: 'ICC_18' Features: ['DisableTests'] - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_COMPILER=icc -DCMAKE_CXX_COMPILER=icpc' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['DisableTests'] diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh index d1f3050f..9da9ed0f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh @@ -2,7 +2,7 @@ set -ex -sudo zypper -nq install git gcc7 gcc7-c++ +sudo zypper -nq install git gcc7 gcc7-c++ ninja sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \ --slave /usr/bin/g++ g++ /usr/bin/g++-7 \ --slave /usr/bin/cc cc /usr/bin/gcc-7 \ @@ -17,7 +17,8 @@ sudo zypper -nq install bison flex gperf \ fontconfig-devel \ sqlite3-devel \ libxkbcommon-devel \ - libxkbcommon-x11-devel + libxkbcommon-x11-devel \ + pcre2-devel libpng16-devel # EGL support sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel -- cgit v1.2.3 From 9d7437859b2297481db267a5e307e0a3a362c9dd Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 20 Jun 2019 14:56:52 +0200 Subject: Update vcpkg installation Use the latest snapshot, fetch the package set from the repo itself and set the VCPKG_ROOT environment variable as that's the vcpkg documented interface. The qt specific triplet defaults to static linkage, which allows removing the %PATH% handling and resembles the same setup as in Qt 5 where we linked the 3rd-party code statically into qt. Change-Id: I789d61b5c7258674c2dd80403efaeb891c8f75c7 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 2 +- coin/provisioning/common/windows/install-vcpkg.ps1 | 41 +++++++++++----------- 2 files changed, 22 insertions(+), 21 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index f5daef6d..a2e397b1 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -13,4 +13,4 @@ - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' Features: ['DisableTests'] - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_freetype=OFF' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_freetype=OFF' diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 index 673274da..36b0d826 100644 --- a/coin/provisioning/common/windows/install-vcpkg.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -34,32 +34,33 @@ # This script will install vcpkg -$version = "08ad9d88ecabf9f8111bd4df0ca74723550503cd" -$sha1 = "43b471aebc2f46bee00c86710d0311ef6fb7bb19" -$officialUrl = "https://codeload.github.com/liangqi/vcpkg/zip/qt" -$cachedUrl = "http://ci-files01-hki.ci.local/input/vcpkg/vcpkg-$version.zip" -$zip = "C:\Utils\vcpkg-$version.zip" -$installationFolder = "C:\Utils\vcpkg" - Write-Host "Installing vcpkg" -Download "$officialUrl" "$cachedUrl" "$zip" -Verify-Checksum "$zip" "$sha1" -Extract-7Zip "$zip" C:\Utils -cmd /c mklink /d "$installationFolder" "C:\Utils\vcpkg-qt" -cd "C:\Utils\vcpkg-qt\" -cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && bootstrap-vcpkg.bat" + +$version = "qt-snapshot-2019-06-20" +$officialUrl = "https://codeload.github.com/tronical/vcpkg/zip/$version" +$zip = "C:\Utils\vcpkg.zip" + +Download "$officialUrl" "" "$zip" +Extract-7Zip "$zip" c:\utils +Remove-Item $zip + +$installationFolder = "c:\utils\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 "x64-windows" -Set-EnvironmentVariable VCPKG_CMAKE_TOOLCHAIN_FILE "$installationFolder\scripts\buildsystems\vcpkg.cmake" - -# pcre2-16.dll was used when generating qvulkanfunctions.h -Add-Path "C:\Utils\vcpkg\installed\x64-windows\bin" +Set-EnvironmentVariable VCPKG_DEFAULT_TRIPLET "qt-x64-windows-static" +Set-EnvironmentVariable VCPKG_ROOT "$installationFolder" -cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && $installationFolder\vcpkg.exe --triplet x64-windows install zlib pcre2 double-conversion harfbuzz openssl" +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 "$zip" +Remove-Item -Recurse -Force packages +Remove-Item -Recurse -Force buildtrees +Remove-Item -Recurse -Force downloads -- cgit v1.2.3 From 5464a31c6109b7f8af87c65b111dbae379e77b0d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 21 Jun 2019 13:35:17 +0200 Subject: Enable freetype on the Windows build With the newer vcpkg this works now. Change-Id: I8408041b338ffbe74aaec9afbb1cf8cbf3bb1d92 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index a2e397b1..ac724225 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -13,4 +13,4 @@ - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' Features: ['DisableTests'] - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_freetype=OFF' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe' -- cgit v1.2.3 From 61d838e4f03f8daf61b2e1eecd3d343cd85f5f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Fri, 21 Jun 2019 13:56:25 +0200 Subject: Move ICC compiler name setup to instructions level That way we can simplify product level configuration. Change-Id: Ib855c1873d3b4566b437845ab18182a0db8e45b9 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index ac724225..3d347ae6 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -5,7 +5,7 @@ - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' Features: ['DisableTests'] - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_COMPILER=icc -DCMAKE_CXX_COMPILER=icpc' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['DisableTests'] -- cgit v1.2.3 From 245f5afd718b042c7733fddbacb767c719af81b3 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 24 Jun 2019 13:32:04 +0200 Subject: Remove DisableTests in features MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit At least we can get tests built now. Change-Id: I7830f495002083023651ca5da3c6c39e745f920f Reviewed-by: Jędrzej Nowacki --- coin/platform_configs/default.yaml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 3d347ae6..7e5e159a 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,16 +1,12 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' - Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' - Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' - Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe' -- cgit v1.2.3 From 8e54519b754be4117abe26a5ef3343e90fd01366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Mon, 1 Jul 2019 16:53:49 +0200 Subject: Do not specify compiler binary name directly We have a code that handles that implicitly so it is not needed anymore. Change-Id: I4aea2f55f9efd24ec7cf22cb8b413789ec3e7fea Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 7e5e159a..deac4991 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -9,4 +9,4 @@ Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe' + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' -- cgit v1.2.3 From caacdfc3e103e90a60eb3056a21ff1dbd6c5c380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Tue, 2 Jul 2019 15:42:19 +0200 Subject: Remove "-DBUILD_TESTING=OFF" from default configs It is not needed. QtBase build instructions add it explicitly, as the tests are build with a separate cmake call (to compile tests against differently installed Qt). Change-Id: I22fe26d4bdb9dd237df76246607d823f4b4fa315 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index deac4991..667b081f 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,12 +1,12 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' -- cgit v1.2.3 From e4259942ff41fe6fd8e4048e264bd946f3692e5e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 5 Sep 2019 15:56:23 +0200 Subject: Add empty build instructions to allow for qt5 integrations The build shall be empty for now, but this allow testing module wide updates. Change-Id: I47bcdae274edb2ec000bb57480d74614d3b55833 Reviewed-by: Alexandru Croitor --- coin/module_config.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 coin/module_config.yaml (limited to 'coin') diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 00000000..d10eb769 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,10 @@ +version: 1 +accept_configuration: + condition: property + property: host.os + equals_property: target.os + +build_instructions: + - type: EnvironmentVariable + variableName: Dummy + variableValue: dummy -- cgit v1.2.3 From 677412dcbebe0baa535912f090d5a5b8a4c94273 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 9 Sep 2019 11:22:33 +0200 Subject: Move the developer build from static suse to ubuntu Because we don't run tests on static build. Change-Id: I10c7851ecebcfa3691690c6bc26a352fd5799965 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- coin/platform_configs/default.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 667b081f..4bceae07 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,9 +1,9 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' - Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' -- cgit v1.2.3 From 1605059e87b9954ca9bc4f0786b06dfeb2058e73 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 25 Sep 2019 10:34:59 +0200 Subject: platform_configs: remove CMAKE_VERBOSE_MAKEFILE option which is not in use when ninja got selected. Change-Id: I1841471dee0f58e4a54cd05f33f4ba7c3a1a8251 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 4bceae07..a2499e16 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,12 +1,12 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' - Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' - Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' - Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' -- cgit v1.2.3 From cba04eb53199c6f7672e4dc94b3ab1765c6c517b Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 26 Jul 2019 19:09:29 +0200 Subject: Build examples on at least one configuration Ubuntu Linux in this case. Change-Id: Ic17b3f4880105e639340ffc07c52de27245612d7 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index a2499e16..dab36910 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,6 +1,6 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' + Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' -- cgit v1.2.3 From 1478b607d6b32d63297927bdd5d47fccc29038cb Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 2 Oct 2019 10:00:48 +0200 Subject: Provisioning: install libsdl2 on ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3c547c1e44ebc734fd9908db2828440bc13f55f5 Reviewed-by: Qt CMake Build Bot Reviewed-by: Mårten Nordheim Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index bfb58a2c..ee121e92 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -169,6 +169,9 @@ installPackages+=(texinfo) # Needed for QtCore installPackages+=(libdouble-conversion-dev) installPackages+=(libpcre2-dev) +# Needed for qtgampepad +installPackages+=(libsdl2-2.0) +installPackages+=(libsdl2-dev) echo "Running update for apt" waitLoop -- cgit v1.2.3 From 9e3b3c838cceb0a161a85f5bd425a2ebc17f5160 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 9 Oct 2019 13:17:14 +0200 Subject: platform_configs: add a RHEL 7.6 build A preparing for having android build later. * install gcc 7.x * install git 2.x * install a few other dependencies Change-Id: I18f05bdfb78c92b7f05f67609613b5271b400f91 Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- coin/platform_configs/default.yaml | 18 +++++++-- coin/provisioning/common/unix/install_protobuff.sh | 2 +- .../03-install-devtoolset.sh | 4 +- .../04-install-packages.sh | 12 +++++- .../qtci-linux-RHEL-7.6-x86_64/06-cmake.sh | 43 ---------------------- .../qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh | 43 ++++++++++++++++++++++ 6 files changed, 71 insertions(+), 51 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index dab36910..0e3aefa6 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,12 +1,22 @@ -- Template: 'qtci-linux-Ubuntu-18.04-x86_64' +Version: 2 +Configurations: +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON' -- Template: 'qtci-linux-openSUSE-15.0-x86_64' +- + Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' -- Template: 'qtci-macos-10.13-x86_64-2' +- + Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' -- Template: 'qtci-windows-10-x86_64-14' +- + Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF' diff --git a/coin/provisioning/common/unix/install_protobuff.sh b/coin/provisioning/common/unix/install_protobuff.sh index 59e9b699..20e9ab44 100755 --- a/coin/provisioning/common/unix/install_protobuff.sh +++ b/coin/provisioning/common/unix/install_protobuff.sh @@ -53,7 +53,7 @@ sudo rm "$targetFile" # devtoolset is needed when running configuration if uname -a |grep -qv "Darwin"; then - export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH" + export PATH="/opt/rh/devtoolset-7/root/usr/bin:$PATH" fi echo "Configuring and building protobuf" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh index ebc7cac6..5d37a53a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh @@ -35,7 +35,7 @@ set -ex -sudo yum -y install devtoolset-4 +sudo yum -y install devtoolset-7 -echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc +echo "source /opt/rh/devtoolset-7/enable" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index b956d6a3..6b569552 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -38,13 +38,20 @@ set -ex # Remove update notifications and packagekit running in the background sudo yum -y remove PackageKit gnome-software +sudo yum-config-manager --enable rhel-server-rhscl-7-rpms + installPackages=() -installPackages+=(git) +installPackages+=(rh-git29) installPackages+=(zlib-devel) installPackages+=(glib2-devel) installPackages+=(openssl-devel) installPackages+=(freetype-devel) installPackages+=(fontconfig-devel) +# cmake build +installPackages+=(ninja-build) +installPackages+=(pcre2-devel) +installPackages+=(double-conversion-devel) +installPackages+=(zstd) # EGL support installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libGL-devel) @@ -118,6 +125,9 @@ installPackages+=(vulkan-devel) sudo yum -y install "${installPackages[@]}" +scl enable rh-git29 bash +sudo ln -s /opt/rh/rh-git29/root/usr/bin/git /usr/local/bin/git + sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3 sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 # We shouldn't use yum to install virtualenv. The one found from package repo is not diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh deleted file mode 100755 index 062b2790..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# - -# This script installs CMake 3.6.2 - -set -ex - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/linux/cmake_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh new file mode 100755 index 00000000..062b2790 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +# This script installs CMake 3.6.2 + +set -ex + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/linux/cmake_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh" -- cgit v1.2.3 From ecf2f4f38cde8983bb357f6241478ac3170ac9ac Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 10 Oct 2019 14:57:01 +0200 Subject: provisioning: update python to 3.7 on macos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3271 Change-Id: Ic1645a8b5bc94b0ce6ff58352891af0beabd7649 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/macos/python3.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh index 35bccc93..185c3b01 100755 --- a/coin/provisioning/common/macos/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Copyright (C) 2017 Pelagicore AG ## Contact: http://www.qt.io/licensing/ ## @@ -43,23 +43,23 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=./pip.sh source "${BASH_SOURCE%/*}/pip.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg" -AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg" -SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.7.4-macosx10.9.pkg" +AltUrl="https://www.python.org/ftp/python/3.7.4/python-3.7.4-macosx10.9.pkg" +SHA1="ef8a6b1abba6a6e8553916a881af440705653fa8" DestDir="/" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" -InstallPip python3.6 +InstallPip python3.7 -/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv wheel +/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 install virtualenv wheel -SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" -SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" +SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin" +SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin" # Install all needed packages in a special wheel cache directory -/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt +/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" -echo "python3 = 3.6.1" >> ~/versions.txt +echo "python3 = 3.7.4" >> ~/versions.txt -- cgit v1.2.3 From 0c687679c7cd434728e614a181301e03d5b87ff5 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 9 Oct 2019 13:19:25 +0200 Subject: platform_configs: add Android arm64 build on RHEL 7.6 host * install vcpkg and for android * a remaining issue in vcpkg: https://github.com/microsoft/vcpkg/issues/8506 Task-number: QTBUG-78945 Change-Id: I484612e2157bf1c1142934cc4f27729e8be37b89 Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- coin/platform_configs/default.yaml | 8 +++ coin/provisioning/common/linux/vcpkg.sh | 72 ++++++++++++++++++++++ .../qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh | 5 ++ 3 files changed, 85 insertions(+) create mode 100755 coin/provisioning/common/linux/vcpkg.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 0e3aefa6..6b0ddd46 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -20,3 +20,11 @@ Configurations: Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' Configure arguments: '-DBUILD_EXAMPLES=OFF' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + 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'] diff --git a/coin/provisioning/common/linux/vcpkg.sh b/coin/provisioning/common/linux/vcpkg.sh new file mode 100755 index 00000000..a25e91a1 --- /dev/null +++ b/coin/provisioning/common/linux/vcpkg.sh @@ -0,0 +1,72 @@ +#!/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 + +version="qt-snapshot-2019-10-09" +officialUrl="https://codeload.github.com/tronical/vcpkg/tar.gz/$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 = $version" >> ~/versions.txt 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 new file mode 100755 index 00000000..5c7f3f1d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +"$(dirname "$0")/../common/linux/vcpkg.sh" -- cgit v1.2.3 From 33d9eb2b99c4edd5c9c77ccad4b1eeaf93849122 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 17 Oct 2019 16:25:22 +0200 Subject: Work around cmake issue breaking C++ feature detection on Android As per https://gitlab.kitware.com/cmake/cmake/issues/19515, the version of CMake we're currently using in the CI has an issue detecting clang as GNU compatible C++ frontend and thus fails to convert the values in the CMAKE_C/CXX_STANDARD variables to compiler flags correctly. Work around this for now as suggested in the upstream ticket. We can remove this when upgrading to a newer cmake version. Change-Id: I0ea37503c086ff86e05c50b812474522a7737b20 Reviewed-by: Alexandru Croitor --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 6b0ddd46..5236af9c 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -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'] + 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'] -- cgit v1.2.3 From 8eab11f6961f146fa9a4bc9c523504694d880c02 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 17 Oct 2019 11:28:24 +0200 Subject: Update CMake to version 3.15.5 Update required as there's a bug with setting the CXX_STANDARD on android. Updating to this version fixes the issue. Change-Id: I50b0bc2941e0919232b46bbf5b28133149878649 Reviewed-by: Liang Qi --- coin/provisioning/common/linux/cmake_linux.sh | 4 ++-- coin/provisioning/common/macos/cmake.sh | 10 +++++----- coin/provisioning/common/windows/cmake.ps1 | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 08a69abc..38c515a6 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -43,10 +43,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" majorminorversion="3.15" -version="3.15.0-rc1" +version="3.15.5" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" -SHA1="5e4d2b4478485f1a16c91463fc91eea3a9487b7a" +SHA1="867f44e232346b79167b64cb5380bc0955e953fb" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index ed49de81..cb0a24d7 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -42,13 +42,13 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.0-rc1-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.15/cmake-3.15.0-rc1-Darwin-x86_64.tar.gz" -SHA1="94b6aa5f36fd20811eb6c5c036bb2ec154f2d652" -appPrefix="cmake-3.15.0-rc1-Darwin-x86_64" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.5-Darwin-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.15/cmake-3.15.5-Darwin-x86_64.tar.gz" +SHA1="a12dcf2a124ae77ddef7269e6731ab0d63ec7c64" +appPrefix="cmake-3.15.5-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH" -echo "CMake = 3.15.0-rc1" >> ~/versions.txt +echo "CMake = 3.15.5" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 3367440b..256d2439 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -34,7 +34,7 @@ . "$PSScriptRoot\helpers.ps1" $majorminorversion = "3.15" -$version = "3.15.0-rc1" +$version = "3.15.5" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "3739F2FF0CAD6EC15475A32D419EBEB0864C4800" +Verify-Checksum $zip "3ccd9fb7ffcc0bef9bcb2c6ab105ee6a5148b7bf" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 1aa25c10840f702fd9155b3bf394c89817a8e2b9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 9 Oct 2019 16:32:59 +0200 Subject: Bump vcpkg to a new snapshot Some patches were upstreamed and this beings the version in line with what we need for Android. This patch also centralizes the version into a shared file, for future use. Change-Id: I90973f9bfcbc1bfeb2d11e2ee7a7fa4e4f6a58a2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- coin/provisioning/common/linux/vcpkg.sh | 7 ++++--- coin/provisioning/common/shared/vcpkg_version.txt | 1 + coin/provisioning/common/windows/install-vcpkg.ps1 | 9 ++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 coin/provisioning/common/shared/vcpkg_version.txt (limited to 'coin') diff --git a/coin/provisioning/common/linux/vcpkg.sh b/coin/provisioning/common/linux/vcpkg.sh index a25e91a1..35f2ece8 100755 --- a/coin/provisioning/common/linux/vcpkg.sh +++ b/coin/provisioning/common/linux/vcpkg.sh @@ -43,8 +43,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # Refresh to make sure we have the EMSCRIPTEN environment variable, needed for the vcpkg wasm build. source ~/.bashrc -version="qt-snapshot-2019-10-09" -officialUrl="https://codeload.github.com/tronical/vcpkg/tar.gz/$version" +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" @@ -69,4 +70,4 @@ cd $targetFolder rm -rf packages buildtrees downloads -echo "VCPKG = $version" >> ~/versions.txt +echo "VCPKG = $vcpkg_version" >> ~/versions.txt diff --git a/coin/provisioning/common/shared/vcpkg_version.txt b/coin/provisioning/common/shared/vcpkg_version.txt new file mode 100644 index 00000000..993101eb --- /dev/null +++ b/coin/provisioning/common/shared/vcpkg_version.txt @@ -0,0 +1 @@ +vcpkg_version=qt-snapshot-2019-10-09 diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 index 36b0d826..52f1518f 100644 --- a/coin/provisioning/common/windows/install-vcpkg.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -36,15 +36,18 @@ Write-Host "Installing vcpkg" -$version = "qt-snapshot-2019-06-20" -$officialUrl = "https://codeload.github.com/tronical/vcpkg/zip/$version" +$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-$version" +$installationFolder = "c:\utils\vcpkg-$vcpkg_version" cd $installationFolder -- cgit v1.2.3 From 95c7b90309de24badd51aa8017e8145c7f2e655e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 22 Nov 2019 20:10:43 +0100 Subject: Update CMake to version 3.16.0-rc4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94 Reviewed-by: Qt CMake Build Bot Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/cmake_linux.sh | 8 ++++---- coin/provisioning/common/macos/cmake.sh | 12 +++++++----- coin/provisioning/common/windows/cmake.ps1 | 6 +++--- 3 files changed, 14 insertions(+), 12 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 38c515a6..f03bd16c 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -33,7 +33,7 @@ ## ############################################################################# -# This script installs CMake 3.15.0-rc1 +# This script installs CMake # CMake is needed for autotests that verify that Qt can be built with CMake @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.15" -version="3.15.5" +majorminorversion="3.16" +version="3.16.0-rc4" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" -SHA1="867f44e232346b79167b64cb5380bc0955e953fb" +SHA1="def260a8f27d3b1b9c3d042ec936236598bea52a" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index cb0a24d7..8e20586b 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -42,13 +42,15 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.5-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.15/cmake-3.15.5-Darwin-x86_64.tar.gz" -SHA1="a12dcf2a124ae77ddef7269e6731ab0d63ec7c64" -appPrefix="cmake-3.15.5-Darwin-x86_64" +majorminorversion="3.16" +version="3.16.0-rc4" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Darwin-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Darwin-x86_64.tar.gz" +SHA1="a2727f4f01329b5b8154840e9ba0de37e3fb14d5" +appPrefix="cmake-$version-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH" -echo "CMake = 3.15.5" >> ~/versions.txt +echo "CMake = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 256d2439..bbec4b4f 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.15" -$version = "3.15.5" +$majorminorversion = "3.16" +$version = "3.16.0-rc4" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "3ccd9fb7ffcc0bef9bcb2c6ab105ee6a5148b7bf" +Verify-Checksum $zip "989e5c6384870a77425f2ddbbf305bd3f6dad426" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 3aef26846488f98110cb322ac6e9dda43649e993 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 5 Dec 2019 17:15:12 +0100 Subject: Update vcpkg snapshot The snapshot uses the previous snapshot as a based. It was rebased on latest master as of 2019-12-05, and also contains cherry-picked patches to target iOS. Change-Id: I9fc0c39856fdb255533f6c71d27f5749894b6bea Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- coin/provisioning/common/shared/vcpkg_version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/shared/vcpkg_version.txt b/coin/provisioning/common/shared/vcpkg_version.txt index 993101eb..7bff414a 100644 --- a/coin/provisioning/common/shared/vcpkg_version.txt +++ b/coin/provisioning/common/shared/vcpkg_version.txt @@ -1 +1 @@ -vcpkg_version=qt-snapshot-2019-10-09 +vcpkg_version=qt-snapshot-2019-12-05 -- cgit v1.2.3