Compare commits

..

32 Commits

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
108 changed files with 681 additions and 636 deletions

80
.gitmodules vendored
View File

@@ -1,60 +1,60 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.12.9
branch = 5.12.7
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.12.9
branch = 5.12.7
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.12.9
branch = 5.12.7
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.12.9
branch = 5.12.7
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 5.12.9
branch = 5.12.7
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.12.9
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.9
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.9
branch = 5.12.7
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.12.9
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.9
branch = 5.12.7
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
branch = 5.12.9
branch = 5.12.7
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.12.9
branch = 5.12.7
status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 5.12.9
branch = 5.12.7
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 5.12.9
branch = 5.12.7
status = addon

View File

@@ -1,43 +1,44 @@
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2015'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-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-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-10'
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-10'
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2015'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -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-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'WinRT_10'
Target arch: 'x86'
Compiler: 'MSVC2015'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015'
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'WinRT_10'
Target arch: 'armv7'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015'
-
Template: 'qtci-windows-10-x86_64-10'
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-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'Mingw73'
@@ -99,7 +100,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 +114,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'

View File

@@ -2,23 +2,23 @@ Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-10'
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-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'
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

@@ -1,11 +1,11 @@
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'WinRT_10'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'WinRT_10'
Target arch: 'x86'
Compiler: 'MSVC2017'
@@ -17,19 +17,19 @@
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -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% -platform win32-g++'
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -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% -platform win32-g++'
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'WinRT_10'
Target arch: 'armv7'
Compiler: 'MSVC2017'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017'
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'WinRT_10'
Compiler: 'MSVC2017'
Features: ['Packaging', 'DisableTests']
@@ -51,7 +51,7 @@
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang'
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Mingw73'
@@ -59,7 +59,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 armeabi-v7a'
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Mingw73'
@@ -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,28 +83,28 @@
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'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc'
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'QNX_700'
Target arch: 'armv7'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc'
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'QNX_700'
Target arch: 'armv8'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc'
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'QNX_700'
Target arch: 'x86_64'
Compiler: 'Mingw73'

View File

@@ -13,7 +13,7 @@
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'WinRT_10'
Target arch: 'x86_64'
Compiler: 'MSVC2015'

View File

@@ -1,5 +1,5 @@
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Target os: 'WinRT_10'
Target arch: 'x86_64'
Compiler: 'MSVC2015'

View File

@@ -1,9 +1,9 @@
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'Mingw73'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-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% -platform win32-g++'
-
Template: 'qtci-windows-10-x86_64-10'
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'Mingw73'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'

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

@@ -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

View File

@@ -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
}

View File

@@ -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

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

@@ -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.22.2" >> ~\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

View File

@@ -1,33 +1,33 @@
1582256998
bin/derb.exe: db2e978367ccf635ff7ecc7d1514778e
bin/escapesrc.exe: 647ffe2234275d13cffef8b84f052700
bin/genbrk.exe: fceaae69a437fdcd4ed1f79bdeac6f13
bin/genccode.exe: 81e45377e293edabeb321ba3ab339abb
bin/gencfu.exe: 78036b67e099cc312da25d80f9c8b6cf
bin/gencmn.exe: 4f73ec63d48e3935e0fa67313a7d8f8f
bin/gencnval.exe: 38519687874be469d38e8aadc74d5dc7
bin/gendict.exe: be263dfa3e3267340bb4a8815bd4f72e
bin/gennorm2.exe: 8e51f5820ec15ed33edb293d5d154138
bin/genrb.exe: 0a911668227dec1fca18e7299d737d59
bin/gensprep.exe: a96ab9a47ea6e80869c2f732d66296e6
bin/icu-config: 4d315b6fa7b53efaf8974aaceb0c7a18
bin/icudt.dll: a8b8ce26bbfb30b99d97a5ced4d016ed
bin/icudt65.dll: d134d26eb54ba7d5b637c16c974737fb
bin/icuin.dll: 5bb19d323881787da00a706f86b7a77a
bin/icuin65.dll: 5bb19d323881787da00a706f86b7a77a
bin/icuinfo.exe: d9e0c244e7a939c48c2fa2536ea3c836
bin/icuio.dll: 98c919ca7fc813e8dc5f645fcc914e5b
bin/icuio65.dll: 98c919ca7fc813e8dc5f645fcc914e5b
bin/icupkg.exe: 5b9542ec3f054880d2ec484516fae931
bin/icutest.dll: e94878f59e7de6f7b2cc52476540c578
bin/icutest65.dll: e94878f59e7de6f7b2cc52476540c578
bin/icutu.dll: 22d3955eeabe583ef8f339d43ee32e3f
bin/icutu65.dll: 22d3955eeabe583ef8f339d43ee32e3f
bin/icuuc.dll: 7871b100e82744b16a608d01df837485
bin/icuuc65.dll: 7871b100e82744b16a608d01df837485
bin/makeconv.exe: 3fae3578534581895353052e4268c8e8
bin/pkgdata.exe: 3a91ebe880d28e02b72b69bef2508337
conaninfo.txt: 81e378c465132a1385850c1d3d4394ed
1599824441
bin/derb.exe: bdf63b2f5b550979a89e67cffc8825dc
bin/escapesrc.exe: 137b889673457a447f351f5e874eac3d
bin/genbrk.exe: bb3294c7064cb973f2ca07ee553f0420
bin/genccode.exe: 820b92ed20fb38886dea4447f12911af
bin/gencfu.exe: aa4365ba9562fa1bbc4416fbbac63fb2
bin/gencmn.exe: 178c5b5cff63d0e0fe9b47a4a0afb5a2
bin/gencnval.exe: 71a8bdcb6532c752fb4e106fa602c200
bin/gendict.exe: 420fcd1d350c9ed1ef451c8e77f023dc
bin/gennorm2.exe: 85cd1fa266ff3a0455760b12a9689fc1
bin/genrb.exe: 480231b78483ccb146b6815a811efac3
bin/gensprep.exe: 0abbaf32db163eab36b6fdb6930c1532
bin/icu-config: 524e7418a34b9f37fa3d720538887dcf
bin/icudt.dll: 56532bd6f97572f1ff2f5c269c200cfa
bin/icudt65.dll: 09337a242c43e958c75c630e76f58626
bin/icuin.dll: ccf458a6762ea1248b633f260f60570b
bin/icuin65.dll: ccf458a6762ea1248b633f260f60570b
bin/icuinfo.exe: 4274c1a2507c370533ce1151533d5e20
bin/icuio.dll: 5c92afa27046b497ea879c5bf4d10577
bin/icuio65.dll: 5c92afa27046b497ea879c5bf4d10577
bin/icupkg.exe: d679b1024f2e26c1f8a1b77e7258e98f
bin/icutest.dll: 562c79d8df0fc5048f4546917b2738f2
bin/icutest65.dll: 562c79d8df0fc5048f4546917b2738f2
bin/icutu.dll: e45504e5c6ccde54658a7df8bd88108d
bin/icutu65.dll: e45504e5c6ccde54658a7df8bd88108d
bin/icuuc.dll: d8e8d4d51a9fd6a9849fa4ca5812f0bb
bin/icuuc65.dll: d8e8d4d51a9fd6a9849fa4ca5812f0bb
bin/makeconv.exe: 6b4805b126655a2b95428b10cf08b25f
bin/pkgdata.exe: 6455bddfee736917790fcad7d326f8c1
conaninfo.txt: 411145de18abdd9c818ab023e965129b
include/unicode/alphaindex.h: 1be039746e3da3f7baa9421062373468
include/unicode/appendable.h: 48b3a0a4c3044ad5f2af18f1ab48c8ff
include/unicode/basictz.h: 57fe3c53d6b1a2bf5d1f40ec51efd7a1
@@ -215,21 +215,21 @@ include/unicode/utypes.h: 47eb8ff3f909dafa9bee14f8bb224342
include/unicode/uvernum.h: a91a8e07c665891ed234de3a58302663
include/unicode/uversion.h: 0b8f75f3d1c816ee3359dde5be390d17
include/unicode/vtzone.h: 615f12cb0d05441d0872aa677db80a90
lib/icu/65.1/Makefile.inc: dfca695719fce3f4802048877b7e5ef5
lib/icu/65.1/pkgdata.inc: 8a01d365fe1a225f3168d4659ea48705
lib/icu/Makefile.inc: dfca695719fce3f4802048877b7e5ef5
lib/icu/current/Makefile.inc: dfca695719fce3f4802048877b7e5ef5
lib/icu/current/pkgdata.inc: 8a01d365fe1a225f3168d4659ea48705
lib/icu/pkgdata.inc: 8a01d365fe1a225f3168d4659ea48705
lib/libicudt.dll.a: 4297604f481c4f41cd69f1c0d41544a8
lib/libicuin.dll.a: 78136e54cf3ad942dddc32b3d8c42aab
lib/libicuio.dll.a: 681e068e1ebbb2665b222bd3894c8f96
lib/libicutest.dll.a: 2d7d50cebf7a15c2bd05995ff9dc2e38
lib/libicutu.dll.a: e08a3d12905cb703179a11e250fe4f61
lib/libicuuc.dll.a: e92fdef67e56c164ec5c6d47ae97be6b
lib/pkgconfig/icu-i18n.pc: eed957ffe006f4fb042981c0f7e0451a
lib/pkgconfig/icu-io.pc: 43c8fc7b90303c819b1669ca99e10dde
lib/pkgconfig/icu-uc.pc: 3e8708649f2ea8ebd74f0c75655bdd66
lib/icu/65.1/Makefile.inc: 82a9c670eb96bb7e73a660f769fb3503
lib/icu/65.1/pkgdata.inc: 2d256010da2bbf625c500da0c9826d93
lib/icu/Makefile.inc: 82a9c670eb96bb7e73a660f769fb3503
lib/icu/current/Makefile.inc: 82a9c670eb96bb7e73a660f769fb3503
lib/icu/current/pkgdata.inc: 2d256010da2bbf625c500da0c9826d93
lib/icu/pkgdata.inc: 2d256010da2bbf625c500da0c9826d93
lib/libicudt.dll.a: 2c21378a274a52b0cfc497029e57fc32
lib/libicuin.dll.a: 36ed05dc4117699bf26d988dedab065e
lib/libicuio.dll.a: 194a2f912ad715fa5a5ff70186c2809e
lib/libicutest.dll.a: ff4d7834bd6190801772795c206fb9bf
lib/libicutu.dll.a: d3e8cae651dddd4da2f960fdbde04c1f
lib/libicuuc.dll.a: b371571253da468a123ad696382d9bef
lib/pkgconfig/icu-i18n.pc: 7f34faeff3f9ad63e1ffd6526897f8d9
lib/pkgconfig/icu-io.pc: 50afb654ad3f618eef1052195687b7cb
lib/pkgconfig/icu-uc.pc: 2bc7002eccc3f2c53a1270cdc04a30d6
licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d
share/icu/65.1/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d
share/icu/65.1/config/mh-mingw: 95446b7c74bc210a824c787c9bd47a93

View File

@@ -1,33 +1,33 @@
1582257415
bin/derb.exe: 430c27da15e7c5d4c6eb60e0b1e6fb8f
bin/escapesrc.exe: 9a59fded291dd4ea4cbfe3b7a1c80080
bin/genbrk.exe: 56897185781522cd685e4af4ca102a3b
bin/genccode.exe: c99c94069e8a0098bc4db9914a7f6e7a
bin/gencfu.exe: e23c79026bb78c1991c7f7a8425fad13
bin/gencmn.exe: 8fba64b78d2ab6f5bcd6c723da1f57ad
bin/gencnval.exe: 14c87059b1c39a72879837cabb3eb84d
bin/gendict.exe: 1380f639d83e4d1f21b55ba2495d4a41
bin/gennorm2.exe: 914fa6268d94fe08969d7104dc55218f
bin/genrb.exe: 22e6461a351f1bf391d181f78a6ef54b
bin/gensprep.exe: 4bccca6db929a0b19fff1c5a37873b16
bin/icu-config: 9250dfdf7faa8c4d08dfa6cf4f40e2d1
bin/icudt.dll: 8a2d4864a89ed94a0e16eaab44d3a4c2
bin/icudt65.dll: aa62d2fd6b59bd61116910583e3dd41d
bin/icuin.dll: 05cc7ab8708577d53395eb242a0dcc6d
bin/icuin65.dll: 05cc7ab8708577d53395eb242a0dcc6d
bin/icuinfo.exe: 3700aeeae9229fff4fe501ae415b5c36
bin/icuio.dll: f2c286ef97baf5ddc7c8110dbd9e6b4c
bin/icuio65.dll: f2c286ef97baf5ddc7c8110dbd9e6b4c
bin/icupkg.exe: c03f0c24917039bc98a3b7616c9b141e
bin/icutest.dll: 9db214eb296a087b0385f07c21e15b6f
bin/icutest65.dll: 9db214eb296a087b0385f07c21e15b6f
bin/icutu.dll: f8df0b65efc4fffc30850b6fd6513eeb
bin/icutu65.dll: f8df0b65efc4fffc30850b6fd6513eeb
bin/icuuc.dll: 81bebc9772571cf4c591512707de7f6f
bin/icuuc65.dll: 81bebc9772571cf4c591512707de7f6f
bin/makeconv.exe: ef7aa77bd42300c98ea2676e095356d0
bin/pkgdata.exe: 4f957c0e9d26523d6977c47879ccb20a
conaninfo.txt: 87f571b59f21d0be18bbbb1a53c6b2f2
1599824772
bin/derb.exe: 68f722afeee75e9e4ea733789eba324d
bin/escapesrc.exe: 5ad48603ddefa7d75f9589db693311a0
bin/genbrk.exe: cb5487bd37da74c470576d584803a0fd
bin/genccode.exe: 80d139a2b22c5c6a7c2ae6801cd8a3ee
bin/gencfu.exe: a9f417b50cd8237299100d349d78758e
bin/gencmn.exe: cf1a794d018ea5a93db501c4a17d0945
bin/gencnval.exe: 2f9cf00a1c6d6ff40f6cc1d2420f2ac9
bin/gendict.exe: bda284e8eb469caad6ff4320060bd63d
bin/gennorm2.exe: 643cc388bf9f49a1c22274070237e4b5
bin/genrb.exe: 900294bcf2ba376e8a53dd0681efba84
bin/gensprep.exe: f04c5265bb68e10eb86bbe812348a18a
bin/icu-config: 7ff0a51957bda1eec9b2ea457e7bacab
bin/icudt.dll: 1e1a6b8fbf1093c1b4fab982c4b62c39
bin/icudt65.dll: 91e49d019e10d91cccada5b136f68dec
bin/icuin.dll: a67701e7309fae5371c5f656f0deabea
bin/icuin65.dll: a67701e7309fae5371c5f656f0deabea
bin/icuinfo.exe: 7fd856803068da1b6d736f88d5578444
bin/icuio.dll: e53d31b6899dbcec1eb77da207c8e1cc
bin/icuio65.dll: e53d31b6899dbcec1eb77da207c8e1cc
bin/icupkg.exe: 26c99ac9bf0aef675b6be3d0e4ec1f96
bin/icutest.dll: 29acd15f69048c04adc7350ea2f7422a
bin/icutest65.dll: 29acd15f69048c04adc7350ea2f7422a
bin/icutu.dll: 4b0c32dd74735e9cd2421026fd5a26d9
bin/icutu65.dll: 4b0c32dd74735e9cd2421026fd5a26d9
bin/icuuc.dll: ff8cfb1cb4360f103f0ab37a21b0f565
bin/icuuc65.dll: ff8cfb1cb4360f103f0ab37a21b0f565
bin/makeconv.exe: 2f22caee13d695a9c596aa97eb581cf7
bin/pkgdata.exe: 49ebcb66931fd627061de5683646d511
conaninfo.txt: c04d7a669f242e429c8cd6c4c9f9b250
include/unicode/alphaindex.h: 1be039746e3da3f7baa9421062373468
include/unicode/appendable.h: 48b3a0a4c3044ad5f2af18f1ab48c8ff
include/unicode/basictz.h: 57fe3c53d6b1a2bf5d1f40ec51efd7a1
@@ -215,21 +215,21 @@ include/unicode/utypes.h: 47eb8ff3f909dafa9bee14f8bb224342
include/unicode/uvernum.h: a91a8e07c665891ed234de3a58302663
include/unicode/uversion.h: 0b8f75f3d1c816ee3359dde5be390d17
include/unicode/vtzone.h: 615f12cb0d05441d0872aa677db80a90
lib/icu/65.1/Makefile.inc: 578a604f57dc0000c3e4272ac5159ced
lib/icu/65.1/pkgdata.inc: 9f94a807fa04d65b45bb04114c74fc8f
lib/icu/Makefile.inc: 578a604f57dc0000c3e4272ac5159ced
lib/icu/current/Makefile.inc: 578a604f57dc0000c3e4272ac5159ced
lib/icu/current/pkgdata.inc: 9f94a807fa04d65b45bb04114c74fc8f
lib/icu/pkgdata.inc: 9f94a807fa04d65b45bb04114c74fc8f
lib/libicudt.dll.a: 6d19c78195cbf2af4f68b3a1ff93f612
lib/libicuin.dll.a: dc5b0188be79d786a1612ab4fe8ee105
lib/libicuio.dll.a: a995de8310f252cd356949a19ace1fc9
lib/libicutest.dll.a: 4017504bf0e1cbc71fa05c5fda30fcc8
lib/libicutu.dll.a: aca996f2762328e3a3125c52582d4c19
lib/libicuuc.dll.a: 45c324a2b53e0860672f73a13dd0eaed
lib/pkgconfig/icu-i18n.pc: b86403e2cbd81f2559f01cda101d5181
lib/pkgconfig/icu-io.pc: f7bf176168b2c48bbf9d5b3ab3513420
lib/pkgconfig/icu-uc.pc: b939d24910a7545f0dd199b79e60a1a0
lib/icu/65.1/Makefile.inc: ae4b3c0b2dcf1a107c37da529a5a572d
lib/icu/65.1/pkgdata.inc: 392ec5b38e95048f06b739125b748364
lib/icu/Makefile.inc: ae4b3c0b2dcf1a107c37da529a5a572d
lib/icu/current/Makefile.inc: ae4b3c0b2dcf1a107c37da529a5a572d
lib/icu/current/pkgdata.inc: 392ec5b38e95048f06b739125b748364
lib/icu/pkgdata.inc: 392ec5b38e95048f06b739125b748364
lib/libicudt.dll.a: 42327b89226e435dee32d4ed4043dd1e
lib/libicuin.dll.a: a479b7dfc0f69346644676625cab1154
lib/libicuio.dll.a: 1b048a7fcae8905fa929b9ef282d05c8
lib/libicutest.dll.a: af3d4912fe492f3089589416a582bff3
lib/libicutu.dll.a: d27299ee9de0bfa2f7130b177a101ced
lib/libicuuc.dll.a: 0f98b361c734d8d5cd157678c8d7d6f1
lib/pkgconfig/icu-i18n.pc: 5a7e7ff2a321db58b97ccaa41ea54e3b
lib/pkgconfig/icu-io.pc: 426da02c84b5694772af9a5bc11dee9b
lib/pkgconfig/icu-uc.pc: 5a761b97c6c84a60887f35393d0d15c2
licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d
share/icu/65.1/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d
share/icu/65.1/config/mh-mingw64: 071f2f1be85f81141e4243ab65ca2a5b

View File

@@ -1,12 +0,0 @@
1582282436
conaninfo.txt: e412e1148672ae4437d5d9e8f0089dae
include/jconfig.h: 36405c50a3b1509877826e26eac4fb69
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0
lib/libjpeg.a: 9ec4a3ea70de97420d8a262641df11fe
lib/libturbojpeg.a: 3704f7242f7d79187bcf09b7ff7bb86e
lib/pkgconfig/libjpeg.pc: fa956ecec06575a626eb24df4ade7059
lib/pkgconfig/libturbojpeg.pc: 7a28369f664feaef64c4f36043bdbf84
licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2

View File

@@ -1,12 +0,0 @@
1582280262
conaninfo.txt: 3ce2f8cfe80b79b4dd725bdff24c402d
include/jconfig.h: 36405c50a3b1509877826e26eac4fb69
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0
lib/jpeg-static.lib: 277031e07ff0a68b0da547fd73fa8931
lib/pkgconfig/libjpeg.pc: 18fe4739f1c264cc5807ac171f79d5de
lib/pkgconfig/libturbojpeg.pc: 080a4da3c8052f00721671016bda4f79
lib/turbojpeg-static.lib: 142395e528dbecc678f0f0242512cb32
licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2

View File

@@ -1,12 +0,0 @@
1582281085
conaninfo.txt: 05273e3ea056a1d7946e1065622c2e6d
include/jconfig.h: 36405c50a3b1509877826e26eac4fb69
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0
lib/jpeg-static.lib: 94e22b458fa49d878f9f5ecaa83b4d4c
lib/pkgconfig/libjpeg.pc: f86f98cba102e1be6cdbc77e1f73d6e2
lib/pkgconfig/libturbojpeg.pc: 9138a79005a0dd437ec485743cbc7708
lib/turbojpeg-static.lib: 85dceca1ee42fb40b9177483a710931c
licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2

View File

@@ -1,12 +0,0 @@
1582282336
conaninfo.txt: 99d4bfcf4fe5b33346747d9aed5a90dd
include/jconfig.h: 36405c50a3b1509877826e26eac4fb69
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0
lib/libjpeg.a: 520fd96afa81fffa67fbccc2d7499459
lib/libturbojpeg.a: 65c525625f9bdb0c9c93b3cae93116f1
lib/pkgconfig/libjpeg.pc: 9088ad9e74b2b56826bc949805312370
lib/pkgconfig/libturbojpeg.pc: 176a550708755ea935a3928dcc75bb0c
licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2

View File

@@ -1,12 +0,0 @@
1582281572
conaninfo.txt: 9868d7ba246ae96d18441c975ee816f1
include/jconfig.h: 36405c50a3b1509877826e26eac4fb69
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0
lib/jpeg-static.lib: fb149794dc225dcb890e1b2c48569660
lib/pkgconfig/libjpeg.pc: 16468bac09adeea126c41a7e2eab161f
lib/pkgconfig/libturbojpeg.pc: 6bad484e5ee764e95e570110855d00c8
lib/turbojpeg-static.lib: 12e129d91c4f92257c7b12d88a0ccd3b
licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2

View File

@@ -1,12 +0,0 @@
1582280641
conaninfo.txt: d0e67ef7124b3767bbd5cebd7e4bf806
include/jconfig.h: 36405c50a3b1509877826e26eac4fb69
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0
lib/jpeg-static.lib: 50b078fedbf48e2accf55cc1201717d8
lib/pkgconfig/libjpeg.pc: ef1839c5639ee60768584c29626db8b1
lib/pkgconfig/libturbojpeg.pc: 53423ccf67af6cc13cc571dd1e7568e0
lib/turbojpeg-static.lib: c3f43cb91de65238d38bee7051671eff
licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2

View File

@@ -1,4 +1,4 @@
1582280120
1599735572
LICENSE.md: 5aa9930034582b90e2008d2c609d1317
conanfile.py: fc9f9025d45306204140aafdf174a422
conanfile.py: b752e9ae1c6b8d65022ecc9094a8a8ab
export_source/CMakeLists.txt: eb0fcc86f467a4c6ac9f37c16887a29f

View File

@@ -0,0 +1,12 @@
1599738045
conaninfo.txt: 4fbbb44cc5815e6399144d4738128d34
include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae
lib/libjpeg.a: 1beb177c28bec696d92c96cb12cf50b0
lib/libturbojpeg.a: 3601472665eebd9ba70a8b4ded622fb7
lib/pkgconfig/libjpeg.pc: 31670f8efeaaf416c10ef75033a21f89
lib/pkgconfig/libturbojpeg.pc: 9ec917634a8badf738794da988e0cdd2
licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e

View File

@@ -0,0 +1,12 @@
1599737655
conaninfo.txt: 1dff9c35ef06cd1f8e1dd7d3fa538a0b
include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae
lib/jpeg-static.lib: 810088c13a0b62845d2a07fb9aedcf7c
lib/pkgconfig/libjpeg.pc: 42c35d08648be46cba25e5c233bb4ceb
lib/pkgconfig/libturbojpeg.pc: f5f04f23108a7e0287c36286668bed72
lib/turbojpeg-static.lib: 57ccb316b5e241e589e4774d1873d2ea
licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e

View File

@@ -0,0 +1,12 @@
1599735723
conaninfo.txt: 96940ef25782fe187ad876a9798aefe6
include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae
lib/jpeg-static.lib: bac9b04d6d20cb9e29a47c56e1d58e92
lib/pkgconfig/libjpeg.pc: 8d98a30a9db257c005f7619aa5c0a054
lib/pkgconfig/libturbojpeg.pc: 79a1c3fce48acb5ad45fd69fc5b5a7e0
lib/turbojpeg-static.lib: 8e8c7d62afe07877cc07befcafc9b189
licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e

View File

@@ -0,0 +1,12 @@
1599736618
conaninfo.txt: 03f3f4e3fcf5d709d43aaec1f55898dc
include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae
lib/jpeg-static.lib: 3134bba34a47e8c27d20ec4a4588f54d
lib/pkgconfig/libjpeg.pc: e4f3f7cf063e703922623a48759eb548
lib/pkgconfig/libturbojpeg.pc: 6412ff7d0f49e4b26ea9c17526fcd995
lib/turbojpeg-static.lib: c01d3cddcc20514a4ed2ab9e0bf6bc79
licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e

View File

@@ -0,0 +1,12 @@
1599738143
conaninfo.txt: 3991de728b2148a357e0adfe83ddff62
include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae
lib/libjpeg.a: ab32855e9f71865bc026351d8e2e77dc
lib/libturbojpeg.a: a05a8eef4b34c10a68a3e5c7864f55b5
lib/pkgconfig/libjpeg.pc: afe1d748f5b9331fe322f414eeb8d871
lib/pkgconfig/libturbojpeg.pc: 5a19528da1aae07f73729acf72ea8d9b
licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e

View File

@@ -0,0 +1,12 @@
1599737489
conaninfo.txt: faf97c2c98fbb660379fb96a52f3dcf3
include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae
lib/jpeg-static.lib: 05604ba0465efd4fe4e8a518e82cdb81
lib/pkgconfig/libjpeg.pc: 6819f3aec5d0a35187d510fb1034c584
lib/pkgconfig/libturbojpeg.pc: 7226bc5b0d915e053a1204aba32867cf
lib/turbojpeg-static.lib: efa16bdd47f24831fc02ac0b69912490
licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e

View File

@@ -0,0 +1,12 @@
1599737081
conaninfo.txt: da8913ab37decb7846f324c2c05b6e56
include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae
lib/jpeg-static.lib: 9d557bb3f4769b7e3820d71be4189cfb
lib/pkgconfig/libjpeg.pc: 1bcb08ffc4f83b2306ff794ad5c2b91c
lib/pkgconfig/libturbojpeg.pc: b9783de5729e5835e41a35cb2f5fa568
lib/turbojpeg-static.lib: 09609dcfdad02bed5bf00e348fff8807
licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e

View File

@@ -0,0 +1,12 @@
1599736121
conaninfo.txt: d3b27ba63fbdcf067b5f4afd1a1fdef0
include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9
include/jerror.h: 9b7898fe417de269b8be88b10df908b0
include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d
include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb
include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae
lib/jpeg-static.lib: bcdd30b7636c7ed8f0e6dbfb97729c31
lib/pkgconfig/libjpeg.pc: e124d9000016d4fa108588c91087d060
lib/pkgconfig/libturbojpeg.pc: 6b112424701322f51d06015089920210
lib/turbojpeg-static.lib: 7d9c9ee5fb38b856bb9424a2ae5f9bbd
licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e

View File

@@ -1,9 +1,9 @@
1582270297
bin/libxml2-2.dll: 47b3af0297a53e146d739ba46b957ac9
bin/xml2-config: f002e2e4fcc1ac7a3ed6a93044a99de1
bin/xmlcatalog.exe: f51848350034b8b6010fd11f6e3aa10f
bin/xmllint.exe: 689e7c9b94aff9b39383164b13412623
conaninfo.txt: ea32a81840ad020d92e3c678a2b31ab7
1599827075
bin/libxml2-2.dll: aaf2802bcdbb62e364d33d4307c2f656
bin/xml2-config: b0691a0a3ab1546612090cb77b4f29bb
bin/xmlcatalog.exe: ceb3b58dd442e7a174d60a400b485355
bin/xmllint.exe: 542a2dc43a32156244634f496afdad71
conaninfo.txt: e494fa1f215b7080df24fc4bf487250b
include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d
include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2
include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f
@@ -53,6 +53,6 @@ include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd
include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388
include/libxml2/win32config.h: e51ff5a65571584fbe45f75eede0ee3e
include/libxml2/wsockcompat.h: fd8ce4d6dabe53035a28c6aa64926b1c
lib/libxml2.dll.a: 843beb5d307eda9c6600f02a2cd3f701
lib/xml2Conf.sh: 26c219db3da9c216926f8894c096409b
lib/libxml2.dll.a: e9e9bb7eed77331a47e228a1a8f4c0c5
lib/xml2Conf.sh: 1ac09ea07a1d73a25e8478e5911da219
licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1

View File

@@ -1,9 +1,9 @@
1582270098
bin/libxml2-2.dll: 0a707dea653e54ed8606c66cb4af5eca
bin/xml2-config: f90c21a49ff66959f9370243e8aeb274
bin/xmlcatalog.exe: 1f51631564d0df1e2eb7bab1e744797f
bin/xmllint.exe: 705805f98a8ee9045078d6d91a1e076b
conaninfo.txt: 5d6fafed34bc3f9e5dce2ad99f65aba0
1599827195
bin/libxml2-2.dll: dccd1b6cf7425125913b2095ff8eccc2
bin/xml2-config: e93ed273bc16d12c4f8ecff87ceaaf79
bin/xmlcatalog.exe: 0b575f8389ac5a8e397c3cde88babb85
bin/xmllint.exe: 5a63ba2b6556ef0ae20436495c28355c
conaninfo.txt: 13134884f7be0e49d19552cd3423b91b
include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d
include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2
include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f
@@ -53,6 +53,6 @@ include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd
include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388
include/libxml2/win32config.h: e51ff5a65571584fbe45f75eede0ee3e
include/libxml2/wsockcompat.h: fd8ce4d6dabe53035a28c6aa64926b1c
lib/libxml2.dll.a: 849838d8f7d5dcbcb16097dbdabee707
lib/xml2Conf.sh: d980a83ab1cdd3637ee4fc3aeb75733c
lib/libxml2.dll.a: 176eb6473b51dd69835b6213fcc40b19
lib/xml2Conf.sh: 8713c5cd801bb525b6758a22a65c2a2e
licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1

View File

@@ -1,4 +1,4 @@
1582270556
1599827656
LICENSE.md: d9f691088a6aaf0589397de712404f23
conanfile.py: fdaa2f193e25d36dbf5b92a0f6567611
export_source/patches/0001-remove-with-profiler.patch: 44c783ce23e5be1360ef1521b1427da3
conanfile.py: 1a377def24ec5c2878da1d9d97a2c39c
export_source/patches/Add-configuration-for-profiler.diff: 5207625dda27ca22cf49f7b136dc6585

View File

@@ -1,9 +1,9 @@
1582271749
bin/libexslt-0.dll: 4b9cbde76ca3933da5a551bccc952ec4
bin/libxslt-1.dll: 819776a46fa5031884953e1ad3e0e753
bin/xslt-config: 7425a897e93c2b35d098d21de286564b
bin/xsltproc.exe: b7198489b916c3f5936284418d756f80
conaninfo.txt: fd798c9d2cde468877c2c25020e44443
1599827930
bin/libexslt-0.dll: ff772bdd16e06a28bbbbbf509dace06f
bin/libxslt-1.dll: eccc32869a72838b9a8092e40d9ee7a2
bin/xslt-config: 438e5a0d83ce7648c0bcb64446bd2874
bin/xsltproc.exe: 5e2fe2b2465d07b4bad0ce6a90f61702
conaninfo.txt: c74c15f161d0366c1f8b8ae6157be410
include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717
include/libexslt/exsltconfig.h: eb4297a735f2666c5872067c25f16005
include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36
@@ -24,16 +24,16 @@ include/libxslt/transform.h: ccbcce4553f3231003b1944002814246
include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77
include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387
include/libxslt/xsltInternals.h: 0c245b0fcc81bf537632a45adf8fcffb
include/libxslt/xsltconfig.h: e49047ac857ae0fea24b99ee4c56de62
include/libxslt/xsltconfig.h: b932ebe3a2edfd7b6e42c6ccab09105f
include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df
include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600
include/libxslt/xsltutils.h: 5f7848088182b183e6d1fdb335b2616a
lib/libexslt.dll.a: a27a9df2d4b7cf070377a32e10961027
lib/libexslt.la: 036e99c1bab6a8d3a63471ad94d13aaf
lib/libxslt.dll.a: 5bf3583373ca584df267b766c3e9cb3e
lib/pkgconfig/libexslt.pc: a9e14aa113bd8c105df76410e046b233
lib/pkgconfig/libxslt.pc: 12169caf9654c69c90e0e0c0f98776ad
lib/xsltConf.sh: 5fa057a4733819c38f5c55d1ce50fd48
lib/libexslt.dll.a: 7bd46b7300a66f8ce59b2899c66544e2
lib/libexslt.la: fa24e93ffd0896a1e4aeeb7bfbc39c0b
lib/libxslt.dll.a: ceb051c0397694811816950fc670681b
lib/pkgconfig/libexslt.pc: be5f747c35a550775cb2367bdb4a7384
lib/pkgconfig/libxslt.pc: ebc9b2f108096aec1ddf30f4c45855ec
lib/xsltConf.sh: baa711dd9eb12d5855ef8fa782129519
licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458
share/aclocal/libxslt.m4: 7b0b8b6bd86eea30c617663c9e9439b3
share/doc/libxslt-1.1.34/html/API.html: 205e063f09d60a36b44a61c6b7af0af9

View File

@@ -1,9 +1,9 @@
1582271938
bin/libexslt-0.dll: 1561e984c203d94cdfcf78235ecfe43a
bin/libxslt-1.dll: 0174f89e8ec9e26aee9e665e686214b9
bin/xslt-config: 6e477e88682bb878d649b48d48de3b3d
bin/xsltproc.exe: 3cd6a8754d4e21dec52c8dab720cfcf3
conaninfo.txt: fb9e8ed7e2ab80afd38743a228fd5ac9
1599827795
bin/libexslt-0.dll: a3e52849942745520c13c2d20135ada7
bin/libxslt-1.dll: e6a19c28494ef3e908d869598b79c97a
bin/xslt-config: bf300e18f495cea8591f79fdb0520d06
bin/xsltproc.exe: 0d34ec7f2847d75a4140d5221366ae75
conaninfo.txt: d905a86a351921bb21c973326d39e9de
include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717
include/libexslt/exsltconfig.h: eb4297a735f2666c5872067c25f16005
include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36
@@ -24,16 +24,16 @@ include/libxslt/transform.h: ccbcce4553f3231003b1944002814246
include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77
include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387
include/libxslt/xsltInternals.h: 0c245b0fcc81bf537632a45adf8fcffb
include/libxslt/xsltconfig.h: e23457bb8ef22a6dc617d413679d59ca
include/libxslt/xsltconfig.h: 77d836d8d0a9b2fdd6bea3d379696d80
include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df
include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600
include/libxslt/xsltutils.h: 5f7848088182b183e6d1fdb335b2616a
lib/libexslt.dll.a: 3fee05595887faea3d7022483bf8ab9d
lib/libexslt.la: 1ea05e967d865f7ac83d66aeef3f9740
lib/libxslt.dll.a: b42e5789521163430675d263374e745e
lib/pkgconfig/libexslt.pc: 40e4bf2205e0bcc91529683218d7b53a
lib/pkgconfig/libxslt.pc: 296b763342f742c10accc1cd9b08dd08
lib/xsltConf.sh: dab0389225bc7e3b47e502c8a6496ff0
lib/libexslt.dll.a: f86f6868818b72c97c977e182700d479
lib/libexslt.la: d0c4257b491be8cf3c45d5e01b7ffb96
lib/libxslt.dll.a: 461a9372775da06a0747728a1b505ae2
lib/pkgconfig/libexslt.pc: ba1963709ee3ecc7323aaf188404f144
lib/pkgconfig/libxslt.pc: 9ef33a36710bc31556d1038e27e2510d
lib/xsltConf.sh: 9b2f5a93679c6e963d8bf3d6efa46591
licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458
share/aclocal/libxslt.m4: 7b0b8b6bd86eea30c617663c9e9439b3
share/doc/libxslt-1.1.34/html/API.html: 205e063f09d60a36b44a61c6b7af0af9

View File

@@ -1,7 +0,0 @@
1582277614
FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f
LICENSE: 1ac8330e79e050867144e174d80880f7
conanfile.py: c7aba1a732c28bb9851cb50acf3f7a4d
export_source/CMakeLists.txt: b45a8f19ed120e922c1cb720c0e4a7c7
export_source/CMakeLists_minizip.txt: 7b2c2a9ab51d0ba37b5ca35da21579b7
export_source/minizip.patch: dc8ffe80d334f8e5b1bb967593fe2d4a

View File

@@ -1,9 +0,0 @@
1582279989
FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f
conaninfo.txt: 40e76e93e86476bbd92e1e82b71d04bb
include/zconf.h: 931d0dd891d90ace1eab7a46125a8bda
include/zlib.h: 0338828e9d00c94645648b1517108324
lib/libzlib.a: 7e55bbef492eceaf8101e433e2a46720
lib/pkgconfig/zlib.pc: 29adeed07108745c3562dc19343f3d99
licenses/LICENSE: 1af2e5353c16e930435fff550f827c3e
zlib.pc: 29adeed07108745c3562dc19343f3d99

View File

@@ -1,19 +0,0 @@
# Disable UpdateOrchestrator
$name = "UpdateOrchestrator"
$path = "C:\Windows\System32\Tasks\Microsoft\Windows\$name"
takeown /F $path /A /R
icacls $path /grant Administrators:F /T
SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE
del "$path\Combined Scan Download Install"
del "$path\Maintenance Install"
del "$path\Reboot"
del "$path\Policy Install"
del "$path\Refresh Settings"
del "$path\Resume On Boot"
del "$path\USO_UxBroker_Display"
del "$path\USO_UxBroker_ReadyToReboot"
# Disable Update orchestrator service
reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\UsoSvc" /V Start /T REG_dWORD /D 4 /F

View File

@@ -1,5 +1,3 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
@@ -32,13 +30,11 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
set -ex
# This script will install Azure singtool using Dotnet SDK
$dotnet = "C:\Program Files\dotnet\dotnet.exe"
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
$version = "2.0.17"
Run-Executable "$dotnet" "tool install --global AzureSignTool --version $version"
sudo yum clean all
# As well as this fetching the repository data, we also get a printout of the used repos
sudo yum repolist

View File

@@ -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

View File

@@ -33,40 +33,50 @@
. "$PSScriptRoot\helpers.ps1"
$version = "20181211"
# This script will installs msys2
$version = "20200903"
$prog = "msys2"
if (Is64BitWinHost) {
$arch = "x86_64"
$sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2"
$folder = "msys64"
} else {
$arch = "i686"
$sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e"
$folder = "msys32"
}
$arch = "x86_64"
$sha1 = "5a1644585fac2d58855d48b4ba4a92579a14cf03"
$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8"
$folder = "msys64"
$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z"
$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz"
$url_cache_prebuilt = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package_prebuilt"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
$url_official = "http://repo.msys2.org/distrib/$arch/$package"
$PackagePath = "C:\Windows\Temp\$package"
$TargetLocation = "C:\Utils"
Download $url_official $url_cache $PackagePath
Verify-Checksum $PackagePath $sha1
Extract-tar_gz $PackagePath $TargetLocation
$bash = "$TargetLocation\$folder\usr\bin\bash"
if ((Test-Path $url_cache_prebuilt)) {
$PackagePath = "C:\Windows\Temp\$package_prebuilt"
Download $url_cache_prebuilt $url_cache_prebuilt $PackagePath
Verify-Checksum $PackagePath $sha1_prebuilt
Extract-7Zip $PackagePath $TargetLocation
} else {
$PackagePath = "C:\Windows\Temp\$package"
Download $url_official $url_cache $PackagePath
Verify-Checksum $PackagePath $sha1
Extract-tar_gz $PackagePath $TargetLocation
$msys = "$TargetLocation\$folder\msys2_shell.cmd"
# install perl
Run-Executable "$bash" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
Run-Executable "$bash" "`"-l`" `"-c`" `"yes | cpan -i Text::Template Test::More`""
# install perl
# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
Start-Sleep -s 60
cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`""
# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
Start-Sleep -s 360
if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
}
Write-Host "Cleaning $PackagePath.."
Remove-Item -Recurse -Force -Path "$PackagePath"
# pacman-key launches gpg-agent and dirmngr in the background, see https://github.com/Alexpux/MSYS2-pacman/issues/56
Stop-Process -Name "gpg-agent" -ErrorAction Ignore
Stop-Process -Name "dirmngr" -ErrorAction Ignore
Write-Output "MSYS2 = $version" >> ~\versions.txt

View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2016 The Qt Company Ltd.
## 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.
@@ -54,8 +54,30 @@ $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$versio
Write-Host "Fetching from URL..."
Download $externalUrl $internalUrl $package
Verify-Checksum $package $sha1
Write-Host "Installing $package..."
Run-Executable "msiexec" "/passive /i $package TARGETDIR=$targetDir ALLUSERS=1"
# Python installation is flaky, but seems to pass with second run if error occurs.
$stop = $false
[int]$retry = "0"
do {
try {
# /levx = e:'All error messages' v:'Verbose' x:'Extra debugging info'
Run-Executable "msiexec" "/passive /i $package /levx C:\Windows\Temp\Python_log.log TARGETDIR=$targetDir ALLUSERS=1"
$stop = $true
}
catch {
Get-Content C:\Windows\Temp\Python_log.log -Tail 50
if ($retry -gt 2) {
Write-Host "Python installation failed!"
throw
}
else {
Write-Host "Couldn't install python, retrying in 30 seconds"
Start-Sleep -s 30
$retry = $retry + 1
}
}
}
while ($stop -ne $true)
# We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB
Write-Host "Changing allowZip64 value to 'True'..."

View File

@@ -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..."

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

@@ -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
sudo /usr/local/bin/pip3 install wheel

View File

@@ -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

View File

@@ -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

View File

@@ -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

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

@@ -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

View File

@@ -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

View File

@@ -4,4 +4,4 @@
set -ex
brew update
brew install p7zip
brew install --build-from-source p7zip

View File

@@ -4,4 +4,4 @@
set -ex
brew update
brew install p7zip
brew install --build-from-source p7zip

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## 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.
@@ -114,15 +114,15 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
iPhoneDeveloper="iosDevelopment2019CiTeam.p12"
shaIPhoneDeveloper="fa22abe1b1cc64af6585f7a61c4aba5e00220bdc"
Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12"
shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2"
Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.."
{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
iPhoneDistribution="iosDistribution2019CiTeam.p12"
shaIPhoneDistribution="6510119651c7aecb21d0a1dae329f2eae1e8f4e9"
Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
iPhoneDistribution="iPhoneDistributionCiTeam2020.p12"
shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d"
Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.."
{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
@@ -130,8 +130,8 @@ echo "Importing $iPhoneDistribution.."
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
mkdir "$targetFolder/Library/MobileDevice"
mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
shaMobileprovision="477a7f3876c4333bd56a045df0d82fce795b1ebb"
Install "$cacheSigningTools/latest_ios_cert_2019/iOS_Dev_2019_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision
shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da"
Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision
# Removing password files
rm -fr "$targetFolder/login_keychain_password.txt"

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## 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.
@@ -114,15 +114,15 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
iPhoneDeveloper="iosDevelopment2019CiTeam.p12"
shaIPhoneDeveloper="fa22abe1b1cc64af6585f7a61c4aba5e00220bdc"
Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12"
shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2"
Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.."
{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
iPhoneDistribution="iosDistribution2019CiTeam.p12"
shaIPhoneDistribution="6510119651c7aecb21d0a1dae329f2eae1e8f4e9"
Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
iPhoneDistribution="iPhoneDistributionCiTeam2020.p12"
shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d"
Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.."
{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
@@ -130,8 +130,8 @@ echo "Importing $iPhoneDistribution.."
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
mkdir "$targetFolder/Library/MobileDevice"
mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
shaMobileprovision="477a7f3876c4333bd56a045df0d82fce795b1ebb"
Install "$cacheSigningTools/latest_ios_cert_2019/iOS_Dev_2019_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision
shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da"
Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision
# Removing password files
rm -fr "$targetFolder/login_keychain_password.txt"

View File

@@ -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

View File

@@ -2,7 +2,7 @@
icu/65.1@qtproject/stable
libxml2/2.9.10@qtproject/stable
libxslt/1.1.34@qtproject/stable
libjpeg-turbo/2.0.3@qtproject/stable
libjpeg-turbo/2.0.5@qtproject/stable
[generators]
cmake

View File

@@ -0,0 +1,2 @@
# 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,2 +0,0 @@
Remove-AppxPackage Microsoft.ZuneVideo_10.17092.13511.0_x64__8wekyb3d8bbwe
Remove-AppxPackage Microsoft.ZuneMusic_10.17083.18321.0_x64__8wekyb3d8bbwe

View File

@@ -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 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"

View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-dotnet.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\install-azure-tool.ps1"

View File

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

View File

@@ -2,7 +2,7 @@
icu/65.1@qtproject/stable
libxml2/2.9.10@qtproject/stable
libxslt/1.1.34@qtproject/stable
libjpeg-turbo/2.0.3@qtproject/stable
libjpeg-turbo/2.0.5@qtproject/stable
[generators]
cmake

View File

@@ -1,11 +1 @@
. "$PSScriptRoot\..\common\windows\conan.ps1"
Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" `
-BuildinfoDir Mingw73-x86 `
-Arch x86 `
-Compiler "gcc" `
-CompilerVersion 7 `
-CompilerLibcxx "libstdc++" `
-CompilerException "dwarf2" `
-CompilerThreads "posix"

View File

@@ -2,8 +2,7 @@
icu/65.1@qtproject/stable
libxml2/2.9.10@qtproject/stable
libxslt/1.1.34@qtproject/stable
libjpeg-turbo/2.0.3@qtproject/stable
zlib/1.2.11@qtproject/stable
libjpeg-turbo/2.0.5@qtproject/stable
[generators]
cmake
@@ -22,8 +21,6 @@ libxslt:shared=True
libjpeg-turbo:shared=False
zlib:shared=False
[imports]
bin, icudt65.dll -> ./bin
bin, icuin65.dll -> ./bin

2
qt3d

Submodule qt3d updated: d77a1fbbce...4c25b43628

2
qtbase

Submodule qtbase updated: 823ed71e22...4903e45231

2
qtdoc

Submodule qtdoc updated: 680ad5b6c2...1209dde410

2
qtqa

Submodule qtqa updated: 97c9a2605c...f87ba919a9

Submodule qtscxml updated: eeab4442d4...2aa8d6b254

2
qtsvg

Submodule qtsvg updated: 6529b001dd...a3e50a83ab

Submodule qttools updated: 90aa88f31b...d170069f8f

Some files were not shown because too many files have changed in this diff Show More