From 31f5c48a80e140562588bd673ef35fb4efe3d643 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 1 Nov 2018 12:23:34 +0200 Subject: Provisioning: Change openssl version to 1.1.1b Use newest LTS version of openssl as support for 1.0.2 series will end at end of 2019. For windows 7 x86 openssl 1.0.2 will be used until all need fixed are made to submodule tests Task-number: QTQAINFRA-2327 Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3 Reviewed-by: Jani Heikkinen (cherry picked from commit 3e838f2a34d0c1538535bd184aa12681497c8a38) --- coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 | 1 - coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 deleted file mode 100644 index 25c6f28a..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\android-openssl.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 new file mode 100644 index 00000000..25c6f28a --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\android-openssl.ps1" -- cgit v1.2.3 From b9e92adf5950d35ade47101641cf8f318bb77aef Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Wed, 13 Feb 2019 13:06:27 +0200 Subject: Provisioning: install msys2 Windows need msys2 perl for configuring openssl 1.1.1 for android. Task-number: QTQAINFRA-2327 Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8 Reviewed-by: Heikki Halmet (cherry picked from commit 6465c421225574dc1c5d9f23293c37e784fd1b02) Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 new file mode 100644 index 00000000..be9a3634 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-msys2.ps1" -- cgit v1.2.3 From c8deeb3d052bafd4ba50e44de56958b62b98fd82 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 11 Apr 2019 12:24:45 +0300 Subject: Provision sed for windows 10 Sed is needed by webassembly build. Cannot use sed from msys as having msys bin folder in path breaks webassembly build. Task-number: QTQAINFRA-2835 Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618 Reviewed-by: Heikki Halmet (cherry picked from commit 230a73409a2fe58e7de0674107a2d870be0bf03d) Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 new file mode 100644 index 00000000..b3c8fded --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sed.ps1" -- cgit v1.2.3 From 6465c421225574dc1c5d9f23293c37e784fd1b02 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Wed, 13 Feb 2019 13:06:27 +0200 Subject: Provisioning: install msys2 Windows need msys2 perl for configuring openssl 1.1.1 for android. Task-number: QTQAINFRA-2327 Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 new file mode 100644 index 00000000..be9a3634 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-msys2.ps1" -- cgit v1.2.3 From 230a73409a2fe58e7de0674107a2d870be0bf03d Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 11 Apr 2019 12:24:45 +0300 Subject: Provision sed for windows 10 Sed is needed by webassembly build. Cannot use sed from msys as having msys bin folder in path breaks webassembly build. Task-number: QTQAINFRA-2835 Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 new file mode 100644 index 00000000..b3c8fded --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sed.ps1" -- cgit v1.2.3 From 3e838f2a34d0c1538535bd184aa12681497c8a38 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 1 Nov 2018 12:23:34 +0200 Subject: Provisioning: Change openssl version to 1.1.1b Use newest LTS version of openssl as support for 1.0.2 series will end at end of 2019. For windows 7 x86 openssl 1.0.2 will be used until all need fixed are made to submodule tests Task-number: QTQAINFRA-2327 Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3 Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 | 1 - coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 deleted file mode 100644 index 25c6f28a..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\android-openssl.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 new file mode 100644 index 00000000..25c6f28a --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/50-openssl_for_android.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\android-openssl.ps1" -- cgit v1.2.3 From 5db0ce74b7a681fb57f817751a7db3fe80e8c523 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 2 Apr 2019 12:39:54 +0300 Subject: Provisioning: Update QNX 7.0 packages Updated packages includes QNX Multimedia Suite 2.0, which enables building QtMultimedia QNX plugins Task-number: QTBUG-71073 Change-Id: Iaf7cabfe1dc59441abb978c261590c41f7aa0cdc Reviewed-by: Samuli Piippo --- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning/qtci-windows-10-x86_64') diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index 74c8dc6b..b7a5230c 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,10 +36,10 @@ # This script installs QNX SDP 7.0 $zip = Get-DownloadLocation "qnx700.7z" -$url = "http://ci-files01-hki.intra.qt.io/input/windows/qnx700-20180801-windows.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-windows.7z" Download $url $url $zip -Verify-Checksum $zip "E281897C957B5FAB249BABB2DEB77EEBB9BA75E6" +Verify-Checksum $zip "59c681466ff78f64b98b16a95b0b44650a729dfd" Extract-7Zip $zip C:\ Set-EnvironmentVariable "QNX_700" "C:\QNX700" -- cgit v1.2.3 From 2666f3b21609e0e22ffd1bbeead3ff91b8b0ca93 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 16 Jul 2019 18:38:32 +0300 Subject: Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming convention MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If24541709d4675498bc4af296e05ce3c62d5045a Reviewed-by: Mårten Nordheim --- coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/qtci-windows-10-x86_64') diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 index c2068666..40131a81 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` -- cgit v1.2.3 From 716640a4770c8e11ab5f6e6ebb8db64868c2679b Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 26 Jul 2019 18:57:59 +0300 Subject: Provisioning: update Conan and Conan packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [*] Update Conan to 1.17.0, adjust to change in command line arguments [*] Update Conan packages to up-to-date versions, add libjpeg-turbo and packages for 64-bit MinGW [*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after Python 3 and MinGW [*] Add license header to conan.ps1 Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f Reviewed-by: Mårten Nordheim --- .../qtci-windows-10-x86_64/03-conan.ps1 | 33 -------------- .../qtci-windows-10-x86_64/11-conan.ps1 | 53 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | 23 +++++++--- 3 files changed, 70 insertions(+), 39 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 deleted file mode 100644 index 40131a81..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 +++ /dev/null @@ -1,33 +0,0 @@ -. "$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 diff --git a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 new file mode 100644 index 00000000..a651bb0c --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 @@ -0,0 +1,53 @@ +. "$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 7 ` + -CompilerLibcxx "libstdc++" ` + -CompilerException "dwarf2" ` + -CompilerThreads "posix" + +Run-Conan-Install ` + -ConanfilesDir "$PSScriptRoot\conanfiles" ` + -BuildinfoDir Mingw73-x86_64 ` + -Arch x86_64 ` + -Compiler "gcc" ` + -CompilerVersion 7 ` + -CompilerLibcxx "libstdc++" ` + -CompilerException "seh" ` + -CompilerThreads "posix" diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index a7ced8ae..4d9ca4b9 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -1,7 +1,8 @@ [requires] -icu/59.1@vitallium/stable -libxml2/2.9.4@vitallium/stable -libxslt/1.1.29@vitallium/stable +icu/64.2@qtproject/stable +libxml2/2.9.9@qtproject/stable +libxslt/1.1.33@qtproject/stable +libjpeg-turbo/2.0.2@qtproject/stable [generators] cmake @@ -9,12 +10,22 @@ txt [options] icu:shared=True +icu:data_packaging=library + libxml2:shared=True +libxml2:iconv=False +libxml2:icu=True +libxml2:zlib=False + libxslt:shared=True +libjpeg-turbo:shared=False + [imports] -bin, icudt59.dll -> ./bin -bin, icuin59.dll -> ./bin -bin, icuuc59.dll -> ./bin +lib, icudt64.dll -> ./bin +lib, icuin64.dll -> ./bin +lib, icuuc64.dll -> ./bin bin, libxml2.dll -> ./bin bin, libxslt.dll -> ./bin +bin, libxml2-2.dll -> ./bin +bin, libxslt-1.dll -> ./bin -- cgit v1.2.3 From 38e416be664dc216b332e6b4ff8d38905dfdc1e9 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Tue, 16 Apr 2019 10:16:41 +0300 Subject: Add webAssembly build for windows and macos Provision emsdk and its dependecies to windows and macos. Task-number: QTBUG-63917 Task-number: QTQAINFRA-2835 Done-with: Juha Karjalainen Change-Id: I24ea9cbc4f7cc95e6952765099d5e46247470011 Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') diff --git a/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 new file mode 100755 index 00000000..b72470a2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/80-emsdk.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\emsdk.ps1" + -- cgit v1.2.3