Compare commits

..

32 Commits
5.12 ... 5.12.7

Author SHA1 Message Date
Heikki Halmet
6b9f328dc4 Provisioning: Temporary fix for installing Conan packages in Windows
Task-number: QTQAINFRA-4443
Change-Id: Iba4b240edaf4a3ec8732ddbe1ae4ac5c1166b676
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 99a81d0c6c)
2021-05-20 10:54:26 +03:00
Heikki Halmet
6326c99530 Add InsignificantTests flag for failing Windows targets
tst_QWebEngineUrlRequestInterceptor::firstPartyUrlHttp fails with these
Windows targets and would require fix for QtWebengine.
Let's use this flag and avoid making Qt related changes to this
closed branch. Branch is still used by IFW.

Change-Id: Iccf61bfe80724b6a68360bda2ac731eb588a4a6e
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-05-20 10:54:02 +03:00
Liang Qi
917f7d06d0 provisioning: update python to 3.7 on macos
Task-number: QTQAINFRA-3271
Change-Id: Ic1645a8b5bc94b0ce6ff58352891af0beabd7649
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit ecf2f4f38c)
2021-05-04 07:47:59 +03:00
Heikki Halmet
6521ae6f0e Provisioning: Upgrade python 3.6 version to 3.6.2 in Windows
typing.NoReturn is not included in python 3.6.1 version. We need at
least 3.6.2 version

Task-number: QTQAINFRA-4433
Change-Id: Ifa9d45b4a3e06f4455221bb76087b600c1f1e06a
Reviewed-by: Dan Ackers <dan.ackers@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 81f028ea89)
2021-05-04 07:47:57 +03:00
Heikki Halmet
62b4a60d6c Provisioning: Activate SLES and enable modules
Task-number: QTQAINFRA-4437
Change-Id: Icfe15e028634eeef85671b2becefe98123f567f8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 0607b95757)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-05-04 04:47:56 +00:00
Heikki Halmet
d6e3aa0869 Provisioning: Latest pip versions don't support Python 2 anymore
We can't upgrade pip anymore to the latest version.
pip 20.3 was the last version of pip that supported Python 2

Pick-to: 5.12
Task-number: QTQAINFRA-4235
Change-Id: I2add6939614f282416a39b00734bc1d22906de47
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-02-03 16:56:03 +02:00
Heikki Halmet
a1521e472b Provisioning: get-pip.py address changed for python 2.7
For python27 get-pip file's location has been changed and we
need to use two different get-pip files for different python
versions.
Let's also cache these python files and use cache as primary
url.

Task-number: QTQAINFRA-4210
Change-Id: Iebc00f6f319bb914f7548d4737e13fed9ac2b292
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 6d20944daf)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-01-27 07:48:46 +02:00
Katja Marttila
8da20a0a1b IFW Coin: Build only release builds
Without the '-release' option IFW tools are built as debug. In
Windows it means unnecessary large installers and dependencies to msvc
debug libraries.

Change-Id: I3197216c91e82934ea11bdc3d635ce61516bc64e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-01-25 15:57:40 +02:00
Heikki Halmet
60fc595471 Provisioning: Remove brew cask list query
brew cask list --versions don't work anymore with macOS 10.13:
Calling brew cask list is disabled!

Change-Id: I44d64bea36577212d0d8ff1fbd4f40111b8cadee
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit e3c294489f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-01-14 18:06:40 +00:00
Heikki Halmet
d238c03742 Provisioning: Add --ignore-signature to ICC installation
ICC installation fails when checking digital signature

Task-number: QTQAINFRA-4174
Change-Id: Idcbca27a852abbd0824938f825807121a4f60c3e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-14 20:06:38 +02:00
Heikki Halmet
9452e1421e Provisioning: Install p7zip using --build-from-source parameter
brew install p7zip isn't working anymore with macOS 10.13 and 10.12.
Let's use --build-from-source parameter with brew installation

Task-number: QTQAINFRA-4128
Change-Id: Ib1a2db1cd3176955cca450e5ebe0d0fc1bee3aa4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c470301c34)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-01-14 20:06:36 +02:00
Heikki Halmet
14a4b1173a Update macOS 10.13 Tier1 image
Software updates are disabled from tier1 image.
It seems, that without this macOS 10.13 keep on crashing.
This is related to QTQAINFRA-4104

Change-Id: I92f0039102d93268358301bfb789765ca39fd1ae
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-12-20 18:58:05 +00:00
Heikki Halmet
eaa1b9c517 Provisioning: Install Dotnet SDK 2.1
Dotnet is needed for Azure installation

Task-number: QTQAINFRA-4042
Change-Id: I6dd9d965f536d28554bbce6e76b19a3861f55ff2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8846d0d52d)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-12-20 20:57:55 +02:00
Heikki Halmet
a696d420a9 Provisioning: Install Azure tool
Task-number: QTQAINFRA-4042
Change-Id: I8e29190f4caf8b766cced40042bfe60ec2601a8e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit cdea442a3a)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-12-20 20:57:48 +02:00
Heikki Halmet
12b6b12c99 Add InsignificantTests flag for Windows 7 mingw73-x86
tst_QWinJumpList::testRecent started to fail. Let's use InsignificantTests
flag because We don't want to make Qt changes to this released branch and
we need to merge few provisioning changes.

Change-Id: Iabbca3256f9b9ab81d899edc2765a2acbcbd360e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-12-20 20:57:41 +02:00
Simo Fält
53680499c8 Fix tqtc-installer-framework platform configs
Change-Id: Ib5625c56507d2331e75b97a3757e0930cdee06a2
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2020-11-18 09:21:46 +02:00
Heikki Halmet
45104551cc Upgrade msys2 package and the installation script
This change will upgrade the msys2 package

Change also updates the script to use cached
prebuilt package if available.

This will also remove unneeded x86 installation

Task-number: QTQAINFRA-3986
Change-Id: Ia6299f9d4750376676276a75613e7f1098de4102
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 134c2a1cb0)
(cherry picked from commit 08a384605a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-11-16 06:49:15 +00:00
Heikki Halmet
08a4711560 Provisioning: Retry python installation if failure occurs
Python installation is flaky and we haven't be able to determine the
root cause for it. Re-running the installation might help.
(Might) because we can't reproduce this manually.

Task-number: QTQAINFRA-3875
Change-Id: Id46d250a02e01007f03dfbb886d75b23c23a6216
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 6e3cb240df)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit a7b8f5abd8)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-11-16 06:49:11 +00:00
Heikki Halmet
d366cd84da Provisioning: Enable access to SMB server in Windows 10 x64
Windows don't allow insecure guest login anymore by default. It need
to be enabled through Group Policy restrictions

Task-number: QTQAINFRA-3980
Change-Id: I767e9c87ca3ee4737e312142ecefb94ee2b2b828
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 586856e180)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2020-10-26 09:15:28 +03:00
Toni Saario
5bb33f606e Update windows tier1 image
Changes in coin to virtual machine template exposed a bug where older
windows version deadlocks jom in multithreaded environment.
-16 version of the windows 10 image is latest to include msvc2017,
update to this.

Task-number: COIN-598
Change-Id: Icc75ad4a6029332ebcd4acaad563156a139dc280
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 573c35b164)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2020-10-26 06:15:25 +00:00
Konstantin Tokarev
c9d7845744 Provisioning: Update Conan packages
* Update libjpeg-turbo to 2.0.5
* Replace MinGW 7 packages with MinGW 8
* Remove zlib packages as Qt is consistently built with -qt-zlib now

Task-bumber: QTQAINFRA-3916
Change-Id: Ie15bbb0f0f5b3a4c1a5d08f2341e9eb16a80cce7
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
(cherry picked from commit 27d187eb32)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit b5eb36d689)
2020-10-26 06:15:22 +00:00
Simo Fält
2d76b3d64d Fix installer configure args to create only release executables
Fixes: QTIFW-1999
Change-Id: I0efe695e8bdab9bc23e8122deb6b4e7f8aafa7bd
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2020-10-26 09:15:19 +03:00
Heikki Halmet
14518cdb66 Provisioning: Update signing tools for macOS
Update expired certificates

Task-number: QTQAINFRA-3540
Change-Id: I21e718901cb3f5c901273c0c122430f5caaea3d0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit fd7bfcc0c5)
2020-09-02 13:51:45 +03:00
Heikki Halmet
a3dc8db12a Provisioning: Renew iPhone signing tools
Task-number: QTQAINFRA-3434
Change-Id: I53665bf4e0799da7a23ba60aff37e26052d0374a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
(cherry picked from commit c1b06ec3e5)
(cherry picked from commit 325840d753)
2020-08-31 11:50:49 +00:00
Iikka Eklund
307038829f Add platform config for tqtc-installer-framework
This is similar to installer-framework.yaml with added configurations
for QtInstaller specific builds.

This enables two sets of builds from the same branch of
tqtc-installer-framework.

First set is for plain tqtc-installer-framework builds
i.e. the commercial deliverable.

The "QtInstaller" set is for the consumption of Qt Installer
creation.

Task-number: QTIFW-1027
Change-Id: Ifff750eef2631ce4e16edb32a7f7df593c698944
Reviewed-by: Simo Fält <simo.falt@qt.io>
2020-06-25 14:09:19 +03:00
Heikki Halmet
c0d0efba10 Provisioning: Activate subscriptions
Task-number: QTQAINFRA-3638
Change-Id: Ide5599a45b918dcbd44a7d60a78c3a4811d80943
(cherry picked from commit 5148639647)
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit 7759daa6ff)
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
(cherry picked from commit 70314ea485)
2020-05-15 06:34:14 +00:00
Simo Fält
88c50ff7e3 Update qtbase
Change-Id: Ieeb4cf6e045d35de31261c2d1c094bd2b091e948
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-04-24 08:15:27 +03:00
Iikka Eklund
5f1199953f Enable tests for installer-framework
Remove DisableTests feature from build configurations.

Task-number: QTIFW-1638
Change-Id: I6a66547306c732f6c5815e8ca6e8955f55d6cc5b
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2020-04-24 08:15:24 +03:00
Simo Fält
4945ac17d9 Add installer-framework specific platform configs
Task-number: COIN-287
Change-Id: If9de982bc40ae86176fe0a233efea150b0a2811e
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit dc70564fa0)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-17 05:45:06 +00:00
Dimitrios Apostolou
cdd3125b8c Fix openssl build in SLES-15
Upstream changes of binutils or elfutils broke the build. Error was:

/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/libc_nonshared.a(elf-init.oS): unable to initialize decompress status for section .debug_info
/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/libc_nonshared.a: error adding symbols: file format not recognized
collect2: error: ld returned 1 exit status

Task-number: QTQAINFRA-3527.
Change-Id: I50b677598b4415a281abbf0ddb2db39613646b36
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit eee60c0824)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-17 05:45:00 +00:00
Dimitrios Apostolou
fd9a0f84d5 Execute a specific version of homebrew install script
Also first try to download it from local mirror.

This install script appears to be doing a lot of git-cloning and downloading
itself though, so it is still far from the ideal solution: to only download
from locally cached endpoints.

Task-number: QTQAINFRA-3134
Change-Id: I32131045d6e62f302ec666b4ac055ca5ee9662d5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit c0033df4b9)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-17 07:44:52 +02:00
Konstantin Tokarev
3d2dd3a8ce Provisioning: update Conan and Conan packages to latest versions
Task-number: QTQAINFRA-3556
Change-Id: If9c600a6bb3aae893924f9372c8b248d3e58f887
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit b73e61a458)
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2020-03-17 05:44:46 +00:00
89 changed files with 429 additions and 556 deletions

80
.gitmodules vendored
View File

@@ -1,60 +1,60 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.12
branch = 5.12.7
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.12
branch = 5.12.7
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.12
branch = 5.12.7
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.12
branch = 5.12.7
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 5.12
branch = 5.12.7
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.12
branch = 5.12.7
status = essential
priority = 30
[submodule "qtdoc"]
@@ -62,7 +62,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
branch = 5.12
branch = 5.12.7
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -83,14 +83,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -123,185 +123,185 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
branch = 5.12
branch = 5.12.7
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.12
branch = 5.12.7
status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 5.12
branch = 5.12.7
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 5.12
branch = 5.12.7
status = addon

View File

@@ -5,12 +5,13 @@
-
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw73'
Features: ['InsignificantTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
-
Template: 'qtci-windows-10-x86_64-16'
Target arch: 'x86'
Compiler: 'MSVC2017'
Features: ['Packaging']
Features: ['Packaging', 'InsignificantTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86%'
-
Template: 'qtci-windows-10-x86_64-16'
@@ -34,7 +35,7 @@
-
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2017'
Features: ['Packaging']
Features: ['Packaging', 'InsignificantTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
-
Template: 'qtci-windows-10-x86_64-16'

View File

@@ -5,20 +5,20 @@ Configurations:
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2015'
Target arch: 'x86'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install'
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-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'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install'
-
Template: 'qtci-linux-RHEL-7.4-x86_64'
Compiler: 'GCC'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs'
-
Template: 'qtci-linux-RHEL-7.4-x86_64'
Compiler: 'GCC'

View File

@@ -0,0 +1,22 @@
Version: 2
Module only: True
Include: [ installer-framework.yaml ]
Configurations:
-
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2015'
Target arch: 'x86'
Features: ['Packaging', 'QtInstaller']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install'
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'
Compiler: 'Clang'
Features: ['Packaging', 'QtInstaller']
Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install'
-
Template: 'qtci-linux-RHEL-7.4-x86_64'
Compiler: 'GCC'
Features: ['Packaging', 'QtInstaller']
Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs'

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## 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.
@@ -41,7 +41,6 @@ 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
@@ -54,10 +53,11 @@ else
rm -rf "$exports_file"
fi
version="1.1.1d"
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="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
sha="056057782325134b76d1931c48f2c7e6595d7ef4"
opensslHome="${HOME}/openssl/android/openssl-${version}"
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
mkdir -p "${HOME}/openssl/android/"

View File

@@ -41,8 +41,8 @@ set -ex
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz"
sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20180801-linux.tar.xz"
sha1="5d2c8f531823b1f7a2e20968dc698c187c7de94c"
folderName="qnx700"
targetFile="qnx700.tar.xz"
wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"

View File

@@ -1,50 +0,0 @@
#!/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

View File

@@ -9,7 +9,7 @@ argh==0.26.2
click==6.7
coloredlogs==10.0
humanfriendly==4.15.1
Jinja2==2.10.3
Jinja2==2.10
MarkupSafe==1.0
path.py==11.0.1
pathtools==0.1.2

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2021 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.
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="1.1.1k"
version="1.1.1d"
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="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
sha="056057782325134b76d1931c48f2c7e6595d7ef4"
opensslHome="${HOME}/openssl-${version}"
opensslSource="${opensslHome}-src"
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## 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.
@@ -33,93 +33,141 @@
##
#############################################################################
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
set -ex
# This script will fetch and extract pre-buildt squish package for Linux and Mac.
# This script will install squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA)
version="6.6.1"
version="6.4.3"
# Branch version without dot
qtBranch="512x"
installFolder="/opt"
squishFolder="$installFolder/squish"
preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable"
licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license"
licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a"
squishFolder="/opt/squish"
squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
squishFile="squish-$version-qt$qtBranch-linux64.run"
if uname -a |grep -q Darwin; then
compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz"
sha1="18d683c8702ec47528e36f8e352bc64b07e7996a"
else
compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
sha1="9cb84b7c8d920ced056ce94ce75b0879c29fba22"
squishFile="squish-$version-qt$qtBranch-macx86_64.dmg"
fi
mountFolder="/tmp/squish"
sudo mkdir "$mountFolder"
squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
squishLicenseFile=".squish-3-license.tar.gz"
# Check which platform
if uname -a |grep -q Darwin; then
usersGroup="staff"
squishLicenseDir="/Users/qt"
elif uname -a |grep -q "el7"; then
usersGroup="qt"
squishLicenseDir="/root"
elif uname -a |grep -q "Ubuntu"; then
usersGroup="users"
squishLicenseDir="/home/qt"
else
usersGroup="users"
squishLicenseDir="/root"
testSuite="suite_test_squish"
testSuiteUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
# These checks can be removed when Vanilla OS for all linux and Mac are in
if [ -d "$squishFolder" ]; then
echo "Move old squish to /tmp"
sudo mv "$squishFolder" "/tmp/squish_$(date)"
fi
targetFileMount="$mountFolder"/"$compressedFolder"
echo "Mounting $preBuildCacheUrl to $mountFolder"
sudo mount "$preBuildCacheUrl" "$mountFolder"
echo "Create $installFolder if needed"
if [ ! -d "$installFolder" ]; then
sudo mkdir "$installFolder"
if [ -f "/etc/profile.d/squish_env.sh" ]; then
echo "Remove /etc/profile.d/squish_env.sh"
sudo rm -f "/etc/profile.d/squish_env.sh"
export SQUISH_LICENSEKEY_DIR=$HOME
fi
VerifyHash "$targetFileMount" "$sha1"
function MountAndInstall {
url=$1
targetDirectory=$2
targetFile=$3
echo "Uncompress $compressedFolder"
sudo tar -xzf "$targetFileMount" --directory "$installFolder"
echo "Unmounting $mountFolder"
sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
sudo mv "$installFolder/rta_squish_$version" "$squishFolder"
if uname -a |grep -q "Ubuntu"; then
if [ ! -e "/usr/lib/tcl8.6" ]; then
sudo mkdir /usr/lib/tcl8.6
sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
# Check which platform
if uname -a |grep -q Darwin; then
usersGroup="staff"
mountFolder="/Volumes"
squishLicenseDir="/Users/qt"
elif uname -a |grep -q "el7"; then
usersGroup="qt"
mountFolder="/tmp"
squishLicenseDir="/root"
elif uname -a |grep -q "Ubuntu"; then
usersGroup="users"
mountFolder="/tmp"
squishLicenseDir="/home/qt"
else
usersGroup="users"
mountFolder="/tmp"
squishLicenseDir="/root"
fi
fi
DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/.squish-3-license"
function UnMount {
echo "Unmounting $mountFolder"
sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
}
echo "Changing ownerships"
sudo chown -R qt:$usersGroup "$squishFolder"
sudo chown qt:$usersGroup "$HOME/.squish-3-license"
targetFileMount="$mountFolder"/"$targetFile"
echo "Mounting $url to $mountFolder"
sudo mount "$url" "$mountFolder"
echo "Create $targetDirectory if needed"
if [ ! -d "/opt" ]; then
sudo mkdir "/opt"
fi
if [ ! -d "$targetDirectory" ]; then
sudo mkdir "$targetDirectory"
fi
echo "Uncompress $targetFile"
if [[ $targetFile == *.tar.gz ]]; then
if [[ $targetFile == .squish-3-license.* ]]; then
target="$squishLicenseDir"
# Squish license need to be exists also in users home directory, because squish check it before it starts running tests
sudo tar -xzf "$targetFileMount" --directory "$HOME"
else
target="$targetDirectory"
fi
sudo tar -xzf "$targetFileMount" --directory "$target"
UnMount
elif [[ $targetFile == *.dmg ]]; then
echo "'dmg-file', no need to uncompress"
sudo cp $targetFileMount /tmp
UnMount
sudo hdiutil attach "/tmp/$targetFile"
sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
mountFolder="/Volumes/froglogic Squish"
UnMount
elif [[ $targetFile == *.run ]]; then
echo "'run-file', no need to uncompress"
sudo cp $targetFileMount $targetDirectory
UnMount
sudo chmod +x $targetDirectory/$targetFile
sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
sudo rm -fr "$targetDirectory/$targetFile"
if uname -a |grep -q "Ubuntu"; then
sudo mkdir /usr/lib/tcl8.6
sudo cp "$targetDirectory/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
fi
else
exit 1
fi
echo "Changing ownerships"
sudo chown -R qt:$usersGroup "$targetDirectory"
sudo chown qt:$usersGroup "$HOME/.squish-3-license"
}
echo "Set commands for environment variables in .bashrc"
if uname -a |grep -q "Ubuntu"; then
echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile
echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile
echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile
echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile
else
echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc
echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc
echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc
echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc
fi
echo "Verifying Squish"
if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
echo "Squish for Qt installation tested successfully"
echo "Installing squish license to home directory.."
MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile"
echo "Installing squish $version.."
MountAndInstall "$squishUrl" "$squishFolder" "$squishFile"
echo "Installing provisioning scripts for squish"
MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz"
echo "Verifying Squish Installation"
if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/$testSuite" | grep "Squish test run successfully" ; then
echo "Squish installation tested successfully"
else
echo "Squish for Qt test failed! Package wasn't installed correctly."
echo "Squish test failed! Package wasn't installed correctly."
exit 1
fi

View File

@@ -1,6 +1,6 @@
############################################################################
##
## Copyright (C) 2021 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -45,57 +45,30 @@ 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.1k"
$version = "1.1.1d"
$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip")
$sha1 = "bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
$prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945"
$sha1 = "056057782325134b76d1931c48f2c7e6595d7ef4"
$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"
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
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"
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
Write-Host "Configuring OpenSSL $version for Android..."
Push-Location $destination
# $ must be escaped in powershell...
function CheckExitCode {
param (
$p
)
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
}
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
Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination"
Remove-item C:\Utils\tmp -Recurse -Confirm:$false
Write-Output "Android OpenSSL = $version" >> ~/versions.txt

View File

@@ -1,33 +1,33 @@
# Generated for conan==1.29.0
appdirs==1.4.4
# Generated for conan==1.22.2
appdirs==1.4.3
bottle==0.12.18
certifi==2020.6.20
certifi==2019.11.28
chardet==3.0.4
colorama==0.4.3
conan==1.29.0
conan==1.22.2
deprecation==2.0.7
distlib==0.3.1
distro==1.5.0
distlib==0.3.0
distro==1.1.0
fasteners==0.15
filelock==3.0.12
future==0.18.2
idna==2.10
importlib-metadata==1.7.0
Jinja2==2.11.2
idna==2.9
importlib-metadata==1.5.0
Jinja2==2.11.1
MarkupSafe==1.1.1
monotonic==1.5
node-semver==0.6.1
packaging==20.4
patch-ng==1.17.4
pluginbase==1.0.0
Pygments==2.7.0
packaging==20.1
patch-ng==1.17.2
pluginbase==0.7
Pygments==2.5.2
PyJWT==1.7.1
pyparsing==2.4.7
pyparsing==2.4.6
python-dateutil==2.8.1
PyYAML==5.3.1
requests==2.24.0
six==1.15.0
tqdm==4.49.0
urllib3==1.25.10
virtualenv==20.0.31
zipp==3.1.0
PyYAML==5.3
requests==2.23.0
six==1.14.0
tqdm==4.43.0
urllib3==1.25.8
virtualenv==20.0.4
zipp==2.2.0

View File

@@ -1,3 +0,0 @@
# Disable Microsoft's digital assistant Cortona
echo "Disabling Cortona"
reg.exe ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /V AllowCortana /T REG_dWORD /D 0 /F

View File

@@ -1 +0,0 @@
Disable-NetAdapterLso Ethernet

View File

@@ -1,2 +0,0 @@
Write-Host "Disable superfetch"
reg add "HKLM\System\CurrentControlSet\Services\SysMain" /v Start /t REG_DWORD /d 4 /f

View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## 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.
@@ -34,12 +34,12 @@
$version = "11_2_2"
$package = "C:\Windows\temp\opengl32sw.7z"
$mesaOpenglSha1_64 = "0ed35efbc8112282be5d0c87c37fde2d15e81998"
$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version-signed.7z"
$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version-signed.7z"
$mesaOpenglSha1_32 = "96bd6ca0d7fd249fb61531dca888965ffd20f53c"
$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version-signed.7z"
$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version-signed.7z"
$mesaOpenglSha1_64 = "b2ffa5f230a0caa2c2e0bb9a5398bcfb81a0e5d1"
$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version.7z"
$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z"
$mesaOpenglSha1_32 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version.7z"
$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
function Extract-Mesa
{

View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2021 The Qt Company Ltd.
## 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.
@@ -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_1k"
$version = "1_1_1d"
$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 = "ab5367a1f46a3779a870fe2c1a99e03f8ffa3041"
$sha1 = "df9c40e9e82edf693c15302cbc8e8a057857a13c"
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 = "49f5b7fe01d686f706071c9a00d19bd69f2e7371"
$sha1 = "5c49ccd3a5d17f63d25fb819963978f50c7966d0"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex86

View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,48 +33,122 @@
. "$PSScriptRoot\helpers.ps1"
# This script will pre-installed squish package for Windows.
# This script will install squish package for Windows.
# Squish is need by Release Test Automation (RTA)
# NOTE! Make sure 64bit versions are always installed before 32bit,
# because they use same folder name before a rename
$version = "6.6.1"
$version = "6.4.3"
# Qt branch without dot (*.*)
$qtBranch = "512x"
# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point
# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.
$targetDir = "C:\Utils\squish"
$squishPackage = "C:\Utils\rta_squish"
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable"
$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
$squishBranchUrl = "$squishUrl\$qtBranch"
$testSuite = "suite_test_squish"
$testSuiteUrl = "$squishUrl\$testSuite.7z"
# Squish license
$licensePackage = ".squish-3-license"
Write-Host "Installing Squish license to home directory"
Copy-Item $licenseUrl\$licensePackage ~\$licensePackage
if (Is64BitWinHost) {
$arch = "x64"
} else {
$arch = "x86"
}
$OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName
if ($OSVersion -eq "Windows 10 Enterprise") {
$winVersion = "win10"
if (Is64BitWinHost) {
$sha1 = "13cb5b6a71d915213fac4273c99c83406b03985f"
} else {
$sha1 = "33484220762110b2fce1a1f9042f27358cb23929"
Function DownloadAndInstallSquish {
Param (
[string]$version,
[string]$bit,
[string]$squishPackage
)
# MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13
if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) {
$qtBranch = "511x"
}
$SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
$SquishInstaller = "$targetDir\$squishPackage.exe"
$SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"
Write-Host "Fetching from URL $squishUrl"
Copy-Item "$SquishUrl" "$SquishInstaller"
Write-Host "Installing Squish"
Run-Executable "$SquishInstaller" "$SquishParameters"
Remove-Item -Path $SquishInstaller
if ("$bit" -eq "win64") {
if ($squishPackage.StartsWith("mingw")) {
$squishPackage64bit = "mingw_64"
} else {
$squishPackage64bit = "$squishPackage`_64"
}
Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
TestSquish $squishPackage64bit
} else {
if ($squishPackage.StartsWith("mingw")) {
Rename-Item $targetDir\$squishPackage $targetDir\mingw
TestSquish mingw
} else {
TestSquish $squishPackage
}
}
} elseif ($OSVersion -eq "Windows 7 Enterprise") {
$winVersion = "win7"
$sha1 = "05d6255b090eace35cf1e899ea203e9182cccccd"
}
$squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip"
Copy-Item "$squishUrl\$squishArchive" "C:\Utils"
Verify-Checksum "C:\Utils\$squishArchive" $sha1
Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils"
Rename-Item "$squishPackage" "$targetDir"
Function DownloadSquishLicence {
Param (
[string]$squishUrl
)
Write-Host "Verifying Squish Installation for following targets:"
get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { $_.FullName }
get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { if (cmd /c $_.FullName --testsuite "$targetDir\suite_test_squish" |Select-String -Pattern "Squish test run successfully") { Write-Host "Squish tested successfully"} else { [Environment]::Exit(1) } }
Write-Host "Installing Squish license to home directory"
Copy-Item $squishUrl\$licensePackage ~\$licensePackage
}
Function TestSquish {
Param (
[string]$squishPackage
)
Write-Host "Verifying Squish Installation"
if (cmd /c "$targetDir\$squishPackage\bin\squishrunner.exe --testsuite $targetDir\$testSuite" |Select-String -Pattern "Squish test run successfully") {
Write-Host "Squish installation tested successfully!"
} else {
Write-Host "Squish test failed! $squishPackage wasn't installed correctly."
[Environment]::Exit(1)
}
}
Write-Host "Creating $targetDir"
New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir"
Write-Host "Download and install Test Suite for squish"
Copy-Item $testSuiteUrl $targetDir/$testSuite.7z
Extract-7Zip $targetDir/$testSuite.7z $targetDir
DownloadSquishLicence $squishUrl
if ($OSVersion -eq "Windows 10 Enterprise") {
if (Is64BitWinHost) {
DownloadAndInstallSquish $version win64 "msvc14"
DownloadAndInstallSquish $version win64 "msvc141"
DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh"
} else {
DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
}
DownloadAndInstallSquish $version win32 "msvc141"
} elseif ($OSVersion -eq "Windows 8.1 Enterprise") {
if (Is64BitWinHost) {
DownloadAndInstallSquish $version win64 "msvc14"
}
DownloadAndInstallSquish $version win32 "msvc141"
} elseif ($OSVersion -eq "Windows 7 Enterprise") {
if (Is64BitWinHost) {
DownloadAndInstallSquish $version win64 "msvc14"
} else {
DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
}
DownloadAndInstallSquish $version win32 "msvc141"
}

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -44,5 +44,3 @@ installPackages+=(openssl-devel)
sudo yum -y install "${installPackages[@]}"
gccVersion="$(gcc --version |grep gcc |cut -b 11-16)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -43,3 +43,9 @@ sudo yum install -y python-devel python-virtualenv
# install python3
sudo yum install -y python34-devel
# install pip3
wget https://bootstrap.pypa.io/get-pip.py
sudo python3 get-pip.py
sudo rm -f get-pip.py
sudo pip3 install virtualenv

View File

@@ -125,9 +125,6 @@ sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3
sudo pip install --upgrade "pip < 21.0"
sudo pip install virtualenv wheel
# Needed by packaging scripts
sudo /usr/local/bin/pip3 install colorlog --user
sudo /usr/local/bin/pip3 install wheel
# Install all needed packages in a special wheel cache directory
/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
@@ -135,7 +132,3 @@ sudo /usr/local/bin/pip3 install wheel
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
gccVersion="$(gcc --version |grep gcc |cut -b 11-16)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2020 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.
@@ -94,5 +94,3 @@ sudo zypper -nq install libfreetds freetds-devel
# sqlite2 support
sudo zypper -nq install sqlite2 sqlite2-devel
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2021 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.
@@ -41,45 +41,12 @@ set -ex
sudo zypper -nq install python-devel
# 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"
(
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
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"
export
python3 --version
pip3 install --user wheel
pip3 install --user virtualenv

View File

@@ -1,9 +0,0 @@
#!/usr/bin/env bash
set -ex
# Stops the balance job if one is running at the moment. This is a very expensive thing to run and causes major slow down.
sudo systemctl stop btrfs-balance.service
# This will disable btrfs balance job scheduling.
sudo sed -i 's/BTRFS_BALANCE_PERIOD="weekly"/BTRFS_BALANCE_PERIOD="none"/g' /etc/sysconfig/btrfsmaintenance

View File

@@ -1,7 +0,0 @@
#!/usr/bin/env bash
set -ex
# this script will remove executable rights from cron.daily jobs
sudo chmod -x /etc/cron.daily/*

View File

@@ -1,7 +0,0 @@
#!/usr/bin/env bash
set -ex
# This will disable fstrim. The fstrim.timer is scheduled to activate the fstrim.service
sudo systemctl stop fstrim.timer
sudo systemctl disable fstrim.timer

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2020 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.
@@ -95,12 +95,3 @@ sudo zypper -nq install unixODBC-devel unixODBC
# sqlite support
sudo zypper -nq install sqlite3 sqlite3-devel
# Java - needed by RTA jenkins
sudo zypper -nq install java
# open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot.
sudo zypper -nq update open-vm-tools
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -41,45 +41,11 @@ set -ex
sudo zypper -nq install python-devel
# 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"
(
wget -q https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh
bash build_python3.sh
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"
export
python3 --version
pip3 install --user wheel
pip3 install --user virtualenv

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## 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.
@@ -56,5 +56,3 @@ sudo apt-get update
echo "Installing packages"
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
gccVersion="$(gcc --version |grep gcc |cut -b 13-17)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## 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.
@@ -186,6 +186,3 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
gccVersion="$(gcc --version |grep gcc |cut -b 13-17)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -67,6 +67,3 @@ sudo zypper -nq install libpulse-devel
# cups
sudo zypper -nq install cups-devel
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
echo "GCC = $gccVersion" >> versions.txt

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2021 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.
@@ -97,16 +97,4 @@ 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"

View File

@@ -36,13 +36,13 @@
# This script installs QNX 7.
targetFolder="/opt/"
sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip"
folderName="qnx700"
sudo mkdir -p "$targetFolder"
echo "Extracting QNX 7"
sudo tar -C "$targetFolder" -Jxf $sourceFile
sudo unzip -q "$sourceFile" -d "$targetFolder"
sudo chown -R qt:wheel "$targetFolder"/"$folderName"

View File

@@ -1,5 +0,0 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/macos/nodejs.sh"

View File

@@ -36,13 +36,13 @@
# This script installs QNX 7.
targetFolder="/opt/"
sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip"
folderName="qnx700"
sudo mkdir -p "$targetFolder"
echo "Extracting QNX 7"
sudo tar -C "$targetFolder" -Jxf $sourceFile
sudo unzip -q "$sourceFile" -d "$targetFolder"
sudo chown -R qt:wheel "$targetFolder"/"$folderName"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1"

View File

@@ -1,2 +0,0 @@
# Allow SMB client guest logons to SMB server.
reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1"

View File

@@ -1,4 +0,0 @@
# 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

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\disable-cortana.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\disable-superfetch.ps1"

View File

@@ -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/qnx/qnx700-20190325-2-windows.7z"
$url = "http://ci-files01-hki.intra.qt.io/input/windows/qnx700-20180801-windows.7z"
Download $url $url $zip
Verify-Checksum $zip "1f10e9660efc81b18cb897871ba2b0384cf0fc6d"
Verify-Checksum $zip "E281897C957B5FAB249BABB2DEB77EEBB9BA75E6"
Extract-7Zip $zip C:\
Set-EnvironmentVariable "QNX_700" "C:\QNX700"

View File

@@ -1,48 +0,0 @@
############################################################################
##
## 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\..\common\windows\helpers.ps1"
# This script will install VC Redistributable
$sha1 = "a55510a8c9708b2c68b39cd50bbcaf86e2c885f0"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VC_redist.x64.exe"
# https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads
$url_official = "https://aka.ms/vs/16/release/vc_redist.x64.exe"
$package = "C:\Windows\Temp\vc_redist.x64.exe"
Download $url_official $url_cache $package
Verify-Checksum $package $sha1
Run-Executable "$package" "/install /quiet /norestart"
Remove-Item -Recurse -Force -Path $package

View File

@@ -1,8 +1,7 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2017 Pelagicore AG
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,12 +32,13 @@
##
#############################################################################
set -ex
. "$PSScriptRoot\..\common\windows\helpers.ps1"
sudo yum-config-manager --enable rhel-6-workstation-rpms
sudo yum-config-manager --enable rhel-6-workstation-optional-rpms
sudo yum-config-manager --enable rhel-workstation-rhscl-6-rpms
# Signing tools are needed to sign offline installers when releasing
sudo yum clean all
# As well as this fetching the repository data, we also get a printout of the used repos
sudo yum repolist
$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"

View File

@@ -43,9 +43,9 @@
# nmake install
$version = "1.1.1g"
$version = "1.1.1d"
$zip = Get-DownloadLocation ("openssl-$version.7z")
$sha1 = "e94263ba067a5cc0ace17e26bb2f98c62d298b5a"
$sha1 = "2bf9379c4cea81858c4288cf06cc3444996bcad5"
$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86_windows7_msvc2010.zip"
Download $url $url $zip

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1"

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1"

2
qt3d

Submodule qt3d updated: e04a70eb3b...4c25b43628

2
qtbase

Submodule qtbase updated: 1d5a2e924b...4903e45231

2
qtdoc

Submodule qtdoc updated: 8cfc85c8b5...1209dde410

2
qtqa

Submodule qtqa updated: a6a4b6091b...f87ba919a9

Submodule qtscxml updated: a5482507a4...2aa8d6b254

2
qtsvg

Submodule qtsvg updated: 85485845bd...a3e50a83ab

Submodule qttools updated: 9ff3504a43...d170069f8f