Compare commits

..

73 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
8337e20fad Update submodules on '5.12.3' in qt5
Change-Id: I173c80b1d080350d41108aac01b8d66de0dcfb56
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-11 03:06:13 +00:00
Qt Submodule Update Bot
7ff76b89dd Update submodules on '5.12.3' in qt5
Change-Id: I216b93959076bc9402c715599398dea770cacde2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-05 11:29:29 +00:00
Qt Submodule Update Bot
d0d7ade759 Update submodules on '5.12.3' in qt5
Change-Id: I34e1bd8f276b6e9eb2a1f658f2447fdd01fd4d09
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-30 20:26:00 +00:00
Kari Oikarinen
84aaf6871c Adjust submodule branches
Change-Id: I28500be5d253a4d047cef1409659c275c314d5b0
2019-03-25 10:07:35 +02:00
Qt Submodule Update Bot
b02d849d76 Update submodules on '5.12' in qt5
Change-Id: I944abf1de570b68229ba2284e93e879aadc21b2d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-23 08:32:42 +00:00
Tony Sarajärvi
665703efc9 Remove 32bit MSVC 2015 from the CI
Task-number: QTQAINFRA-2251
Change-Id: I4006c7390759e2eb357309de36eb23af007a576e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2019-03-23 08:32:35 +00:00
Juha Karjalainen
a97d669a20 Provisioning: Remove certificate printing to log
macOS openssl provisioning printed certificates to log. This patch
prevent printing certificates to log by redirecting it to /dev/null

Task-number: QTQAINFRA-2841
Change-Id: I9ec120212a1f068fa040a302cb50e775857cbb74
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-03-22 12:06:56 +00:00
Qt Submodule Update Bot
7cc57995bf Update submodules on '5.12' in qt5
Change-Id: Idba1b3637a56b7bf822c6a0bff29dd91dca735b7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-22 08:56:29 +00:00
Qt Submodule Update Bot
209b8117bd Update submodules on '5.12' in qt5
Change-Id: I5cd2a0098c21f4d4691261fd5c2c1f535f119a77
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-21 18:29:30 +00:00
Liang Qi
78afd2d4b6 Merge remote-tracking branch 'origin/5.12.2' into 5.12
Change-Id: I8795e84dd750cbb2b55a03c861b911f57a1e2626
2019-03-21 14:26:56 +01:00
Qt Submodule Update Bot
323dcdb60f Update submodules on '5.12' in qt5
Change-Id: If57974194302222651f94a7e7b99cc4e34c3b3a1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-20 15:31:56 +00:00
Johanna Äijälä
c71f004171 Provisioning: add dependency walker to win10 x86
Needed by RTA.

Change-Id: I51889477dd6e6f4bdff509ab8f6c1b8307842ebd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-03-20 13:23:34 +00:00
Heikki Halmet
0660a25cca Provisioning: Make gnuwin32 available for windows machines
This script will install gnuwin32 to the windows machines so it can be
removed from qt5

Task-number: QTBUG-73422
Change-Id: I40b7963efcf047525626fe6f1e3ba50b54d68199
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-03-17 08:16:25 +00:00
Johanna Äijälä
675deb1474 Add Squish for MSVC2017 x64 to Win10 x64 machines
Also Squish for MinGW x86 on Win7 x86.

Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-03-14 05:27:53 +00:00
Paul Wicking
cc1203311a Update comment in clang-format file
Change-Id: I18f14a1956f508317f8a3995873a14bc1af29594
Reviewed-by: Andy Maloney <asmaloney@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-03-11 10:33:26 +00:00
Qt Submodule Update Bot
f9c5acb2ff Update submodules on '5.12' in qt5
Change-Id: I4f983c014f06d1d396b13fde8e58d473bf5c988a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-11 06:19:46 +00:00
Heikki Halmet
76c80866af Provisioning: Help script for removing items
Sometimes items are locked (access denied) so we need to have function
which waits and retry until removing is possible.

Task-number: QTQAINFRA-2806
Change-Id: I09055c45c0e439ed1a20eb575ee79b7ca22c5745
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-03-10 14:32:03 +00:00
Qt Submodule Update Bot
afa1b053fe Update submodules on '5.12' in qt5
Change-Id: I324c45e79a1719943cdd8544a3ddbefc9394421c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-08 21:38:55 +00:00
Paul Wicking
e403403b39 Update clang-format config
Set column width to 100 as described in the official Qt coding style
(https://wiki.qt.io/Qt_Coding_Style).

Also, break constructor initializers before the colon and after the commas.

Change-Id: I6ac5a21ce831a35a0d74e699192ba981c8a8ba3c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-03-08 13:53:33 +00:00
Qt Submodule Update Bot
ec772e3e4a Update submodules on '5.12' in qt5
Change-Id: Ie5d3cf0419efe268c3268fd4e5038c61677e57ea
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-08 08:50:13 +00:00
Qt Submodule Update Bot
7100c54887 Update submodules on '5.12.2' in qt5
Change-Id: I9fc68dfd357dd32546248dee88558744502cb24c
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-03-08 04:47:08 +00:00
Johanna Aijala
88b35a4921 Update Squish to 6.4.3
Froglogic has not yet released Squish for Qt5.13 but we can use Squish
packages build with Qt5.12.

Remove msvc12 Squish, not needed.

Change-Id: I1de1bb67a5577fa7f7233c69c3a58bedd15fd16b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-03-07 06:18:26 +00:00
Qt Submodule Update Bot
cfea5af0ed Update submodules on '5.12' in qt5
Change-Id: I99b557104856e3cbf7375f56e7f42b77430bf49f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-05 06:41:22 +00:00
Qt Submodule Update Bot
b74bc40b41 Update submodules on '5.12' in qt5
Change-Id: I31fc2036208413ee138e6154f65af60e15f0e00c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-02 21:37:30 +00:00
Liang Qi
4df2866684 Update submodules on '5.12' in qt5
Change-Id: I20eba8a90e0683263245a01eac5a553c78961050
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-01 19:05:44 +00:00
Qt Submodule Update Bot
3a1e557e54 Update submodules on '5.12.2' in qt5
Change-Id: I3448762f4f01e6fd334927713a61c8d1d6881ab6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-28 19:08:08 +00:00
Antti Kokko
091820f6a1 Remove qt3d-runtime.txt symbolic link from platform configurations
Caused recursion in CI platform configuration parsing algorithm.
Add qt3d-runtime.txt back as regular file.

Task-number: QTQAINFRA-2804
Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-28 04:08:21 +00:00
Qt Submodule Update Bot
ffe8fd7701 Update submodules on '5.12.2' in qt5
Change-Id: Ifc604747b5d94f44948a710e2f9b1c0a5318eaa5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-27 19:35:15 +00:00
Heikki Halmet
099b7ffe4c Provisioning: Update emsdk version
Task-number: QTBUG-73867
Change-Id: I2aabbecbce2fc3378db6c0747fc8146c03fac545
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2019-02-26 11:11:15 +00:00
Qt Submodule Update Bot
becac559b7 Update submodules on '5.12.2' in qt5
Change-Id: Id1d8765c3a400a7e12725ccf7fcff5aef49c47c0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-23 06:47:32 +00:00
Qt Submodule Update Bot
83d5226604 Update submodules on '5.12.2' in qt5
Change-Id: I131875e52b21ab1c354955cf82427470094da8ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-21 19:06:48 +00:00
Juha Karjalainen
9c60d8b190 Fix: Set correct path to environmental variable
Env variable BREAKPAD_SOURCE_DIR had /src at end which was
not needed.

Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2019-02-18 13:17:52 +00:00
Qt Submodule Update Bot
b3b6b100e6 Update submodules on '5.12.2' in qt5
Change-Id: Iea1284a0920bbae7ebefda199db7564f3d874edc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-16 06:50:30 +00:00
Qt Submodule Update Bot
1c6f272dd0 Update submodules on '5.12' in qt5
Change-Id: Ia2c669226e73a545a19c941c5672972a92049534
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-15 07:41:30 +00:00
Qt Submodule Update Bot
391ba3a9ca Update submodules on '5.12' in qt5
Change-Id: Id119f941479fac5fa63c281ea21555ff99dc9a47
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-14 05:32:36 +00:00
Kari Oikarinen
d5d380f452 Adjust submodule branches
Change-Id: I309db20815d3b383155e6549b649607e956b8d89
2019-02-13 09:25:22 +02:00
Qt Submodule Update Bot
6967ec6b73 Update submodules on '5.12' in qt5
Change-Id: I75976d5f76dfac7cca5e13cf619a1d019b3bc5e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-13 05:39:18 +00:00
Juha Karjalainen
80deae9b74 Fix provisioning script dxsdk.ps1
Due to typo in dxsdk.ps1 provisioning script, it did not download from
cached location. Also checksum Check was missing.

Task-number: QTQAINFRA-2614
Change-Id: I321549721b256b85513fa1e4ff57ab1302e28f43
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-02-12 09:10:50 +00:00
Qt Submodule Update Bot
2dff8afa98 Update submodules on '5.12' in qt5
Change-Id: I758a05cd029f8252523681c19b657e76c7bb22dc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-12 08:55:19 +00:00
Qt Submodule Update Bot
f64ba39ce5 Update submodules on '5.12' in qt5
Change-Id: I5a8f3943047e4b222795c08aeb6593b0225ada99
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-11 10:12:41 +00:00
Qt Submodule Update Bot
ef7908d90c Update submodules on '5.12' in qt5
Change-Id: I7c99a0f95deb83a7aa81f68e1e1be2a7466b21d2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-08 08:10:27 +00:00
Qt Submodule Update Bot
9df5188493 Update submodules on '5.12' in qt5
Change-Id: I609f70ead9f00039d3c89f9e26b1301bb18931c0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-07 08:56:38 +00:00
Liang Qi
774f18e61a Merge remote-tracking branch 'origin/5.12.1' into 5.12
Change-Id: I73b9cf3d1cdb2a9f2f88e5568f61447469f45313
2019-02-06 15:44:34 +01:00
Qt Submodule Update Bot
4f7c2120a7 Update submodules on '5.12' in qt5
Change-Id: Ia0b08ce2f5513e78cffa4679d7465a30c95de8e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-05 19:16:28 +00:00
Tony Sarajärvi
4987a682ff Make qt3d-runtime.txt platform configuration a link
The content of qt3d-runtime.txt should always be the same as qt5.txt.

Change-Id: I6cdee575206332f6a719acfaacd7072a2178fd78
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-04 11:11:43 +00:00
Liang Qi
bee2b8cdb9 Update submodules on '5.12' in qt5
Change-Id: Ib8b55ed958660be457a7f0852fad9a13d853f1a5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-04 09:53:02 +00:00
Heikki Halmet
3cb745565f Provisioning: Renew iOS signing certificates
Task-number: QTQAINFRA-2690
Change-Id: I4a058c7d88b3daa24f62d5bc314ec2b0ecc8c383
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-02-01 10:50:32 +00:00
Qt Submodule Update Bot
92498bad9c Update submodules on '5.12' in qt5
Change-Id: I678bfdb4333abc34a29732aef1816d67f46c09cb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-01 05:17:57 +00:00
Heikki Halmet
8ba5474da7 Provisioning: Install Google's Protocol Buffers
Protobuf is needed for Automotive Suite

Task-number: QTQAINFRA-2314
Change-Id: I12b4248f1de5aea88f573297a47b791b5b6296fb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-01-29 12:10:57 +00:00
Heikki Halmet
54cdba9e3d Provisioning: Remove Unneeded Android variables
Change-Id: I7dd008aef6465fdddd07e227b48e9b6361c13f81
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-29 12:10:53 +00:00
Qt Submodule Update Bot
6d90dd2191 Update submodules on '5.12' in qt5
Change-Id: I4fbd3ab3ddb7509366797dde34678d9739229e8d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-29 12:10:49 +00:00
Qt Submodule Update Bot
1518bfdab6 Update submodules on '5.12' in qt5
Change-Id: I8060a5f51ae598fa7c8c348cfce212001250941d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-25 20:09:57 +00:00
Oliver Wolff
92b7d48bc2 Windows provisioning: Explicitly state OpenGL configuration to use
One of our configurations relied on ANGLE being the default OpenGL
configuration on Windows. This is the case at the moment, but might
change, so we should not rely on this behavior, but explicitly state the
configuration we are expecting.

Change-Id: Ie8cb215c2675faf8b514f4d9a43055638be1aaa8
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-01-25 11:57:42 +00:00
Aapo Keskimolo
daf0d3a4c6 Update qtsaferenderer platform configuration definitions
The project-specific platform configuration file is renamed to follow the
convention as for other projects. This will allow Coin to recognize the
configuration that are specific for qtsaferenderer project where they
were previously (unintentionally) ignored.

Removed QNX 7 as it is in the Qt mainline configuration.

Removed Ubuntu 16.04 as Ubuntu 18.04 is now supported.

Task-number: QSR-209
Change-Id: I505edc3741dbc047b2fc23bc409016d712596872
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-25 09:02:08 +00:00
Qt Submodule Update Bot
e8a1ca0581 Update submodules on '5.12' in qt5
Change-Id: I6403bd766964d9f65fadfbc514b01eeefdac540e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-24 19:31:16 +00:00
Tuomas Heimonen
22f032bd02 Build qtsaferenderer examples in Windows
Task-number: QSR-209
Change-Id: If8db177a77e3340f6b75f5a7fa768b6d8abec017
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-01-23 13:31:36 +00:00
Tony Sarajärvi
47d14b365e Accept license in Android SDK provisioning
A change in Android SDK prompts us now for
accepting license.

Task-number: QTQAINFRA-2591
Change-Id: I1ff05d84ccda743649c6d38784c6170e08f50eb1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-23 01:29:37 +00:00
Qt Submodule Update Bot
56b801a77e Update submodules on '5.12' in qt5
Change-Id: Ifa9eae2c3cfbd6fd001caf289e5ed360623d45f7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-21 10:11:54 +00:00
Heikki Halmet
4ddadb9aa3 Add Qt WebAssembly for all submodules
Task-number: QTBUG-63917
Change-Id: I61074c8b1acbf3ffd7781e7435784c4a15412c98
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2019-01-17 13:03:27 +00:00
Juha Karjalainen
3332223130 Provisioning: breakpad for qt3dstudio
Breakpad https://chromium.googlesource.com/breakpad/breakpad/
sources are needed for qt3studio. Also Breakpad need sources for
https://chromium.googlesource.com/linux-syscall-support.

Task-number: QT3DS-2650
Change-Id: I13c7534e1c6e97a1e345dad3c2c82eeb6428313d
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-17 09:45:12 +00:00
Liang Qi
34c751db5e Update submodules on '5.12' in qt5
Change-Id: I99897f12572b1927ef140ac0dd3430db2f97799c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-17 09:45:09 +00:00
Simo Fält
6d2929d1aa Provisioning: Move Android toolchain and config to win10
Installing Android toolchains and ssl headers to win10 template
and moving Android windows platform configs to win10 from win7.

Task-number: QTQAINFRA-1266
Change-Id: I9b3e3a378451e0bdfc7dc5c7b75ee035faf8994c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 5a040ca46a)
2019-01-17 09:45:05 +00:00
Heikki Halmet
ea0825abe8 Provisioning: Remove update notifier
Update notifier is showing when vm is running.
It can affect to test results and that's why it need to be removed

Task-number: QTQAINFRA-2453
Change-Id: Icb27ba998ef9a51aaf8f40274c182b0c3dcd496a
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-01-17 09:45:02 +00:00
Maurice Kalinowski
209d09d530 Provisioning: Update Unified Automation OpcUA backend
Adding in the x64 bit installers to deployment. Furthermore, we can use
the msvc2015 installer to create msvc2017 binaries with Qt.
After the licensing change, we will be able to generate packages for all
msvc based installers.

Change-Id: I96db345b535a2518c758175137c808b15130ff41
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2019-01-16 07:30:37 +00:00
Heikki Halmet
c1f3a886ed Provisioning: Signtools for Windows x86
QtDesignStudio requires signtools for Windows x86

Task-number: QTBUG-72907
Change-Id: I7fb15cb07511cb89d3be00e1fe65247ecc21bcfe
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-01-14 10:25:09 +00:00
Tuomas Heimonen
6930998900 Add qtsaferenderer extra targets for Coin
The cross-compile targets that qtsaferenderer needs do not exist in qt5
therefore we add those extra targets for CI.

Task-number: QSR-378
Change-Id: Ia07074392b09af8d111a957027407f85518e5d85
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
(cherry picked from commit f7b6a4c276)
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
2019-01-11 11:21:58 +00:00
Liang Qi
3b5c100040 Update submodules on '5.12' in qt5
Skip qtbase in this round.

Change-Id: Ib718f8343c710c22bb241867bf3b90eb11aabe05
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-10 19:31:52 +00:00
Juha Karjalainen
cfa7877afe Fix provisioning ODBC environmetal variables had : at end
CPLUS_INCLUDE_PATH and LIBRARY_PATH environmental variables had
 --> : <-- at end of variable. As this adds current dir to search
path this is undesirable and causes bugs.

Change-Id: Ia36c3f3f791f5d506eea15aba6be6d665049a922
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2019-01-10 12:32:57 +00:00
Maurice Kalinowski
56c43a03cd Provisioning: Update Qt OpcUA backends
- Unified Automation SDK needs to be updated to 1.6x to reflect latest
API changes
- Open62541 is now inside 3rdparty of the Qt OpcUA module. Hence, no
need to provision it.

Change-Id: I96a3764053ca684fa71f9d49e998ebe0ce45a6ae
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2019-01-09 09:57:35 +00:00
Simon Hausmann
0b18f12f99 Prospective fix for git lfs installation
Keys used to sign package repositories tend to have expiry dates and
therefore need to be changed from time to time. Therefore hardcoding
the key we expect here will break (as it does right now) and it's better
to retrieve the expected key via a secure transport.

The old key - per
http://keyserver.ubuntu.com/pks/lookup?search=0xC2E73424D59097AB&op=vindex
- will expire on the 12 of January. That's probably why they changed the
key used to sign the repo before the expiry.

Change-Id: I39d082a6e12731b7eb0a8214a500101ca24f8af4
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-09 09:56:56 +00:00
Juha Karjalainen
7028ee3184 Fix broken provisioning script DownloadURL.sh
DownloadURL returns 0 even when alt download fails.

Task-number: QTQAINFRA-2501
Change-Id: Id2fb1e0b4ff12a48b6adb27291f55fc129296233
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2019-01-09 09:14:02 +00:00
Qt Submodule Update Bot
ff12741299 Update submodules on '5.12' in qt5
Change-Id: I438761719f8deceebfc4a77fb660a18c8d6ed00b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-09 05:24:00 +00:00
Juha Karjalainen
f4b482d844 Provision: install unixodbc-devel library
Adds odbc support for rhel7.

Task-number: QTBUG-72444
Change-Id: I49b1e91d9f87bdf98601627538aaa65b78440451
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-08 15:09:55 +00:00
95 changed files with 646 additions and 480 deletions

80
.gitmodules vendored
View File

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

View File

@@ -13,9 +13,10 @@ BasedOnStyle: WebKit
Standard: Cpp11
# Leave the line breaks up to the user.
# Column width is limited to 100 in accordance with Qt Coding Style.
# https://wiki.qt.io/Qt_Coding_Style
# Note that this may be changed at some point in the future.
ColumnLimit: 0
ColumnLimit: 100
# How much weight do extra characters after the line length limit have.
# PenaltyExcessCharacter: 4
@@ -77,4 +78,5 @@ SortIncludes: false
# macros for which the opening brace stays attached.
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
# Break constructor initializers before the colon and after the commas.
BreakConstructorInitializers: BeforeColon

View File

@@ -1,6 +1,6 @@
Template Target OS Target arch Compiler Target Compiler Features
----------------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle
qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic
qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
@@ -12,6 +12,7 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC
qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release
qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch

View File

@@ -8,9 +8,9 @@ qtci-windows-10-x86_64-10 Mingw73
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2

View File

@@ -1,16 +1,15 @@
Template Target OS Target arch Compiler Target Compiler Features
--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2

View File

@@ -0,0 +1,3 @@
Template Target OS Target arch Compiler Features
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples

View File

@@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
version="1.38.1"
version="1.38.16"
version_node="8.9.1"
urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz"
urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
@@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten
urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz"
urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz"
sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3"
sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7"
sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d"
sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673"
sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
targetFolder="/opt/emsdk"
sudo mkdir "$targetFolder"

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
sudo apt -q -y remove update-notifier update-manager

View File

@@ -73,8 +73,8 @@ SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\""
SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\""
SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\""
security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
sudo rm -rf /tmp/openssl-$opensslVersion

View File

@@ -48,7 +48,7 @@ brew install libiodbc
read -r -a arr <<< $(brew list --versions libiodbc)
version=${arr[1]}
SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include:$CPLUS_INCLUDE_PATH"
SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib:$LIBRARY_PATH"
SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}"
SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}"
echo "libiodbc = $version" >> ~/versions.txt

View File

@@ -40,6 +40,8 @@
# If called directly from another script, it will exit the parent script
# as well, if not called in its own subshell with parentheses.
set -ex
function DownloadURL {
url=$1
url_alt=$2
@@ -47,11 +49,11 @@ function DownloadURL {
targetFile=$4
echo "Downloading from primary URL '$url'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || (
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || {
echo "Failed to download '$url' multiple times"
echo "Downloading from alternative URL '$url_alt'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
)
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || { echo 'Failed to download even from alternative url'; exit 1; }
}
echo "Checking SHA1 on PKG '$targetFile'"
echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"

View File

@@ -0,0 +1,81 @@
#!/usr/bin/env bash
############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
############################################################################
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
set -ex
breakpad_commit_sha="b988fa74ec18de6214b18f723e48331d9a7802ae"
breakpad_tar="breakpad_$breakpad_commit_sha.tar.gz"
breakpad_tar_url="http://ci-files01-hki.intra.qt.io/input/breakpad/$breakpad_tar"
breakpad_tar_sha="a2d404d2aebc947cdac5840a9bccd65dfafae24c"
linux_syscall_support_commit_sha1="93426bda6535943ff1525d0460aab5cc0870ccaf"
linux_syscall_support_tar="linux-syscall-support_$linux_syscall_support_commit_sha1.tar.gz"
linux_syscall_support_tar_url="http://ci-files01-hki.intra.qt.io/input/linux-syscall-support/$linux_syscall_support_tar"
linux_syscall_support_tar_sha="62565be0920f3661e138d68026b79fbbdc2a11e4"
targetBreakpad="/tmp/$breakpad_tar"
targetSyscall="/tmp/$linux_syscall_support_tar"
installFolder="$HOME"
breakpadHome="$HOME/breakpad"
# shellcheck disable=SC2015
( DownloadURL "$breakpad_tar_url" "$breakpad_tar_url" "$breakpad_tar_sha" "$targetBreakpad" ) && (
DownloadURL "$linux_syscall_support_tar_url" "$linux_syscall_support_tar_url" "$linux_syscall_support_tar_sha" "$targetSyscall"
) && (
tar -xzf "$targetBreakpad" -C "$installFolder"
tar -xzf "$targetSyscall" -C "/tmp"
mv "/tmp/linux-syscall-support/" "$breakpadHome/src/third_party/lss/"
rm -rf $targetBreakpad
rm -rf $targetSyscall
) || (
cd "$HOME"
git clone https://chromium.googlesource.com/breakpad/breakpad "$breakpadHome"
git clone https://chromium.googlesource.com/linux-syscall-support "$breakpadHome/src/third_party/lss"
cd "$breakpadHome"
git checkout "$breakpad_commit_sha"
cd "$breakpadHome/src/third_party/lss"
git checkout "$linux_syscall_support_commit_sha1"
)
SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome"
echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt
echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt

View File

@@ -0,0 +1,75 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# This script will install Google's Protocal Buffers which is needed by Automotive Suite
version="3.6.1"
sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip"
externalUrl="https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
targetDir="$HOME/protobuf-$version"
targetFile="$targetDir.zip"
DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
unzip "$targetFile" -d "$HOME"
sudo rm "$targetFile"
# devtoolset is needed when running configuration
if uname -a |grep -qv "Darwin"; then
export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH"
fi
echo "Configuring and building protobuf"
cd "$targetDir"
if uname -a |grep -q Darwin; then
./configure --prefix "$(xcrun --sdk macosx --show-sdk-path)/usr/local"
SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin"
else
./configure
fi
make
sudo make install
# Refresh shared library cache if OS isn't macOS
if uname -a |grep -qv "Darwin"; then
sudo ldconfig
fi
sudo rm -r "$targetDir"

View File

@@ -38,9 +38,9 @@ set -ex
# This script will install squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA)
version="6.3.2"
version="6.4.3"
# Branch version without dot
qtBranch="510x"
qtBranch="512x"
squishFolder="/opt/squish"
squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
squishFile="squish-$version-qt$qtBranch-linux64.run"

View File

@@ -53,10 +53,6 @@ Rename-Item C:\Utils\openssl-$version $destination
Remove-Item -Path $zip
Remove-Item C:\Utils\openssl-$version.tar
Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang"
Set-EnvironmentVariable "AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar"
Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr"
# Make sure configure for openssl has a "make" and "perl" available
$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"

View File

@@ -85,7 +85,7 @@ if (IsProxyEnabled) {
# Remove "http://" from the beginning
$proxy = $proxy.Remove(0,7)
$proxyhost,$proxyport = $proxy.split(':')
$sdkmanager_args = "--no_https --proxy=http --proxy_host=`"$proxyhost`" --proxy_port=`"$proxyport`" "
$sdkmanager_args = "--no_https", "--proxy=http", "--proxy_host=`"$proxyhost`"", "--proxy_port=`"$proxyport`""
}
New-Item -ItemType Directory -Force -Path C:\Utils\Android\licenses
@@ -95,9 +95,10 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8
# Get a PATH where Java's path is defined from previous provisioning
[Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process")
$sdkmanager_args += " platforms;$sdkApiLevel platform-tools build-tools;$sdkBuildToolsVersion"
Run-Executable "$toolsFolder\bin\sdkmanager.bat" "$sdkmanager_args"
cd $toolsFolder\bin\
$sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion"
$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args'
iex $command
$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
iex $command
cmd /c "dir C:\Utils\android"

View File

@@ -4,16 +4,16 @@
$package = "DXSDK_Jun10.exe"
$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
$cachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
$officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package"
$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
$exe = "C:\Windows\Temp\$package"
Download $officialUrl $cachedUrl $exe
$sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
$package_path = "C:\Windows\Temp\$package"
Download $officialUrl $cachedUrl $package_path
Verify-Checksum $package_path $sdkChecksumSha1 sha1
Write-Host "Installing DirectX SDK"
Run-Executable $exe "/u"
Run-Executable $package_path "/u"
Remove-Item -Path $exe
Remove-Item -Path $package_path
Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt

View File

@@ -35,6 +35,28 @@ function Run-Executable
}
}
function Extract-tar_gz
{
Param (
[string]$Source,
[string]$Destination
)
Write-Host "Extracting '$Source' to '$Destination'..."
if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
$zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe'
if (-not (test-path $zipExe)) {
$zipExe = "C:\Utils\sevenzip\7z.exe"
if (-not (test-path $zipExe)) {
throw "Could not find 7-zip."
}
}
} else {
$zipExe = "7z.exe"
}
Run-Executable "cmd.exe" "/C $zipExe x -y `"$Source`" -so | $zipExe x -y -aoa -si -ttar `"-o$Destination`""
}
function Extract-7Zip
{
Param (
@@ -137,3 +159,22 @@ function IsProxyEnabled {
function Get-Proxy {
return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
}
function Remove {
Param (
[string]$Path = $(BadParam("a path"))
)
Write-Host "Removing $Path"
$i = 0
While ( Test-Path($Path) ){
Try{
remove-item -Force -Recurse -Path $Path -ErrorAction Stop
}catch{
$i +=1
if ($i -eq 5) {exit 1}
Write-Verbose "$Path locked, trying again in 5"
Start-Sleep -seconds 5
}
}
}

View File

@@ -0,0 +1,94 @@
############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
############################################################################
# This script install breakpad from sources.
# for manual install.. remember to checkout correct version
# git clone https://chromium.googlesource.com/breakpad/breakpad
# git clone https://chromium.googlesource.com/linux-syscall-support breakpad/src/third_party/lss
# Commit used to make this zip breakpad_20181113.tar.gz
# breakpad
# commit 66571f4838b2306161f072555cb199049bc68142 (HEAD -> master, origin/master, origin/HEAD)
# linux-syscall-support
# commit 93426bda6535943ff1525d0460aab5cc0870ccaf (HEAD -> master, origin/master, origin/HEAD)
# This script installs breakpad.
. "$PSScriptRoot\helpers.ps1"
$breakpad_commit_sha="b988fa74ec18de6214b18f723e48331d9a7802ae"
$breakpad_tar="breakpad_$breakpad_commit_sha.tar.gz"
$breakpad_tar_url="http://ci-files01-hki.intra.qt.io/input/breakpad/$breakpad_tar"
$breakpad_tar_sha="a2d404d2aebc947cdac5840a9bccd65dfafae24c"
$linux_syscall_support_commit_sha1="93426bda6535943ff1525d0460aab5cc0870ccaf"
$linux_syscall_support_tar="linux-syscall-support_$linux_syscall_support_commit_sha1.tar.gz"
$linux_syscall_support_tar_url="http://ci-files01-hki.intra.qt.io/input/linux-syscall-support/$linux_syscall_support_tar"
$linux_syscall_support_tar_sha="62565be0920f3661e138d68026b79fbbdc2a11e4"
$targetBreakpad="$env:tmp\$breakpad_tar"
$targetSyscall="$env:tmp\$linux_syscall_support_tar"
$installFolder = "C:\Utils"
# breakpad
try {
Download $breakpad_tar_url $breakpad_tar_url $targetBreakpad
Verify-Checksum $targetBreakpad $breakpad_tar_sha
Extract-tar_gz $targetBreakpad $installFolder
Remove-Item -Path $targetBreakpad
# linux-syscall-support
Download $linux_syscall_support_tar_url $linux_syscall_support_tar_url $targetSyscall
Verify-Checksum $targetSyscall $linux_syscall_support_tar_sha
Extract-tar_gz $targetSyscall "$env:tmp\"
New-Item -ItemType directory -Path "$installFolder\breakpad\third_party\lss"
Get-ChildItem -Path "$env:tmp\linux-syscall-support\*" -Recurse | Move-Item -Destination "$installFolder\breakpad\third_party\lss"
Remove-Item -Path $targetSyscall
}
catch {
Write-Host "Cached download failed: Attempping fallback method eg git."
Set-Location $installFolder
git.exe clone "https://chromium.googlesource.com/breakpad/breakpad"
git.exe clone "https://chromium.googlesource.com/linux-syscall-support breakpad\third_party\ssl"
Set-Location "breakpad"
git checkout $breakpad_commit_sha
Set-Location "src/third_party/lss"
git checkout $linux_syscall_support_commit_sha1
}
Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad"
# Write HEAD commit sha to versions txt, so build can be repeated at later date
Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt
Write-Output "linux-syscall-support = $linux_syscall_support_tar" >> ~/versions.txt

View File

@@ -1,8 +1,6 @@
#!/bin/env bash
#############################################################################
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -31,43 +29,18 @@
##
## $QT_END_LICENSE$
##
#############################################################################
############################################################################
. "$PSScriptRoot\helpers.ps1"
set +e
# This script will install gnuwin32
# shellcheck disable=SC1090
# We need to source to be able to use cmake in the shell
if uname -a |grep -q "Ubuntu"; then
source ~/.profile
else
source ~/.bashrc
fi
set -ex
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
# shellcheck disable=SC2064
trap "sudo rm -fr $TEMPDIR" EXIT
cd "$TEMPDIR"
sudo pip install --upgrade pip
sudo pip install six
git clone https://github.com/open62541/open62541.git open62541
cd open62541
git checkout 215651ab8db94e5eacdd10ec26a5a9fb96b9301f
mkdir build
cd build
TARGETPATH=/opt/open62541
cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH="$TARGETPATH" ..
make
sudo make install
sudo /sbin/ldconfig
SetEnvVar "CI_OPEN62541_GCC_X64_PREFIX" "$TARGETPATH"
$prog = "gnuwin32"
$zipPackage = "$prog.zip"
$temp = "$env:tmp"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage"
$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage"
Download $externalUrl $internalUrl "$temp\$zipPackage"
Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
Extract-7Zip "$temp\$zipPackage" C:\Utils
Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt

View File

@@ -0,0 +1,64 @@
#############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script will install Google's Protocol Buffers
# Script requires Cmake to be installed and strawberry-perl not to be installed
$version = "3.6.1"
$sha1 = "44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
$officialUrl = "https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
$cachedUrl = "http://ci-files01-hki.ci.local/input/automotive_suite/protobuf-all-$version.zip"
$zip = "C:\Utils\protobuf-all-$version.zip"
$installationFolder = "C:\Utils\protobuf"
Write-Host "Installing Protocol Buffers"
Add-Path "C:\CMake\bin"
Download "$officialUrl" "$cachedUrl" "$zip"
Verify-Checksum "$zip" "$sha1"
Extract-7Zip "$zip" C:\Utils
New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build"
New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build\release"
New-Item -ItemType directory -Force -Path "$installationFolder"
cd "C:\Utils\protobuf-$version\cmake\build\release"
cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && cmake -G `"NMake Makefiles`" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$installationFolder ../.. && nmake && nmake install"
if(![System.IO.File]::Exists("$installationFolder\bin\protoc.exe")){
Write-Host "Can't find $installationFolder\bin\protoc.exe. Installation probably failed!"
exit 1
}
Remove-Item "$zip"
Add-Path "$installationFolder\bin"
Set-EnvironmentVariable PROTOBUF_INCLUDE "$installationFolder\include"
Set-EnvironmentVariable PROTOBUF_LIB "$installationFolder\lib"

View File

@@ -1,4 +1,4 @@
. "$PSScriptRoot\..\common\windows\helpers.ps1"
. "$PSScriptRoot\helpers.ps1"
# This script will install msys which is needed for configuring openssl for Android

View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,27 +33,58 @@
. "$PSScriptRoot\helpers.ps1"
$zip = Get-DownloadLocation "uasdkcpp.zip"
$sha1 = "e1927dbd5d8bb459b468fa70a70b1de51a4ce022"
$installLocation = "C:\Utils\uacpp"
function DownloadAndInstallUA
{
Param (
[string] $InstallerFileName = $(BadParam("no download URL specified")),
[string] $sha1 = $(BadParam("No SHA1 for download specified")),
[string] $Destination = $(BadParam("No location to install specified"))
)
Write-Host "UACPPSDK: DownloadAndInstallUA $InstallerFileName"
$zip = Get-DownloadLocation "uasdkcpp.zip"
Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..."
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.zip"
# No public download link exists
$externalUrl = $internalUrl
Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..."
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/$InstallerFileName.zip"
# No public download link exists
$externalUrl = $internalUrl
Download $externalUrl $internalUrl $zip
Verify-Checksum $zip $sha1
Download $externalUrl $internalUrl $zip
Verify-Checksum $zip $sha1
Write-Host "UACPPSDK: Installing $zip..."
Extract-7Zip $zip (Get-DefaultDownloadLocation)
Remove-Item -Path $zip
Write-Host "UACPPSDK: Extracting $zip..."
Extract-7Zip $zip (Get-DefaultDownloadLocation)
Remove-Item -Path $zip
$executable = (Get-DefaultDownloadLocation) + "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.exe"
$arguments = "/S /D=$installLocation"
Run-Executable $executable $arguments
Write-Host "UACPPSDK: Installer done."
Remove-Item $executable
$executable = (Get-DefaultDownloadLocation) + "$InstallerFileName.exe"
# We cannot call the installer as the x86 and x64 versions of the installer are not
# allowed to be installed in parallel (they check for the same registry value and
# delete each other). Extracting does not have a side-effect for Qt
#$arguments = "/S /D=$installLocation"
#Run-Executable $executable $arguments
#Write-Host "UACPPSDK: Installer done."
#Remove-Item $executable
Write-Host "Set environment variable for COIN to locate SDK"
Set-EnvironmentVariable "CI_UACPP_msvc2015_x86_PREFIX" "$installLocation"
Extract-7Zip $executable $Destination
Remove-Item $executable
}
#x86 version
$installerName86 = "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.6.3-406"
$downloadSha86 = "C73278B4C10DF0E3D60ABAA159ABA9185095124C"
$installLocation86 = "C:\Utils\uacpp_x86"
DownloadAndInstallUA $installerName86 $downloadSha86 $installLocation86
Set-EnvironmentVariable "CI_UACPP_msvc2015_x86_PREFIX" "$installLocation86"
# For UA msvc2015 is binary compatible with msvc2017
Set-EnvironmentVariable "CI_UACPP_msvc2017_x86_PREFIX" "$installLocation86"
#x64 version
$installerName64 = "uasdkcppbundle-bin-EVAL-win64-x86_64-vs2015-v1.6.3-406"
$downloadSha64 = "1384e6882644f9163e9840aee962cdb9ca3398c8"
$installLocation64 = "C:\Utils\uacpp_x64"
DownloadAndInstallUA $installerName64 $downloadSha64 $installLocation64
Set-EnvironmentVariable "CI_UACPP_msvc2015_x64_PREFIX" "$installLocation64"
# For UA msvc2015 is binary compatible with msvc2017
Set-EnvironmentVariable "CI_UACPP_msvc2017_x64_PREFIX" "$installLocation64"

View File

@@ -1,265 +0,0 @@
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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$
##
#############################################################################
Param (
[string]$targetCommand= ""
)
. "$PSScriptRoot\helpers.ps1"
## Variables for builds
$commitSHA = "215651ab8db94e5eacdd10ec26a5a9fb96b9301f"
$sha1 = "8d899f986071525be73e1ee8565b28ea10536d7d"
$extractTarget = "C:\open62541_build"
function CreateArchive
{
param(
[string]$sourceDirectory=$(throw("You must specify a directory")),
[string]$archiveName=$(throw("You must specify an archive name"))
)
if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
$zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe'
if (-not (test-path $zipExe)) {
$zipExe = "C:\Utils\sevenzip\7z.exe"
if (-not (test-path $zipExe)) {
throw "Could not find 7-zip."
}
}
} else {
$zipExe = "7z.exe"
}
Run-Executable $zipExe "a -y `"$archiveName`" `"$sourceDirectory`""
}
function PrepareRepository
{
$username = $env:USERNAME
$zip = "c:\users\$username\downloads\open62541.zip"
$externalUrl = "https://github.com/open62541/open62541/archive/$commitSHA.zip"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/open62541/$commitSHA.zip"
Download $externalUrl $internalUrl $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip $extractTarget
}
function PushDevEnvironment
{
# Provisioning updates the registry entries for PATH etc. However, they are not
# propagated to the next provisioning script and hence need to be manually
# read / set.
$adaptedPath = $env:PATH
$jomLocation = [Environment]::GetEnvironmentVariable("CI_JOM_PATH", "Machine")
$adaptedPath = $adaptedPath + ";" + $jomLocation
$adaptedPath = $adaptedPath + ";" + "C:\Python27"
$adaptedPath = $adaptedPath + ";" + "C:\CMake\bin"
[Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process")
}
function MSVCEnvironment
{
Param (
[string]$msvcDir=$(throw("No VS Directory specified")),
[string]$msvcbat=$(throw("No vsvars batch file specified"))
)
Push-Location $msvcDir
cmd /c "$msvcbat&set" |
foreach {
if ($_ -match "=") {
$v = $_.split("="); Set-Item -force -path "ENV:\$($v[0])" -value "$($v[1])"
}
}
Pop-Location
}
function BuildAndInstallOpen62541
{
Param (
[string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")),
[string]$Platform=$(throw("You must specify the target platform [x86, x64]")),
[string]$MakeCommand=$(throw("You must specify a make command [mingw32-make, nmake]"))
)
Write-Host "### Open62541: Supposed to build with: $Type $Platform $MakeCommand"
## Make Build directory
$buildDir = "$extractTarget\open62541-$commitSHA\build" + "_" + $Type + "_" + $Platform
if (Test-Path $buildDir) {
Write-Host " Deleting pre-existing build directory"
Remove-Item $buildDir -Force -Recurse
}
New-Item -ItemType Directory -Force -Path $buildDir
Push-Location $buildDir
## Invoke Cmake
$makeGenerator = "NMake Makefiles JOM"
$installTarget = "C:\Utils\open62541" + "_" + $Type + "_" + $Platform
if (Test-Path $installTarget) {
Write-Host " Deleting pre-existing install directory"
Remove-Item $installTarget -Force -Recurse
}
if ($Type.StartsWith("mingw")) {
$makeGenerator = "MinGW Makefiles"
}
cmake -G "$makeGenerator" -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=$installTarget -DLIB_INSTALL_DIR:PATH=$installTarget/lib ..
## Call build command
Write-Host "### Open62541: Compilation ###"
Run-Executable $MakeCommand
## call install command
Write-Host "### Open62541: Installation ###"
Run-Executable $MakeCommand install
$platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform + "_PREFIX"
Set-EnvironmentVariable $platformVariable $installTarget
## Packaging
Push-Location "C:\Utils"
$archiveName = "open62541_" + $Type + "_" + $Platform + ".7z"
CreateArchive $installTarget $archiveName
Pop-Location
## cleanup build directory
Write-Host "### Open62541: Cleanup ###"
Pop-Location
Remove-Item $buildDir -Force -Recurse
}
function DownloadAndInstall
{
Param (
[string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")),
[string]$Platform=$(throw("You must specify the target platform [x86, x64]"))
)
$baseLocation = "http://ci-files01-hki.intra.qt.io/input/open62541/"
$targetName = "open62541_" + $Type + "_" + $Platform
$archiveName = $targetName + ".7z"
$downloadUrl = $baseLocation + $archiveName
# Download
$downloadTarget = "C:\Utils\" + $archiveName
Download $downloadUrl $downloadUrl $downloadTarget
# Extract
Push-Location C:\Utils
Extract-7Zip $downloadTarget C:\Utils
Pop-Location
# Set environment variable
$platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform
$platformPath = "C:\Utils\" + $targetName
Set-EnvironmentVariable $platformVariable $platformPath
}
##############################
# Startup #
##############################
if ($targetCommand.StartsWith("mingw")) {
Write-Host "### Creating Open62541 for MinGW"
$mingwPath = [Environment]::GetEnvironmentVariable($targetCommand, "Machine")
if (!$mingwPath) {
throw("Could not find mingw")
}
# Strawberry has its own gcc, put mingw in front
$adaptedPath = $mingwPath + "\bin;" + [Environment]::GetEnvironmentVariable("PATH", "Machine")
[Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process")
PushDevEnvironment
BuildAndInstallOpen62541 $targetCommand x86 "mingw32-make"
} elseif ($targetCommand -eq "msvc2015_x86") {
Write-Host "### Creating Open62541 for MSVC2015 x86"
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat x86"
PushDevEnvironment
BuildAndInstallOpen62541 msvc2015 x86 jom
} elseif ($targetCommand -eq "msvc2015_x64") {
Write-Host "### Creating Open62541 for MSVC2015 x64"
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat amd64"
PushDevEnvironment
BuildAndInstallOpen62541 msvc2015 x64 jom
} elseif ($targetCommand -eq "msvc2017_x86") {
Write-Host "### Creating Open62541 for MSVC2017 x86"
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars32.bat
PushDevEnvironment
BuildAndInstallOpen62541 msvc2017 x86 jom
} elseif ($targetCommand -eq "msvc2017_x64") {
Write-Host "### Creating Open62541 for MSVC2017 x64"
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars64.bat
PushDevEnvironment
BuildAndInstallOpen62541 msvc2017 x64 jom
} elseif ($targetCommand -eq "prepare") {
PrepareRepository
} elseif ($targetCommand -eq "build") {
Write-Host "### Building for all supported platforms"
PrepareRepository
Write-Host "### Invoking MinGW530 build"
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw530
Write-Host "### Invoking MinGW630 build"
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw630
Write-Host "### Invoking MinGW730 build"
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw730
Write-Host "### Invoking MSVC2015 build"
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x86
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x64
Write-Host "### Invoking MSVC2017 build"
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x86
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x64
Write-Host "### Archives have been generated at C:/Utils. Please upload manually"
} elseif ($targetCommand -eq "packaged") {
Write-Host "### Expecting pre-built packages, download and install from archives"
Write-Host "### MinGW530 x64"
DownloadAndInstall mingw530 x86
Write-Host "### MinGW630 x64"
DownloadAndInstall mingw630 x86
Write-Host "### MinGW730 x64"
DownloadAndInstall mingw730 x64
Write-Host "### MSVC2015 x86"
DownloadAndInstall msvc2015 x86
Write-Host "### MSVC2015 x64"
DownloadAndInstall msvc2015 x64
Write-Host "### MSVC2017 x64"
DownloadAndInstall msvc2017 x64
} elseif ($targetCommand) {
Write-Host "### Unknown parameter specified:" $targetCommand " Options are: mingw, msvc2015_x(86/64), msvc2017_x(86/64)"
throw("Unknown parameter")
} else {
# Default behavior
PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand build
}

View File

@@ -38,18 +38,18 @@
# NOTE! Make sure 64bit versions are always installed before 32bit,
# because they use same folder name before a rename
$version = "6.3.2"
$version = "6.4.3"
# Qt branch without dot (*.*)
$qtBranch = "510x"
# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point
$qtBranch = "512x"
# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point
# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.
$targetDir = "C:\Utils\squish"
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
$squishBranchUrl = "$squishUrl\$qtBranch"
$testSuite = "suite_test_squish"
$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z"
$testSuiteUrl = "$squishUrl\$testSuite.7z"
# Squish license
$licensePackage = ".squish-3-license"
@@ -62,7 +62,10 @@ Function DownloadAndInstallSquish {
[string]$bit,
[string]$squishPackage
)
# MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13
if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) {
$qtBranch = "511x"
}
$SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
$SquishInstaller = "$targetDir\$squishPackage.exe"
$SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"
@@ -125,25 +128,27 @@ DownloadSquishLicence $squishUrl
if ($OSVersion -eq "Windows 10 Enterprise") {
if (Is64BitWinHost) {
DownloadAndInstallSquish $version win64 msvc14
DownloadAndInstallSquish $version win64 "msvc14"
DownloadAndInstallSquish $version win64 "msvc141"
DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh"
} else {
DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
}
DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
DownloadAndInstallSquish $version win32 "msvc14"
DownloadAndInstallSquish $version win32 "msvc141"
} elseif ($OSVersion -eq "Windows 8.1 Enterprise") {
if (Is64BitWinHost) {
DownloadAndInstallSquish $version win64 "msvc12"
DownloadAndInstallSquish $version win64 "msvc14"
}
DownloadAndInstallSquish $version win32 "msvc14"
DownloadAndInstallSquish $version win32 "msvc141"
} elseif ($OSVersion -eq "Windows 7 Enterprise") {
if (Is64BitWinHost) {
DownloadAndInstallSquish $version win64 "msvc12"
DownloadAndInstallSquish $version win64 "msvc14"
} else {
DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
}
DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
DownloadAndInstallSquish $version win32 "msvc14"
DownloadAndInstallSquish $version win32 "msvc141"
}

View File

@@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package
Verify-Checksum $package $sha1
Write-Host "Installing $package..."
Run-Executable $package "/q"
Write-Host "Remove $package..."
Remove-Item -Force -Path $package
Remove $package

View File

@@ -109,6 +109,9 @@ installPackages+=(xcb-util-image-devel)
installPackages+=(xcb-util-keysyms-devel)
installPackages+=(xcb-util-wm-devel)
installPackages+=(xcb-util-renderutil-devel)
# ODBC support
installPackages+=(unixODBC-devel)
installPackages+=(unixODBC)
sudo yum -y install "${installPackages[@]}"

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
# shellcheck source=../common/unix/install-breakpad.sh
source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"

View File

@@ -1,8 +1,8 @@
#!/bin/env bash
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,5 +33,8 @@
##
#############################################################################
# shellcheck source=../common/linux/open62541.sh
source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
set -ex
# shellcheck source=../common/unix/install_protobuff.sh
source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"

View File

@@ -37,7 +37,7 @@
set -ex
curl -L https://packagecloud.io/github/git-lfs/gpgkey | sudo apt-key add -
sudo apt-add-repository 'deb https://packagecloud.io/github/git-lfs/ubuntu/ xenial main'
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 37BBEE3F7AD95B3F
sudo apt update
sudo apt install git-lfs

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
# shellcheck source=../common/unix/install-breakpad.sh
source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"

View File

@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# shellcheck source=../common/linux/remove-update_notifier.sh
source "${BASH_SOURCE%/*}/../common/linux/remove-update_notifier.sh"

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
# shellcheck source=../common/unix/install-breakpad.sh
source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
# shellcheck source=../common/unix/install-breakpad.sh
source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"

View File

@@ -1,8 +1,8 @@
#!/bin/env bash
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,5 +33,8 @@
##
#############################################################################
# shellcheck source=../common/linux/open62541.sh
source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
set -ex
# shellcheck source=../common/unix/install_protobuff.sh
source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"

View File

@@ -114,14 +114,14 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
{ iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null
iPhoneDeveloper="iosdevelopment.p12"
shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c"
iPhoneDeveloper="iosdevelopment_2019.p12"
shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.."
{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
iPhoneDistribution="iosdistribution.p12"
shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
iPhoneDistribution="iosdistribution_2019.p12"
shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.."
{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null

View File

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

View File

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

View File

@@ -1,8 +1,7 @@
#!/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2017 Pelagicore AG
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,4 +32,13 @@
##
#############################################################################
source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
. "$PSScriptRoot\..\common\windows\helpers.ps1"
# Signing tools are needed to sign offline installers when releasing
$url = "http://ci-files01-hki.intra.qt.io/input/semisecure/sign/sign.zip"
$destination = "C:\Windows\temp\sign.zip"
Download $url $url $destination
Extract-7Zip "$destination" "C:\Utils"
Remove-Item -Path "$destination"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,2 +0,0 @@
. "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand prepare
. "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand mingw730

View File

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

View File

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

View File

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

View File

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

2
qt3d

Submodule qt3d updated: a0496abe38...29c20fda75

2
qtbase

Submodule qtbase updated: 0c49815333...534df5a33b

2
qtdoc

Submodule qtdoc updated: f7f5859f46...38a19857d7

2
qtqa

Submodule qtqa updated: 7bedbd3bbf...8c9be4c82e

Submodule qtscxml updated: e64b9a5d33...daad96b2b9

2
qtsvg

Submodule qtsvg updated: 71ddbcf502...fd12ae24b4

Submodule qttools updated: 61383ceca6...fe5b4f8e7a