diff options
79 files changed, 390 insertions, 221 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 4b023c13..d8ca7bdb 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -99,7 +99,7 @@ Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Compiler: 'Clang' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' @@ -113,28 +113,28 @@ Compiler: 'Clang' Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'IOS_ANY' Target arch: 'multi' Compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'TvOS_ANY' Target arch: 'multi' Compiler: 'Clang' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'WatchOS_ANY' Target arch: 'multi' Compiler: 'Clang' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'Clang' diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml index aaa563ef..385ff890 100644 --- a/coin/platform_configs/installer-framework.yaml +++ b/coin/platform_configs/installer-framework.yaml @@ -10,7 +10,7 @@ Configurations: Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index d67738ab..c2a61816 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -67,7 +67,7 @@ Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'Clang' @@ -75,7 +75,7 @@ Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'Android_ANY' Target arch: 'arm64' Compiler: 'Clang' @@ -83,7 +83,7 @@ Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'QNX_700' Target arch: 'x86' Compiler: 'GCC' diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 65e3b022..29ed82f8 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -41,6 +41,7 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +version="1.1.1k" exports_file="/tmp/export.sh" # source previously made environmental variables. if uname -a |grep -q "Ubuntu"; then @@ -53,11 +54,10 @@ else rm -rf "$exports_file" fi -version="1.1.1g" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="b213a293f2127ec3e323fb3cfc0c9807664fd997" +sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b" opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" mkdir -p "${HOME}/openssl/android/" diff --git a/coin/provisioning/common/macos/macos-version.sh b/coin/provisioning/common/macos/macos-version.sh index 9f357b8c..c88cd9b8 100755 --- a/coin/provisioning/common/macos/macos-version.sh +++ b/coin/provisioning/common/macos/macos-version.sh @@ -44,8 +44,6 @@ sw_vers >> ~/versions.txt echo "***** All installed packages *****" >> ~/versions.txt echo "***** HomeBrew *****" >> ~/versions.txt brew list --versions >> ~/versions.txt -echo "***** HomeBrew Casks*****" >> ~/versions.txt -brew cask list --versions >> ~/versions.txt echo "***** Apple's installer *****" >> ~/versions.txt pkgutil --pkgs >> ~/versions.txt echo "*********************************************" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/nodejs.sh b/coin/provisioning/common/macos/nodejs.sh new file mode 100755 index 00000000..1313d27e --- /dev/null +++ b/coin/provisioning/common/macos/nodejs.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 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" + +# This script will install Nodejs + +version="14.16.1" +urlCache="http://ci-files01-hki.ci.local/input/nodejs/node-v$version.pkg" +urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg" +sha1="4720274971c40fe51b2c647060f77c45fb4949a7" + +DownloadURL $urlCache $urlOffcial $sha1 "/tmp/node-v$version.pkg" +sudo installer -pkg "/tmp/node-v$version.pkg" -target / + + echo "Nodejs = $version" >> ~/versions.txt + diff --git a/coin/provisioning/common/macos/pip.sh b/coin/provisioning/common/macos/pip.sh index 2d07db85..b1c9a864 100755 --- a/coin/provisioning/common/macos/pip.sh +++ b/coin/provisioning/common/macos/pip.sh @@ -1,11 +1,18 @@ #!/usr/bin/env bash +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" + function InstallPip { python=$1 # Will install pip utility for python - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py + if [[ $python == "python2.7" ]]; then + DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/python27/get-pip.py" "https://bootstrap.pypa.io/2.7/get-pip.py" "c4c5f74586cffe49804f167d95d1710b9750ddf0" + else + DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/get-pip.py" "https://bootstrap.pypa.io/get-pip.py" "209ddf0bb8d1cf06a1f17dd9f21970c76b3d2be2" + fi sudo "$python" get-pip.py rm get-pip.py } 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 diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 75b7edbc..df82beeb 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.1.1g" +version="1.1.1k" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -sha="b213a293f2127ec3e323fb3cfc0c9807664fd997" +sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b" opensslHome="${HOME}/openssl-${version}" opensslSource="${opensslHome}-src" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 0749d3df..5a37a278 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -45,30 +45,57 @@ if (Is64BitWinHost) { # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$version = "1.1.1g" +$version = "1.1.1k" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997" +$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip") +$sha1 = "bad9dc4ae6dcc1855085463099b5dacb0ec6130b" +$prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945" $destination = "C:\Utils\openssl-android-master" +$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip" # msys unix style paths $ndkPath = "/c/Utils/Android/android-ndk-r19c" $openssl_path = "/c/Utils/openssl-android-master" $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin" -Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip -Verify-Checksum $zip $sha1 +if ((Test-Path $prebuilt_url)) { + Download $prebuilt_url $prebuilt_url $prebuilt_zip + Verify-Checksum $prebuilt_zip $prebuilt_sha1 + Extract-7Zip $prebuilt_zip C:\Utils + Remove $prebuilt_zip +} else { + Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip + Verify-Checksum $zip $sha1 + + Extract-7Zip $zip C:\Utils\tmp + Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp + Move-Item C:\Utils\tmp\openssl-${version} $destination + Remove "$zip" + + Write-Host "Configuring OpenSSL $version for Android..." + Push-Location $destination + # $ must be escaped in powershell... + + function CheckExitCode { -Extract-7Zip $zip C:\Utils\tmp -Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp -Move-Item C:\Utils\tmp\openssl-${version} $destination -Remove-Item -Path $zip + param ( + $p + ) -Write-Host "Configuring OpenSSL $version for Android..." -Push-Location $destination -# $ must be escaped in powershell... -Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") -Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") -Pop-Location + if ($p.ExitCode) { + Write-host "Process failed with exit code: $($p.ExitCode)" + exit 1 + } + } + + $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") + CheckExitCode $configure + + $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") + CheckExitCode $make + + Pop-Location + Remove-item C:\Utils\tmp -Recurse -Confirm:$false +} Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination" -Remove-item C:\Utils\tmp -Recurse -Confirm:$false Write-Output "Android OpenSSL = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index 7955689e..1e4f14e1 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -1,7 +1,6 @@ -############################################################################# +############################################################################ ## -## Copyright (C) 2019 The Qt Company Ltd. -## Copyright (C) 2019 Konstantin Tokarev <annulen@yandex.ru> +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -30,75 +29,26 @@ ## ## $QT_END_LICENSE$ ## -############################################################################# +############################################################################ . "$PSScriptRoot\helpers.ps1" -$scriptsPath = "C:\Python36\Scripts" +# This is temporary solution for installing packages provided by Conan until we have fixed Conan setup for this -Run-Executable "$scriptsPath\pip3.exe" "install -r $PSScriptRoot\conan_requirements.txt" -Write-Output "Conan = 1.29.0" >> ~\versions.txt +$url_conan = "\\ci-files01-hki.intra.qt.io\provisioning\windows\.conan.zip" +$url_conan_home = "\\ci-files01-hki.intra.qt.io\provisioning\windows\.conanhome.zip" +$sha1_conan_compressed = "1abbe43e7a29ddd9906328702b5bc5231deeb721" +$sha1_conanhome_compressed = "f44c2ae21cb1c7dc139572e399b7b0eaf492af03" +$conan_compressed = "C:\.conan.zip" +$conanhome_compressed = "C:\.conanhome.zip" -# Use Qt Project repository by default -Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force" +Download $url_conan $url_conan $conan_compressed +Verify-Checksum $conan_compressed $sha1_conan_compressed +Extract-7Zip $conan_compressed C:\ -Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos" +Download $url_conan_home $url_conan_home $conanhome_compressed +Verify-Checksum $conanhome_compressed $sha1_conanhome_compressed +Extract-7Zip $conanhome_compressed C:\Users\qt -function Run-Conan-Install -{ - Param ( - [string]$ConanfilesDir, - [string]$BuildinfoDir, - [string]$Arch, - [string]$Compiler, - [string]$CompilerVersion, - [string]$CompilerRuntime, - [string]$CompilerLibcxx, - [string]$CompilerException, - [string]$CompilerThreads - ) - - if ($CompilerRuntime) { - $extraArgs += " -s compiler.runtime=$CompilerRuntime" - } - - if ($CompilerLibcxx) { - $extraArgs += " -s compiler.libcxx=$CompilerLibcxx" - } - - if ($CompilerException) { - $extraArgs += " -s compiler.exception=$CompilerException" - } - - if ($CompilerThreads) { - $extraArgs += " -s compiler.threads=$CompilerThreads" - } - - $manifestsDir = "$PSScriptRoot\conan_manifests" - $buildinfoRoot = "C:\Utils\conanbuildinfos" - - Get-ChildItem -Path "$ConanfilesDir\*.txt" | - ForEach-Object { - $conanfile = $_.FullName - $outpwd = "$buildinfoRoot\$BuildinfoDir\$($_.BaseName)" - New-Item $outpwd -Type directory -Force | Out-Null - - for ($i = 1; $i -le 5; $i++) { - try { - Push-Location $outpwd - Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", ` - '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile" - break; - } catch { - if ($i -eq 5) { - throw "Could not install conan content" - } - } finally { - Pop-Location - } - } - - Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt" - } -} +Remove $conan_compressed +Remove $conanhome_compressed diff --git a/coin/provisioning/common/windows/disable-netadapterlso.ps1 b/coin/provisioning/common/windows/disable-netadapterlso.ps1 new file mode 100644 index 00000000..ca7ad3ca --- /dev/null +++ b/coin/provisioning/common/windows/disable-netadapterlso.ps1 @@ -0,0 +1 @@ +Disable-NetAdapterLso Ethernet diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 b/coin/provisioning/common/windows/install-azure-tool.ps1 index 2ad25685..937804fd 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 +++ b/coin/provisioning/common/windows/install-azure-tool.ps1 @@ -1,7 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. -## Copyright (C) 2017 Pelagicore AG +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -31,14 +30,11 @@ ## $QT_END_LICENSE$ ## ############################################################################# +. "$PSScriptRoot\helpers.ps1" -. "$PSScriptRoot\..\common\windows\helpers.ps1" +# This script will install Azure singtool using Dotnet SDK +$dotnet = "C:\Program Files\dotnet\dotnet.exe" -# Signing tools are needed to sign offline installers when releasing +$version = "2.0.17" +Run-Executable "$dotnet" "tool install --global AzureSignTool --version $version" -$url = "http://ci-files01-hki.intra.qt.io/input/semisecure/sign/sign.zip" -$destination = "C:\Windows\temp\sign.zip" - -Download $url $url $destination -Extract-7Zip "$destination" "C:\Utils" -Remove-Item -Path "$destination" diff --git a/coin/provisioning/common/windows/install-dotnet.ps1 b/coin/provisioning/common/windows/install-dotnet.ps1 new file mode 100644 index 00000000..8578c9b4 --- /dev/null +++ b/coin/provisioning/common/windows/install-dotnet.ps1 @@ -0,0 +1,59 @@ +############################################################################# +## +## Copyright (C) 2020 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 Dotnet SDK which is required for Azure installation + +$version = "2.1" +if (Is64BitWinHost) { + $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x64.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/c980b6fb-e570-4c73-b344-e4dae6573777/f844ac1a4c6ea5de7227a701786126fd/dotnet-sdk-2.1.809-win-x64.exe" + $sha1 = "343e80c2ab558a30696dbe03ad2288bf435d5cd8" +} else { + $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x86.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/cf86a2f3-f6b2-4959-8e41-cf84b0d2f294/a61e834f56abe2dc2e12599e1a60c10b/dotnet-sdk-2.1.809-win-x86.exe" + $sha1 = "b38a4e1392f17aed110508a1687f1c65b9d86161" +} +$installer = "C:\Windows\Temp\dotnet-sdk-$version.exe" + +Write-Host "Installing Dotnet SDK $version" +Download $urlOfficial $urlCache $installer +Verify-Checksum $installer $sha1 +Run-Executable "$installer" "/install /passive" +Prepend-Path "C:\Program Files\dotnet" +Remove $installer + +Write-Output "Dotnet SDK = $version" >> ~/versions.txt + + + diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 08f7d60f..b7abf11c 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -36,7 +36,7 @@ # This script installs OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "1_1_1g" +$version = "1_1_1k" $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" @@ -47,7 +47,7 @@ if (Is64BitWinHost) { $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "7643561c372720f55de51454a707ede334db086e" + $sha1 = "ab5367a1f46a3779a870fe2c1a99e03f8ffa3041" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -74,7 +74,7 @@ if (Is64BitWinHost) { $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "c7d4b096c2413d1af819ccb291214fa3c4cece07" +$sha1 = "49f5b7fe01d686f706071c9a00d19bd69f2e7371" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index c05c022c..23829595 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Copyright (C) 2017 Pelagicore AG ## Contact: http://www.qt.io/licensing/ ## @@ -40,7 +40,7 @@ param( ) . "$PSScriptRoot\helpers.ps1" -$version = "3.6.1" +$version = "3.6.2" $package = "C:\Windows\temp\python-$version.exe" # check bit version @@ -48,11 +48,11 @@ if ( $archVer -eq 64 ) { Write-Host "Installing 64 bit Python" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe" - $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff" + $sha1 = "bcf9bda733a9153811209c62d628c41ab6cedbe2" } else { $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version.exe" - $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1" + $sha1 = "cd9744b142eca832f9534390676e6cfb84bf655d" } Write-Host "Fetching from URL..." diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index 749363ab..1f371865 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -122,7 +122,7 @@ 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 # working, but we can use installed pip -sudo pip install --upgrade pip +sudo pip install --upgrade "pip < 21.0" sudo pip install virtualenv wheel # Needed by packaging scripts diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-enable-modules.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-enable-modules.sh new file mode 100755 index 00000000..2d6c2044 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-enable-modules.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 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$ +## +############################################################################# + +set -e + +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/suse_rk.sh -o "/tmp/suse_rk.sh" &>/dev/null +sudo chmod 755 /tmp/suse_rk.sh +/tmp/suse_rk.sh + +# Activate these modules +# sudo SUSEConnect -p PackageHub/12.4/x86_64 +sudo SUSEConnect -p sle-module-toolchain/12/x86_64 +sudo SUSEConnect -p sle-sdk/12.4/x86_64 +sudo SUSEConnect -p sle-module-legacy/12/x86_64 +# This is needed by Nodejs and QtWebEngine +sudo SUSEConnect -p sle-module-web-scripting/12/x86_64 + +sudo rm -f /tmp/suse_rk.sh diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh index cc9385e9..09a4e963 100755 --- a/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -41,12 +41,45 @@ set -ex sudo zypper -nq install python-devel -wget -q https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh -sed -i 's/12.3/12.4/g' build_python3.sh -bash build_python3.sh +# Selected installation instructions coming from: +# https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh +export PACKAGE_NAME="python" +export PACKAGE_VERSION="3.7.2" +( -export -python3 --version + sudo zypper install -y gcc gcc-c++ make ncurses patch wget tar zlib-devel zlib libffi-devel libopenssl-devel + + printf -- 'Configuration and Installation started \n' + + #Downloading Source code + wget "https://www.python.org/ftp/${PACKAGE_NAME}/${PACKAGE_VERSION}/Python-${PACKAGE_VERSION}.tar.xz" + tar -xvf "Python-${PACKAGE_VERSION}.tar.xz" + + #Configure and Build + cd "Python-${PACKAGE_VERSION}" + ./configure --prefix=/usr/local --exec-prefix=/usr/local + make + sudo make install + + export PATH="/usr/local/bin:${PATH}" + printf -- '\nInstalled python successfully \n' + + #Cleanup + cd - + rm "Python-${PACKAGE_VERSION}.tar.xz" + + #Verify python installation + if command -V "$PACKAGE_NAME"${PACKAGE_VERSION:0:1} >/dev/null + then + printf -- "%s installation completed. Please check the Usage to start the service.\n" "$PACKAGE_NAME" + else + printf -- "Error while installing %s, exiting with 127 \n" "$PACKAGE_NAME" + exit 127 + fi +) + + +python3 --version | fgrep "$PACKAGE_VERSION" pip3 install --user wheel pip3 install --user virtualenv diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh index 7ab8528a..0bfae515 100755 --- a/coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh @@ -76,7 +76,7 @@ ARCH_SELECTED=ALL COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset EOT -(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu) +(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu --ignore-signature) # Export LD_LIBRARY_PATH to Coin echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh new file mode 100755 index 00000000..0de056b6 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 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$ +## +############################################################################# + +set -e + +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/suse_rk.sh -o "/tmp/suse_rk.sh" &>/dev/null +sudo chmod 755 /tmp/suse_rk.sh +/tmp/suse_rk.sh + +# Activate these modules +sudo SUSEConnect -p sle-module-desktop-applications/15/x86_64 +sudo SUSEConnect -p sle-module-development-tools/15/x86_64 +# This is needed by Nodejs and QtWebEngine +sudo SUSEConnect -p sle-module-web-scripting/15/x86_64 + +sudo rm -f /tmp/suse_rk.sh diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh index 7ab8528a..0bfae515 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh @@ -76,7 +76,7 @@ ARCH_SELECTED=ALL COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset EOT -(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu) +(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu --ignore-signature) # Export LD_LIBRARY_PATH to Coin echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh index 7ab8528a..0bfae515 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh @@ -76,7 +76,7 @@ ARCH_SELECTED=ALL COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset EOT -(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu) +(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu --ignore-signature) # Export LD_LIBRARY_PATH to Coin echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh index 15511332..507463f8 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh @@ -4,4 +4,4 @@ set -ex brew update -brew install p7zip +brew install --build-from-source p7zip diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh index 95631107..8e8838ce 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -97,4 +97,16 @@ echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts sudo systemsetup settimezone GMT +# Setting Time Zone seems to be flaky in macOS 10.13. Checking that Time Zone is correct. If not, reset it. +if [[ $(sudo systemsetup -gettimezone) = *GMT* ]]; then + echo "Time Zone is GMT" +else + echo "Wrong Time Zone. Reset Time Zone to GMT" + sleep 5 + sudo systemsetup settimezone GMT + if [[ $(sudo systemsetup -gettimezone) != *GMT* ]]; then + echo "Couldn't set Time Zone!" + exit 1 + fi +fi sudo rm -f "$targetFile" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh index 15511332..507463f8 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh @@ -4,4 +4,4 @@ set -ex brew update -brew install p7zip +brew install --build-from-source p7zip diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh new file mode 100755 index 00000000..3b88d526 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/nodejs.sh" diff --git a/coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 new file mode 100644 index 00000000..d20f1402 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/11-conan.ps1 index d33ceea8..6215f9e4 100644 --- a/coin/provisioning/qtci-windows-10-x86/11-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/11-conan.ps1 @@ -1,17 +1 @@ . "$PSScriptRoot\..\common\windows\conan.ps1" - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-x86 ` - -Arch x86 ` - -Compiler "Visual Studio" ` - -CompilerVersion 14 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2017-x86 ` - -Arch x86 ` - -Compiler "Visual Studio" ` - -CompilerVersion 15 ` - -CompilerRuntime MD diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 new file mode 100644 index 00000000..d20f1402 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-runtimebroker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-runtimebroker.ps1 new file mode 100644 index 00000000..8ae8190d --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-runtimebroker.ps1 @@ -0,0 +1,4 @@ +# Disable RunTime Broker +# The RunTime Broker is a Windows system process, which helps to manage app permissions on your pc between Windows apps and ensures apps are behaving themselves. +# Coordinates execution of background work for WinRT application. If this service is stopped or disabled, then background work might not be triggered. +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TimeBrokerSvc" /V Start /T REG_dWORD /D 4 /F diff --git a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 index 4a7414d1..6215f9e4 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 @@ -1,53 +1 @@ . "$PSScriptRoot\..\common\windows\conan.ps1" - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-x86_64 ` - -Arch x86_64 ` - -Compiler "Visual Studio" ` - -CompilerVersion 14 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-x86 ` - -Arch x86 ` - -Compiler "Visual Studio" ` - -CompilerVersion 14 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2017-x86_64 ` - -Arch x86_64 ` - -Compiler "Visual Studio" ` - -CompilerVersion 15 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2017-x86 ` - -Arch x86 ` - -Compiler "Visual Studio" ` - -CompilerVersion 15 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86 ` - -Arch x86 ` - -Compiler "gcc" ` - -CompilerVersion 8 ` - -CompilerLibcxx "libstdc++" ` - -CompilerException "dwarf2" ` - -CompilerThreads "posix" - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw-x86_64 ` - -Arch x86_64 ` - -Compiler "gcc" ` - -CompilerVersion 8 ` - -CompilerLibcxx "libstdc++" ` - -CompilerException "seh" ` - -CompilerThreads "posix" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 new file mode 100644 index 00000000..a2ecfba2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-dotnet.ps1" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 b/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 new file mode 100644 index 00000000..f1d5acc3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-azure-tool.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 index 1d928ffa..6215f9e4 100644 --- a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 @@ -1,11 +1 @@ . "$PSScriptRoot\..\common\windows\conan.ps1" - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw-x86 ` - -Arch x86 ` - -Compiler "gcc" ` - -CompilerVersion 8 ` - -CompilerLibcxx "libstdc++" ` - -CompilerException "dwarf2" ` - -CompilerThreads "posix" diff --git a/coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 new file mode 100644 index 00000000..d20f1402 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 new file mode 100644 index 00000000..d20f1402 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/qt3d b/qt3d -Subproject 6704dfddcb6630809abc55b420dd125aa292922 +Subproject e04a70eb3b6e11a2eddc1ac912f3aecfb23ac6c diff --git a/qtactiveqt b/qtactiveqt -Subproject c81918a0b2dddf10c424d99bae7de4d5ab58e21 +Subproject 831f0ce790c03bb1a390080178f3833e1a7096c diff --git a/qtandroidextras b/qtandroidextras -Subproject 4a5732791112b53a038175ea284e7e28a59dcf2 +Subproject fe32242c513a62e20d539f2768c40a2b70f6fc8 diff --git a/qtbase b/qtbase -Subproject 0c43162109c164d112d00280145f2da93859b3e +Subproject 1d5a2e924bfda9cf5eb8118812cb4652b97178b diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 3c642062e896f3c6f300108ece203f89f68e578 +Subproject b7080e5e66f2c799251bc637fd7dcaca7dda24c diff --git a/qtcharts b/qtcharts -Subproject d8d2057cbfcf190908a9780085726200bcfe559 +Subproject acecb7321c22267d9372d2e23a452592cb5e45e diff --git a/qtconnectivity b/qtconnectivity -Subproject 8618e25e01ca9c6c6b2221041f625ac69f6757b +Subproject 6141231525a64232bfb00960a6d4ad181d5bef2 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject e2c93beb40914118861a329889c08ca04fb5457 +Subproject 7cf388560ac989d19294aed6f6fbca74b761ac7 diff --git a/qtdeclarative b/qtdeclarative -Subproject 0c7757ff6f75505d5abc4baa9522b63d694c92a +Subproject 824570979e211171f158e7fcab15c599c5e7ca4 diff --git a/qtdoc b/qtdoc -Subproject 87f44f3b3343fd6369b46a98138efd97b574fa2 +Subproject 8cfc85c8b5759a2dbafd80b27175f3363420e1d diff --git a/qtgamepad b/qtgamepad -Subproject dd95a7e0c6a8f00cc6f97f3db17eb7abcadef91 +Subproject 7977b4ddad8fdd847424d3b517c288bacc21a02 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject b2634e344d73154aea459031cf8fa298e668c4f +Subproject 266b575c61ce4e3689d48663a93ef235006613e diff --git a/qtimageformats b/qtimageformats -Subproject 1ad9d3142821ef0d00c2f1317e64e67fad2e5bc +Subproject 97151e285f51a54bf0025b1ca986bf3d07cc485 diff --git a/qtlocation b/qtlocation -Subproject 1467a23cb25779d304e5bcdd6feb1b059c6609e +Subproject 1731750f2907c3498a06c02f9f271b392a9501f diff --git a/qtmacextras b/qtmacextras -Subproject 904ef25fe88995edb80b0094d8d507a34bd735b +Subproject 3d62e1315dfb5afc7a988e11fca6b32765cb094 diff --git a/qtmultimedia b/qtmultimedia -Subproject a83b9873c0d2fe6001e3653e7ec8126c368dfd3 +Subproject 6a7742432e2c1541f65cfcf8a4137dd42f783d3 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject c8ee9188de609b4432e70a8b1edbc52d756c348 +Subproject 7739b4b995977445695457c57bbd7008f2d39e6 diff --git a/qtpurchasing b/qtpurchasing -Subproject e6f9faf8b2e3b8973875913859962946874ce36 +Subproject 6d3d2b2b659caa8dd158a1aedd796bed9b2e3a2 diff --git a/qtqa b/qtqa -Subproject ed6d429996a12b718aee0a5d6efe4e80be3afac +Subproject a6a4b6091b2d91d333c6d12aea3e64ad8080c2e diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 8b9258bea9928718827f19e3f2de43ad2e06f86 +Subproject 3fa3824bdf1eacf00e96fc2f34ce5709acc5666 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 249469f9ee1ca682e2d2b69da57e4408f635429 +Subproject 898091385d34427ec2032bcee15b5ceb4d10286 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject ca91b0a52fa3586790bcc54d941aa7e4c058950 +Subproject e984c11fd225bbe807762e105a2b6c701eeb391 diff --git a/qtrepotools b/qtrepotools -Subproject ee34618d9f94e0cb6f678140e6cd2916308531b +Subproject 0c9290408c128d29411acb13add50209ea2f435 diff --git a/qtscript b/qtscript -Subproject 1864a837cb69bd827222a8a7ab738b576f0fe1f +Subproject 337059fe1ce7d3236a6a7cec1c3622fe3e91192 diff --git a/qtscxml b/qtscxml -Subproject 585b47f5a171a0c1052fae5b7a575d27893caaf +Subproject a5482507a444dc06774fb0365eddd73e5dac114 diff --git a/qtsensors b/qtsensors -Subproject a24dc8e867bbf97078babec7b752ccaf6638cea +Subproject 6af0f5497c5c550c449036ddbd7a4684faadde8 diff --git a/qtserialbus b/qtserialbus -Subproject 0a751b7ca63b96a2642dea4f2d012099a2f1aeb +Subproject 29d038921e929ad4d6a56857de7fef368f4cd7f diff --git a/qtserialport b/qtserialport -Subproject 9f839731d9a2dfa7ca022afabda8a2071f55e17 +Subproject dbc00fa42ac4779cf2846640c3117c351de04aa diff --git a/qtspeech b/qtspeech -Subproject 074286060690994c9bcf0e94ff859ceea63045f +Subproject 8bbdcfc0f700f3cf9180e44db1e71e223d80936 diff --git a/qtsvg b/qtsvg -Subproject 80fe597932f9ed930d33035d5be585c30726554 +Subproject 85485845bdf502674edf4d5b840f0194e62da7b diff --git a/qttools b/qttools -Subproject 3d0c0bda6c3f5b36cac96b20fa8a17db112bc1d +Subproject 9ff3504a4387f87a38e3207fe9c3c5d2a9428d5 diff --git a/qttranslations b/qttranslations -Subproject f4c821a18e4a22ae83db0719fc636cbe0cd03cb +Subproject 62e14d18353f19b5747275a08f808e962f1f0b5 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 3866fb086f9bed844b1768cd1b95d798e8cbf7e +Subproject e5f70404fd6f9aa64dd6dd2435d6340d46821b4 diff --git a/qtwayland b/qtwayland -Subproject b2ee9ff3992ee723be178c655464f2dc6f7a9b3 +Subproject 190646bcf0ae20174f32a240a81c9830dedd3c9 diff --git a/qtwebchannel b/qtwebchannel -Subproject ee94974592b1423b0438f809390a9237cdc8f1e +Subproject 4d43a2fbdb4c43d9ae232dc5d646514fca525e3 diff --git a/qtwebengine b/qtwebengine -Subproject fb171df0f34d216b1189b5277966c231729b63e +Subproject c3b0847c0fb09df197554fed7bba1683191b9c1 diff --git a/qtwebglplugin b/qtwebglplugin -Subproject b3089f235788650eac329c552393a36b3f65f06 +Subproject 1c9f1fef2cc13d63086fdeaa536d4e5465c126d diff --git a/qtwebsockets b/qtwebsockets -Subproject 56c4699b432ad2ea9e1de9922ee97ac7c637f2f +Subproject 78c04c8d106339ae78259ccf2c5e03e7a8bce08 diff --git a/qtwebview b/qtwebview -Subproject fa3d166d96c958d62c5f02c1f6475ce1fb3f08b +Subproject a62f0e2ddf4c884a0d535df91edb4dfe21e8dfc diff --git a/qtwinextras b/qtwinextras -Subproject 301962d5d36a526155c4e5d0c5c3a4c0fbef428 +Subproject 1bede247fdf825d94d22ea6c910e96dd039d2be diff --git a/qtx11extras b/qtx11extras -Subproject 2f7e2243c613677efe386d8e1ca0699a4050b0d +Subproject d1f806ed5eed226b35e94f91381e2533cdd6a5f diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject bac4d2eb31cc7d2df246fe069376dad0ed531dc +Subproject 6d445812a9c584c8483511023acb25e17f20ca2 |