Compare commits

...

482 Commits

Author SHA1 Message Date
Simo Fält
6a06c4b4fe Revert "Install Python 2.7.13 to RHEL with pip"
This reverts commit 794913dde7,
which seems to break pyside builds. Instead we install python-pip
package from the EPEL repository.

Change-Id: Ic84680b0b0d6950d389bb42a6add18c83256f00f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-16 03:32:20 +00:00
Qt Submodule Update Bot
6c8307abf6 Update submodules on '5.11' in qt5
Change-Id: I18750ffb5810a3f60a2b615ca487ce42459d560d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-15 16:41:22 +00:00
Heikki Halmet
83f2a25f17 Provisioning: Add test for squish installation
Squish is needed by RTA which is not run during normal qt5 build. Other
words squish installation is not tested during integration. That's why
we need separate test for it.
This change will fetch test and run test suite which is made to check
that squish installation works

Task-number: QTQAINFRA-1733
Change-Id: I9284fd52d87767ae04022c3a6996e0bb972315dd
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-04-15 16:41:18 +00:00
Joni Jantti
e8a60ed41b Provisioning: Ubuntu - Add QNX 6.6.0
QNX 6.6.0 is required by RTA.

Task-number: QTQAINFRA-1914
Change-Id: Id0578050d24fb13f3e10a10e972be790d39f9bc0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:13 +00:00
Joni Jantti
c404097600 Provisioning: Win10_x86 - mysql
Required by RTA.

Task-number: QTQAINFRA-1923
Change-Id: I13d78da0bd3ea2fa8a75734fb5f88a472cbd79de
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:08 +00:00
Joni Jantti
3d6736a7f1 Provisioning: Win10_x86 - openssl
Required by RTA.

Task-number: QTQAINFRA-1923
Change-Id: I4937980a1f23d56e509b71541605c80cb6423402
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:04 +00:00
Joni Jantti
c1e2307d02 Provisioning: Win10_x86 - psql
Required by RTA.

Task-number: QTQAINFRA-1923
Change-Id: Ia13d9586d1c1934c8c4e51fcbe9ce826bba68524
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:00 +00:00
Joni Jantti
081861de18 Provisioning: Win10_x86 - Windows 10 SDK with debugging tools
RTA needs debugging tools for Windows 10 x86 testing.

Change-Id: I69cae92a2529a933a018f22c1b200bdc4d2c0aa0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:40:57 +00:00
Tony Sarajärvi
8375a33d4a Fix squish provisioning script typo
Change-Id: If33847a552fe40128cef577b99adf3152de3a9e2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-15 16:40:53 +00:00
Tony Sarajärvi
cd347c86af Fix shellcheck complaints in RHEL 6.6 provisioning scripts
Change-Id: Idb4240b4cfd309b2c6c418e8c18b175a491f8eea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-15 16:40:49 +00:00
Liang Qi
6df84f8984 Update submodules on '5.11' in qt5
Change-Id: I5b4c4043f2bfb2bf3e62bc06e244a4fec3e5bbd6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-15 05:55:49 +00:00
Heikki Halmet
cfc44559ef Provisioning: Install Git Large File Storage
This tool is needed to clone some repositories correctly

Task-number: QTQAINFRA-1921
Change-Id: If4744304490649aeecf9daa0c1f840ded9b7beed
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-04-15 05:55:45 +00:00
Heikki Halmet
f9e9dd1393 Provisioning: Use wayland libs provided by distro
Redhat repositories includes needed wayland
libraries. Let's use those instead providing
those through provisioning.


Task-number: QTQAINFRA-1925
Change-Id: I543a6b9fb8876f64d4b9c17ef909b9c61129e62e
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-15 05:55:42 +00:00
Heikki Halmet
ba30e967d0 Provisioning: Set ssh key and configurations for Yocto build
Task-number: QTQAINFRA-1888
Change-Id: I2dd01080998866ce2affd6a5aea797540f28db19
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 05:55:39 +00:00
Heikki Halmet
2e6af2bba7 Provisioning: Upgrade pip to latest version
Latest pip version is not installed during python
installation. Pip need to be reinstalled after python
installation because older version of pip seems to cause
installation problems randomly at least with python 2.7

Task-number: QTQAINFRA-1902
Change-Id: If3d74130ecee6e410c64cad309feff9edc0e5db0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-15 05:55:35 +00:00
Heikki Halmet
c79d285ffa Provisioning: Remove sha1 file after shasum check
Change-Id: Iee8e66d98e5ebd2dee18baf8e1752a86065417d1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 05:55:32 +00:00
Qt Submodule Update Bot
2074cadecd Update submodules on '5.11' in qt5
Change-Id: Ibfd10c0da7c86f52a860cd39776519c9d4ab4b61
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-11 05:44:38 +00:00
Qt Submodule Update Bot
1616d89eea Update submodules on '5.11' in qt5
Change-Id: I71ed7dbae2d7071e9c16a6e24979174b1b75d640
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-10 08:31:14 +00:00
Qt Submodule Update Bot
7f6fd7621b Update submodules on '5.11' in qt5
Change-Id: Ie59c702af192cf03bb5c865345625f61feb83887
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-07 08:26:59 +00:00
Oliver Wolff
0029642f18 Fix msvc_2015_update3_patch
Change-Id: Ie008b274c2f27d9792340dd4f6c2d3215bd376ca
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2018-04-06 19:41:22 +00:00
Tony Sarajärvi
daeaec9b3c Remove updating of RHEL 7.4 system during each provisioning
Yum update doesn't only fetch the repository data. It also runs
a distro upgrade. So if something gets updated that isn't
compatible with us, it breaks. It also slows down the provisioning
a lot.

Change-Id: I27136bc572fbce5410b82ff9574cf85bf89e3100
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-06 19:41:19 +00:00
Qt Submodule Update Bot
9fdc8fe5e9 Update submodules on '5.11' in qt5
Change-Id: Ic767892fd0ed815d1cec35eced62e83b1ac4e029
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-06 19:41:16 +00:00
Joni Jantti
9af755a79e Add VC build tools to Windows 10 x86 template
These tools were missing from the installation.

Change-Id: I627b28a6f9373df708952e22a7f404b8dbce6239
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-06 11:02:51 +00:00
Liang Qi
d4edeff8aa Update submodules on '5.11' in qt5
Change-Id: Ic5b5615653f2fed507c75ca96a05de0affb65863
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-05 18:42:39 +00:00
Eskil Abrahamsen Blomfeldt
3c23dc4846 Don't require Qt Android Extras for Qt Purchasing
Qt Purchasing is supported on other platforms than Android, so
move qtandroidextras from depends to recommends instead.

Task-number: QTBUG-67318
Change-Id: I9c70574dd9b45579485b2640f7daeebdc6c2bc63
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-05 14:44:48 +00:00
Joni Jantti
9e74a1e5b7 Add a clean installed Win10_x86 for RTA
Task-number: QTQAINFRA-1842
Change-Id: I0334d74055690c7f850fd105fe008d11a8e57b8c
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-04-05 13:10:26 +00:00
Qt Submodule Update Bot
bb9547048b Update submodules on '5.11' in qt5
Change-Id: I2c8dfa7b7b27e6aa80381761d8b7883690133496
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-04 07:22:50 +00:00
Qt Submodule Update Bot
7c19a3f83b Update submodules on '5.11' in qt5
Change-Id: I7e60d0eae7d23fbc2eebf1734c3fd9a713b6b732
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-02 00:00:58 +00:00
Qt Submodule Update Bot
9f50ae280f Update submodules on '5.11' in qt5
Change-Id: I7f31b0b19c8380a7f5420917ad7dc423e3ca3658
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-01 10:23:51 +00:00
Qt Submodule Update Bot
fe06923553 Update submodules on '5.11' in qt5
Change-Id: I89c95acfd2ee14574c0ca524d80837023dbc112f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-31 10:49:31 +00:00
Joni Jantti
dbe27bc9cc Provisioning: Win8.1 - Add jom for RTA
Jom is required by RTA.

Task-number: QTQAINFRA-1895
Change-Id: Iec99a91d2a48c4c6ef49829e4f05baa90d1a96e0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-30 17:57:20 +00:00
Qt Submodule Update Bot
c8b3ed182d Update submodules on '5.11' in qt5
Change-Id: I2f7afb1e261e59e527a482983f699402f0d29d85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-30 11:11:25 +00:00
Qt Submodule Update Bot
8f73d37425 Update submodules on '5.11' in qt5
Change-Id: I77701db7d1955d7309d464ca1597888d98883a30
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-03-28 17:28:28 +00:00
Miikka Heikkinen
9dd5f6d861 Add SeparateDebugInfo for linux release
Task-number: QTQAINFRA-1688
Change-Id: I3557ac1e2bb6964278f381736f87e6fd3304744b
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-03-28 14:24:53 +00:00
Frederik Gladhorn
a01e7f3d40 Install an android virtual device for testing
The goal is to run tests on the AVD eventually.

Change-Id: I7ac887661497b5169c154ef8b0264ef07749a36a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2018-03-26 09:18:48 +00:00
Frederik Gladhorn
8552003532 Reduce wget verbosity when downloading qnx
The default style gives 1 KiB dots, 50 KiB per line, and the file is
567 MiB (~11600 lines). Reduce it to 1 MiB per dot and 32 MiB per line
(~18 lines).

Change-Id: Id181eee63313a4ad486af6c4752de0ed9ed5f7b6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-03-26 09:18:45 +00:00
Heikki Halmet
8197e80155 Provisioning: Remove Java update from windows startup items
Change-Id: Iec709c9c42840910ab0dd98634c200d2aba8f7bf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:45 +00:00
Tony Sarajärvi
794913dde7 Install Python 2.7.13 to RHEL with pip
System's default Python is 2.7.5 and doesn't come
with pip at all. To install its pip, it would require us to
enable the EPEL repository and install it from there.

The repos we use already include Python 2.7.13. If we install that
we get pip as well.

Change-Id: I083a970697a962ddb301616695c2cf419f1229f8
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-22 06:05:42 +00:00
Joni Jantti
5085220907 Provisioning: Win7_x64 - Add Squish 6.3.0 win64 msvc12
This package is required by RTA.

Task-number: QTQAINFRA-1878
Change-Id: I0496445880f838de34ffd53f72fa05e0f0b0be58
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:39 +00:00
Tony Sarajärvi
de4e9c2169 Provisioning: refactor squish install
Change-Id: I18e5f8f5d92cff5af2335cc5ac4cf571d27224ac
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-22 06:05:36 +00:00
Tony Sarajärvi
f1eca9bbff Remove duplicate python-devel provisioning from RHEL 7.x
Change-Id: I445135d675fa6b5cb305f6aadf5b754ab248a1ff
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-22 06:05:33 +00:00
Tony Sarajärvi
ab021d4bb4 Make unzip less verbose in macOS
Change-Id: I83249f724ecbfeeb4fd5c1cd33a9c6195c590c4b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-03-22 06:05:30 +00:00
Frederik Gladhorn
9ae91ae3f8 Update Python 3.4 to 3.6 in RHEL 7.x
Also install Python 3 through system packages instead
of some weird scripts.

Change-Id: Ie22e126a422bd6efe9b3030d5044f4c196894ca8
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-22 06:05:26 +00:00
Joni Jantti
418cb4c4f5 Provisioning: Win8.1_x64 - Add Python2 and Python3 for RTA
Python is required by RTA.

Task-number: QTQAINFRA-1870
Change-Id: If63218da138995580a3bed5ede8996d722fff48d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:23 +00:00
Matti Paaso
b59f4207a3 Add Windows 8.1 target for RTA
Change-Id: Ifd055590bada66f7437af0b4de4a8549440952ae
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:20 +00:00
Qt Submodule Update Bot
488dc5c36e Update submodules on '5.11' in qt5
Change-Id: Id1050cad70aad6d24368220769709b817dc70f8b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-21 05:07:39 +00:00
Qt Submodule Update Bot
3cb40d34d3 Update submodules on '5.11' in qt5
Change-Id: I12849c9612793703b598411c6a6b3c433f27b4fc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-20 12:38:16 +00:00
Tony Sarajärvi
f6d18ec9b3 Disable background update checks in RHEL 7.x
Change-Id: If17fd47850be8b3a59ded7e0a543c9160f92b84c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-20 12:38:13 +00:00
Heikki Halmet
a6feaec287 Provisioning: Fix java installation for mac
Change-Id: I3b6672e671720416af71631c2f9ce814f07e596a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-19 11:57:09 +00:00
Tony Sarajärvi
1b5f8cec03 Remove try_catch.sh helper script
Change-Id: I3981920bb8085ffbad89c31e0fd628a6e11146b6
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:57:06 +00:00
Tony Sarajärvi
2f9a2f65e5 Remove try_catch codes from macOS 10.12 provisioning
Change-Id: I57fbfdef3e8105e9e66c576ef545fc6c22400ac7
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:57:03 +00:00
Tony Sarajärvi
a98b0f3d79 Remove try_catch codes from common macOS scripts
Change-Id: I66291e2da5514499387b61e01ad85a652cd24d7b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-19 11:57:00 +00:00
Tony Sarajärvi
90261c1df5 Remove try_catch codes from unix scripts
Change-Id: Iabadbf28c65132ae614048cb98e92f57e3786056
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:58 +00:00
Tony Sarajärvi
250dd8c84e Remove try_catch codes from macOS 10.11 scripts
Change-Id: I7690ae186729b3a180b1d38c298a861d981dbf5d
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:55 +00:00
Tony Sarajärvi
1c6abfae01 Remove try_catch from common linux scripts
Change-Id: I9c7b472fa4c448f40c9adc6cc8a0d84cb9c5e74c
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:53 +00:00
Tony Sarajärvi
4492fd3268 Remove try_catch codes from Ubuntu 16.04 scripts
Change-Id: I4a377b8bc2a16d9b9c4123a9a4f623f1a6a7ae18
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:50 +00:00
Joni Jantti
5d7972b73b Provisioning: Windows - Disable autoreboot
Windows machines currently reboot automatically in case of a blue
screen crash. This must be disabled to prevent problems with Coin.

Task-number: QTQAINFRA-1748
Change-Id: I64ac1cfa124694fab356b8443298c1b37bed9a92
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-18 16:22:17 +00:00
Tony Sarajärvi
85f874388c Revert "Provisioning: openSUSE - Set grub timeout to 0"
This reverts commit 2e329bc68e.
grub-update command isn't found, and after enforcing script
results, we have a P0 blocker here.

Change-Id: Iaf4b17a91cdc865974a5f4f196bbb80b085a39c2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 677524620d)
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-18 16:22:15 +00:00
Tony Sarajärvi
863252be49 Download get-pip primarily from our local cache
We should first download from our local cache,
and if that doesn't work, fetch it online.

This commit doesn't fix it per se, but as we download
it from our local cache, the version is the one
our shasum checksum matches against.

Task-number: QTQAINFRA-1876
Change-Id: Ia7de54cf090af47ba33111911582f9d48c0ab2a2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-18 16:22:12 +00:00
Tony Sarajärvi
64c79b27d6 Clean old RHEL repo data before fetching new data
Task-number: QTQAINFRA-1872
Change-Id: I49d9d1589adc5b34f1b7c2dccc14be0021f2baaa
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
2018-03-18 16:22:09 +00:00
Tony Sarajärvi
eebc0133f0 Disable update download in background
Task-number: QTQAINFRA-1852
Change-Id: I6d8e433fa40dd080fe84efcf3d0c655d14f86010
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-18 16:22:07 +00:00
Tony Sarajärvi
209cb73a36 Use local RHEL repositories with RHEL 7.4
This will remove the majority of our network traffic from the outbound
connection while provisioning. Also proxy was removed for
yum, as there is no point in proxying local data.

As a side effect, this makes provisioning currently faster by
reducing the time it takes by 35%.


Task-number: QTQAINFRA-1849
Change-Id: Ida4fb86d4bef166fc72e521e395d9753ec47a687
Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-16 05:23:05 +00:00
Qt Submodule Update Bot
400371faba Update submodules on '5.11' in qt5
Change-Id: I9ad2fe2d1bad7d761b25de77d473994870aac960
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-16 05:22:45 +00:00
Heikki Halmet
23b4bcf6c5 Provisioning: Move http_proxy.txt under shared folder
Change-Id: Id5b2f07a92eadfb21fbfdb3fb65621d6322dc8c4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-15 15:07:27 +00:00
Heikki Halmet
237b308d47 Provisioning: Fix adb process name for android sdk installation
There's no process called "adb.exe" - It's called "adb"

Change-Id: I3c23ede12a6d7fc7f3f33bbb806a84e8d9a2aaf4
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-03-15 15:07:24 +00:00
Qt Submodule Update Bot
280b08eb73 Update submodules on '5.11' in qt5
Change-Id: I6a0ad20fa97dabfbec8eaed990e844b26b20b353
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-15 05:10:50 +00:00
Jędrzej Nowacki
8a47814c91 Simplify DownloadURL
The script was over-engineered. The new version provides the same
functionality while removing uninteresting postmortem messages.

In addition try_catch.sh has a bug that injects set +e to a sourcing
script which was propagating through DownloadURL.sh to almost all
provisioning scripts. So it is good to avoid using it.

Change-Id: If191a0dcf52a29c4bec580a254e8e58a00130f6d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-14 05:12:41 +00:00
Qt Submodule Update Bot
8fae7aa66d Update submodules on '5.11' in qt5
Change-Id: I8234b4d7d7c54ed0020e6cd2fcdbaa07d33eb928
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-14 05:12:31 +00:00
Liang Qi
9494b39329 Update submodules on '5.11' in qt5
Change-Id: Ia27a0de06afe5de52eb026a5225e4d2caac0975c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-11 07:56:21 +00:00
Liang Qi
5bbeaf6c0d Update qtwebengine only
Change-Id: I1396d561892a5fead56775906ecd8aa7c48ba187
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-10 13:31:42 +00:00
Tony Sarajärvi
b85b272c26 Move MSVC2017 x86 builds to 64bit host OS
Change-Id: I7544c12086ef8a437bca575dfce7de44ec9938a5
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-10 13:31:40 +00:00
Rainer Keller
04d1ee1df4 Provisioning: Create symbolic for shasum tool on macOS for compatibility
On macOS the sha1 tool is named 'shasum' while on all other unix systems
it is called 'sha1sum'. In order to make all unix provisioning scripts
run on macOS without special case handling a symbolic link is created.

Change-Id: Ib1365cbb0dcb31e68a22959ce939fb450ec7e3f7
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-10 13:31:34 +00:00
Rainer Keller
00e3a0149a Properly download and install RHEL EPEL repo
Use the same approach as in the other scripts.

Change-Id: Ie48103e2c4a528a9d29318c4cabd6ead71dc5c2c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-10 13:31:30 +00:00
Rainer Keller
9cb66c0114 Install RHEL EPEL only once
Installing twice will fail when preventing the +e injection bug
when fixing the try-catch issue.

Change-Id: I26a1b9fa235c44fe933f2f29016a80f57d47ed49
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-10 13:31:27 +00:00
Joni Jantti
940ef0a4cc Provisioning: win8.1 - RTA required provisioning scripts
Currently Windows 8.1 platforms have been removed from CI. RTA
however still uses them for testing so we need to add the programs
that RTA uses.

Task-number: QTQAINFRA-1524
Change-Id: Ide9fa076dc965b16b96f610541ace6088543f795
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-08 19:27:18 +00:00
Heikki Halmet
3410bab278 Provisioning: Fix Squish installation for msvc14 32-bit
Task-number: QTQAINFRA-1809
Change-Id: I8a2947fe52535e39b0817fec2ee0c35bb09e4060
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2018-03-08 19:27:14 +00:00
Joni Jantti
95609c6657 Provisioning: Executequeueditems on Windows
mscorsvw.exe background processing is draining a lot of
CPU processing on Windows platforms. Executing the list
of to be processed items with full CPU capacity should
clear out the list and stop the background processing.

Task-number: QTQAINFRA-1775
Change-Id: Ib12bc10f4572390f20bfea915ca48ec398de46ee
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-08 19:27:11 +00:00
Joni Jantti
3230cdb138 Provisioning: win10_x86 - Disable automatic updates
Task-number: QTQAINFRA-1814
Change-Id: I1fed4d952f77daa1c7bd5fdb34d9568ae1208bac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-08 19:27:09 +00:00
Maurice Kalinowski
7a052f4183 open62541: Fix provisioning for RHEL 7.4
RHEL does not use pkgconfig, nor does it use /usr/local/lib as default
library path. As a consequence, the config tests for qtopcua were not
able to find the open62541 build.
c3591fe77debc0eab79851bd8f0c050cd4f3f608 in qtopcua.git allows to
specify an environment variable to point to the correct location. Move
to /usr/local/lib/open62541/ on all platforms consistently.

Change-Id: I73c8076b70767553edfd793889150c584d5c33b5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-03-08 19:27:06 +00:00
Qt Submodule Update Bot
984b15d758 Update submodules on '5.11' in qt5
Change-Id: Id00474dec78862dbce0238560e859656bd69f69f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-08 05:44:13 +00:00
Jędrzej Nowacki
bb9739773c Simplify openssl_for_android_linux provisioning script
The script was over-engineered. The new version provides the same
functionality while removing uninteresting postmortem messages.

In addition try_catch.sh has a bug that injects set +e So it is good
to avoid using it.

Change-Id: I9e26e8fedad71d40270fe94695d5e1c09c3d9023
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-03-06 06:41:46 +00:00
Qt Submodule Update Bot
764294fcb8 Update submodules on '5.11' in qt5
Change-Id: I3f19c5b7daedfa7d499ab769404d1f34a32c7816
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-05 08:37:59 +00:00
Qt Submodule Update Bot
686e3ff1b5 Update submodules on '5.11' in qt5
Change-Id: Iebf77d7f467d0fde9ee622e4e7b657cb1e9b8003
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-04 09:53:17 +00:00
Qt Submodule Update Bot
b038a8c2bd Update submodules on '5.11' in qt5
Change-Id: I2ba427ea1d9e37421775c297d983654f3e691845
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-03 09:00:50 +00:00
Qt Submodule Update Bot
e926cd7556 Update submodules on '5.11' in qt5
Change-Id: I0b551c2af57243eee865cd4319ee1797dc38f705
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-02 21:34:42 +00:00
Jani Heikkinen
52b163092a Add missing 08-libclang.ps1 for windows7 provisioning
We need to set LLVM_INSTALL_DIR to be able to build qdoc. That was
missing from windows7.

Task-number: QTBUG-65950
Change-Id: I7f75eb0181056a2117080ead6dc5862324906689
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-01 07:17:27 +00:00
Kari Oikarinen
140c6479b5 Install libusbx-devel for QDB on RHEL 7.4
On previous RHEL version the package was libusb1-devel. That package doesn't
seem to be there anymore, which presumably means why the package to install was
changed to libusb-devel. Unfortunately libusb-devel provides a compatibility
package for the old 0.1 API version and doesn't work with QDB. libusbx-devel
seems to be the new name for the 1.0 API version of libusb on RHEL.

Change-Id: I50a10bed0b73b536e5d591363f01d7cf6a3a69d7
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-02-27 13:47:58 +00:00
Qt Submodule Update Bot
399cface18 Update submodules on '5.11' in qt5
Change-Id: I7c090de84c5cf511ec7cea69900546edf6039c39
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-27 07:01:04 +00:00
Oliver Wolff
cb6709ce5c Unify Windows provisioning scripts & improve error handling
While Coin should also see exit codes != 0 as error, we should
stick to one way of handling script errors. As Power Shell cmdlets
signal an error by throwing an exception we should do the same
(and that approach also works in Coin).

Additionally extracting 7zip files was unified across scripts by
using the existing helper function instead of reinventing the wheel
again and again.

A similar helper function was introduced for starting an external
application (and handling its errors).

Also echo and other "cmd" commands were replaced by their PowerShell
equivalents to have a unified approach across our Windows provisioning
scripts.

Change-Id: I70129ce38692f1396c33c13b33a2918485fa5271
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-02-26 19:52:45 +00:00
Johan Klokkhammer Helsing
08c88de5c8 Provisioning: Build and install Wayland 1.12.0 on RHEL 7.4
So QtWayland will be built and included in the installer.

wayland-egl, however, will not be built, as that depends on support in mesa.

Task-number: QTBUG-66341
Change-Id: Id3f1825e00be9d278fce8ac2710a2640baafd332
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-26 19:52:41 +00:00
Johan Klokkhammer Helsing
51a87054d6 Provisioning: Install RPMs for mesa-wayland-egl on RHEL 7.4
The standard mesa.spec file had sections for wayland-egl, which were ifdef'ed
out. The RPMs downloaded by this script have been built with these ifdef's
removed.

Task-number: QTBUG-66341
Change-Id: I43bcc67f5fd112e0837d45da7df20bcb63bfd989
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-26 19:52:38 +00:00
Qt Submodule Update Bot
8c790cd2bc Update submodules on '5.11' in qt5
Change-Id: I46be13c9983d30fb1e2461dbc795664600e0655a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-26 05:16:07 +00:00
Qt Submodule Update Bot
9c1ce66737 Update submodules on '5.11' in qt5
Change-Id: I2f9a24e295282514da028d8ff8d27e0de6326218
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-24 06:17:43 +00:00
Frederik Gladhorn
b20224fe60 Uninstall aptdaemon/aptd before using apt
This removes various kinds of update notifiers that depend on aptd.
Also gets rid of the problem that aptd may hold apt lock files.

Task-number: QTQAINFRA-1755
Change-Id: I27dd6fef4720ef25a504d76a3da16d9bf45fb2f7
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-23 21:00:32 +00:00
Joni Jantti
f6f00fdce1 Provisioning: Win7-x86 - Add msvc14_x86 squish package
Squish is required by RTA testing.

Task-number: QTQAINFRA-1732
Change-Id: I8ab0b11ccc299cc0b10e59f99d1cf27c0cdd48b9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-23 21:00:29 +00:00
Joni Jantti
f6f5cc70e9 Provisioning: openSUSE-42.3 - Disable update notifications
Update notifications need to be disabled to prevent popup messages
from stealing focus during testing.

Task-number: QTQAINFRA-1755
Change-Id: I202ffbee6420d2c9c167a97f02d5245145b618d0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-23 21:00:25 +00:00
Matti Paaso
c3b33afc32 Provisioning: osx-10.11 - Java
This is needed for running RTA jobs in Coin.

Change-Id: Iff855dae54babef00c055a2c8b938871101305e3
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-02-23 21:00:21 +00:00
Joni Jantti
5e31866727 Provisioning: Win10 - Add Squish for mingw53
RTA requires Squish for mingw53 on Windows 10 machines for testing.

Task-number: QTQAINFRA-1729
Change-Id: I42f2c6c62dd004ebc072835340ce24105cfac5e8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-23 21:00:19 +00:00
Joni Jantti
b1a212b52e Provisioning: Make Windows scripts use the Download helper function
Some Windows provisioning scripts use the Invoke-WebRequest without
setting the ProgressPreference = 'SilentlyContinue' variable for
disabling the download progress bar. Disabling the progress bar
greatly increases the download speed during provisioning.

Change-Id: I649c1bcc970577776d720a4ebf5a7af96c1603f8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-23 21:00:15 +00:00
Tony Sarajärvi
54d8396d68 Set proxy on Windows VMs while provisioning
Task-number: QTQAINFRA-1669
Change-Id: Ia6b5b668051642a3729d7c7c83c69d8797045847
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-23 21:00:11 +00:00
Heikki Halmet
3a3c6fb2b3 Provisioning: Fix Windows 10 msvc 2014 squish installation
Change-Id: Id935580730d20a2f86fa6c82bf08ee3705f344f2
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-23 21:00:08 +00:00
Tony Sarajärvi
ae17b63db2 Add shebang to launchable script
Change-Id: I62e33b656eee3a17e1dab4476569d9afa0b62a45
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-02-23 08:20:34 +00:00
Maurice Kalinowski
acbedcc314 Provisioning: Update Open62541
This is required to use new APIs from the library.

Change-Id: Idbadfd04c331af228a9e095e130930b5fb88f7af
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-02-23 08:20:31 +00:00
Liang Qi
3ba940924d Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: Ia450fbc4398a627ebb37646b408a0692cc970094
2018-02-22 09:06:19 +01:00
Qt Submodule Update Bot
8eed3b5be4 Update submodules on '5.11' in qt5
Change-Id: I1447f714aa1035c2cdbe423935cc5a67a700de2d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-22 06:56:53 +00:00
Liang Qi
91739f5fe3 Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
	coin/provisioning/common/linux/open62541.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
	coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh

Done-with: Maurice Kalinowski <maurice.kalinowski@qt.io>
Change-Id: Icd472b8f770a933bafead48093ecf7eb94156128
2018-02-20 22:33:59 +01:00
Oswald Buddenhagen
c64b2415d3 init-repo: complain about non-option arguments
otherwise abuse may go unnoticed (at this stage ...).

Change-Id: Ic8c2a843a941cdeb2d69542830eccf7fadcf252d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-02-20 11:20:20 +00:00
Matti Paaso
884490eaae Add RTA targets
Release Test Automation tests are ran also in additional targets
compared to qt5 targets.

Change-Id: I72ca86f875920ec266e0e6b7ea3fee026eaa1cfe
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-02-20 10:47:12 +00:00
Qt Submodule Update Bot
bcaeff8210 Update submodules on '5.11' in qt5
Change-Id: I069e5672ed40279dbbd8769be17f5cb328b12bc1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-19 07:15:40 +00:00
Qt Submodule Update Bot
060d0bdec1 Update submodules on '5.11' in qt5
Change-Id: I92f9401dc98ab115fe737ec5395025055830140f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-18 21:40:38 +00:00
Qt Submodule Update Bot
e086fbc6cb Update submodules on '5.9' in qt5
Change-Id: Ie7a64cad655dd0e850c8c6145f35b425de6f4c25
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-17 21:25:08 +00:00
Qt Submodule Update Bot
5186a96b47 Update submodules on '5.11' in qt5
Change-Id: I5253636ea9da20b20879f4863dc5b037842b9e7b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-17 10:52:39 +00:00
Liang Qi
ea28c00dd6 Merge remote-tracking branch 'origin/5.10.1' into 5.11
Change-Id: I07cebe617c7860cbeede24b2f45c7c508aed5a92
2018-02-15 20:59:29 +01:00
Qt Submodule Update Bot
443328fa9f Update submodules on '5.11' in qt5
Change-Id: Ie33f91194895634fbf837210e534b78e7559989e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-15 13:51:31 +00:00
Heikki Halmet
404805141a Disable set -e when enabling devtoolset-4 environment variables
Change-Id: If427179da490f14963077cd733082258e354710f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-13 19:32:03 +00:00
Simo Fält
769a34ed26 Provision: Use specific Python2 version in macOS
Make sure we use some specific Python2 version on macOS instead of the
one pre-installed along with system.

Change-Id: Ifee07a8cf003e282ec3cb67535818f9fe39c8679
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-13 19:32:00 +00:00
Qt Submodule Update Bot
066373c9c6 Update submodules on '5.9' in qt5
Change-Id: I360edc60d8e2740d1964b91e18e02dc5daeea39a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-12 18:50:11 +00:00
Qt Submodule Update Bot
c77d4946b2 Update submodules on '5.10' in qt5
Change-Id: Ie45f18cc0c70cca437cadd8bfaa6e8a4ac0c81b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-12 08:16:58 +00:00
Jake Petroules
355252621c Remove macOS 10.10 from CI for Qt 5.11
As agreed, this version will not be supported any longer.

Change-Id: I37d9d9d9e32b5d17dbf0f80a6c42a8e233bcc446
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-02-10 19:15:51 +00:00
Qt Submodule Update Bot
5611fe34b0 Update submodules on '5.10' in qt5
Change-Id: Ica319a5d98406174ce94d2e3c3784364ab44c642
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-10 07:47:25 +00:00
Mitch Curtis
e30de965b9 .gitmodules: update recommended modules for qtvirtualkeyboard
The basic example will start using qtquickcontrols2, so recommend that.
Remove qtquickcontrols, as it wasn't used.

Change-Id: Ieaab1480e6a85ecaa24888fa58024d728d863a16
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-02-09 18:36:54 +00:00
Qt Submodule Update Bot
b2b076782f Update submodules on '5.10' in qt5
Change-Id: I06c4afea4e574aa78f37009db512ba25194f6d5d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-09 12:47:17 +00:00
Qt Submodule Update Bot
f2dbac41cf Update submodules on '5.10.1' in qt5
Change-Id: Icac819f46b0faa05367d73e2435f98975bda2811
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-02-09 10:59:13 +00:00
Qt Submodule Update Bot
456a4d6453 Update submodules on '5.10' in qt5
Change-Id: I935d6ad075384973425d48782a105a9e3e7d21a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-08 09:31:00 +00:00
Joni Jantti
cadedac3b4 Provisioning: osx-10.11 - Disable sleep
Display sleep and system sleep need to be disabled to prevent the
machine from going to sleep during RTA testing.

Task-number: QTQAINFRA-1588
Change-Id: Idc91d77388ed9bc6df5f3c1aceca515f6308c618
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-08 08:04:47 +00:00
Joni Jantti
af55ddc913 Provisioning: MacOS-10.12 - Disable sleep
Display sleep and system sleep need to be disabled to prevent the
machine from going to sleep during RTA testing.

Task-number: QTQAINFRA-1588
Change-Id: I3dc1642d3714762bfb56963392d2bb5137c13256
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-08 08:04:44 +00:00
Qt Submodule Update Bot
9d73a2b304 Update submodules on '5.10.1' in qt5
Change-Id: I88fa5fe223a0e32a3c0261342d490f00561c6497
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-07 16:00:46 +00:00
Liang Qi
6cd75cce72 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I71b7fd09cd8f1c7e64531eec8a645c06a7066325
2018-02-07 13:58:54 +01:00
Alex Blasche
d212f48b67 Remove QtOpcUA from qt5.git
This module is moved to tqtc-qt5.

Change-Id: I57641392be0a968dfd51633fcba15e38de45abcd
2018-02-07 11:32:54 +01:00
Liang Qi
25a0f1fa08 Merge remote-tracking branch 'origin/5.10' into 5.10.1
Change-Id: I275589752f6f623e61841a4552087a1875729615
2018-02-07 09:37:28 +01:00
Tony Sarajärvi
c3096caa14 Remove excess comment line for shellcheck
Change-Id: I3e9b8091c158a978bd95e48b18df326c3a545798
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-07 06:30:47 +00:00
Tony Sarajärvi
b4b62658ac Fix environment variable checking for proxy
Change-Id: Iec261d4ce4e84ba656edf9de52b4dc42d0249e51
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-07 06:30:44 +00:00
Qt Submodule Update Bot
052aa06ef4 Update submodules on '5.9' in qt5
Change-Id: I1254c80a58ec607af3cf3955b3c73e3fb30a516e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-07 06:30:41 +00:00
Joni Jantti
38649924df Provisioning: Ubuntu 16.04 x64 - Set grub timeout to 0
Grub timeout should be set to 0 so we save some time whenever the VMs
are booted.

Task-number: QTQAINFRA-1703
Change-Id: Ia866000703fdc083407d5d8588ba6680ffd80038
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-07 06:30:38 +00:00
Joni Jantti
9fa8b3ca35 Provisioning: openSUSE - Disable file indexing
Baloo file indexing sometimes takes up a great amount of CPU capacity
and should therefore be disabled.

Task-number: QTQAINFRA-1702
Change-Id: I549aef39c1dd2d2fa97196910f577153a42c4f54
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-07 06:30:35 +00:00
Qt Submodule Update Bot
0687514221 Update submodules on '5.11' in qt5
Change-Id: I8e2b737f940e5712c49eadf688983607e4ec349c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-07 05:40:13 +00:00
Johan Klokkhammer Helsing
532f1dea57 Provisioning: Don't test window decorations on Ubuntu 16.04 QEMU
Decorations were previously disabled within the Wayland tests to work around
another issue. That issue has now been fixed, and decorations have been enabled
again, but these tests now became flaky when run within QEMU.

Task-number: QTBUG-66173
Change-Id: I23b722ebc0719a2fd359ba5c3c57c66a887c06de
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-02-07 04:45:09 +00:00
Liang Qi
3279652635 Merge remote-tracking branch 'origin/dev' into 5.11
Change-Id: I3354e454e9b8c686e5d696562096a793e4a0b284
2018-02-06 17:49:39 +01:00
Qt Submodule Update Bot
9a160d28d5 Update submodules on '5.10' in qt5
Change-Id: I818ad09e1071db0369823caf2cd18da601f3bd05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-06 01:02:56 +00:00
Qt Submodule Update Bot
f322d6047a Update submodules on '5.10.1' in qt5
Change-Id: Ide442890f290ee8ed14950c90f9a0f6852eebc62
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-05 09:17:54 +00:00
Liang Qi
0e4931a8af Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I3b299786e8500b0a8f2c197f7501f8e6e1cf29cf
2018-02-04 15:30:50 +01:00
Joni Jantti
2e329bc68e Provisioning: openSUSE - Set grub timeout to 0
Grub timeout should be set to 0 so we save some time whenever the VMs
are booted.

Task-number: QTQAINFRA-1703
Change-Id: I67db00d200dc3e5f94ed205b53bb0ca6e70bdd8d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-03 20:52:57 +00:00
Qt Submodule Update Bot
88811f882e Update submodules on '5.9' in qt5
Change-Id: I14c5e22d5c76b64a573fb32b71580e00c2a3eeba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-03 15:20:59 +00:00
Liang Qi
4cd14f4625 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I3e4ae2508d632919db77af0f365eb25ace1a69e0
2018-02-03 11:08:26 +01:00
Qt Submodule Update Bot
d10baa6d3a Update submodules on '5.10' in qt5
Change-Id: Iefacfb5735b27e25a7e5eba595245f22a9ae07d1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-02 21:53:38 +00:00
Heikki Halmet
4eaa017023 Provisioning: Disable Network Time Protocol
NTP need to be disabled from all tier2 templates

Task-number: QTQAINFRA-1608
Change-Id: I89e019c23b7a194efffa011200a8c870e3a65d66
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-02 07:14:40 +00:00
Tony Sarajärvi
7f7c87a15d Remove excess sourcing of try_catch
Change-Id: I3bfa7e8755dbae904719212c22549f6965142330
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-02-02 07:14:38 +00:00
Joni Jäntti
1583fbd2bb Add Win7_x64 provisioning for RTA purposes
Windows 7 x64 (Windows 7 msvc2013-x86_64) template
is needed since RTA is starting to deploy machines
from coin.

Task-number: QTQAINFRA-1521
Task-number: QTQAINFRA-1615
Change-Id: I7e9665bd37ee010a59ff3792f435d65eb9ad8c17
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2018-02-02 07:14:35 +00:00
Qt Submodule Update Bot
213b848cf5 Update submodules on '5.9' in qt5
Change-Id: I839f931dc0c3202543cfbc0137e7f54184efa037
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-02 07:14:32 +00:00
Maurice Kalinowski
f1422dc64b Provisioning: Switch download sources for mqtt paho broker
Internal resources are preferred and should be used first.

Change-Id: Ifd2a54858c9fb6b82c3dc268566c67238aad262e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-02 06:22:53 +00:00
Maurice Kalinowski
e33f38acef Update MQTT provisioning
Setting an environment variable has been centralized to a separate
script.

Change-Id: I027f9a71d32ee7f7d68575c9433f56a40a369deb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-02 06:22:49 +00:00
Qt Submodule Update Bot
29456af9b9 Update submodules on '5.10.1' in qt5
Change-Id: I00b96bfb3f93027136a770a25c7479b1902bcde4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-02 05:09:53 +00:00
Frederik Gladhorn
eb4fcfaba1 Instead of just warning that apt failed, tell why
With the lsof we should see which process was holding the lock.
After that we can disable this source of problems.

Change-Id: Ie6a014bdb101e6230139569c0e4ea51a57089c30
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-02-01 12:33:16 +00:00
Qt Submodule Update Bot
704b2387de Update submodules on 'dev' in qt5
Change-Id: Ie2e621ae2c2387c7daa0c29c5e04c8928fed169b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:37 +00:00
J-P Nurmi
13be05c06d Swap qtquickcontrols vs. qtquickcontrols2 statuses
The Qt Quick Controls (1) module, which was still listed as an essential
module, has not been actively developed for almost three years. Promote
Qt Quick Controls 2 as an essential module instead, and demote Qt Quick
Controls (1) as an addon.

Change-Id: If51c6c17d199ca10a574053d7dba67539a764aba
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:17 +00:00
Frederik Gladhorn
b032d87632 Revert "Adjust submodule branches"
This got merged accidentally.

This reverts commit 282899453d.

Change-Id: I1457513217e636aa54b43a1dc21b01443c798119
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:10 +00:00
Frederik Gladhorn
282a4f0a35 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I30587abcc4062808e13570ff2a158a0fdc60cad2
2018-01-31 08:35:46 +01:00
Frederik Gladhorn
61cd31a5e3 Provisioning: Fix location of sw_versions.txt
I did not see this in the previous direct push.

Change-Id: I620dcc7f1c562e5bd9e09d479a4a5b8598a970fb
2018-01-31 08:32:41 +01:00
Frederik Gladhorn
250e07e99a Merge remote-tracking branch 'origin/5.11' into dev
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I4eadb7ffafdf5cbc821d1f0a96734b0f83243464
2018-01-29 14:10:44 +01:00
Frederik Gladhorn
a434f14bd9 Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
	coin/provisioning/common/linux/qnx_700.sh
	coin/provisioning/common/windows/libclang.ps1

Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I7fe1337fb8a575083e8b649d1a051abc82e3b408
2018-01-29 14:06:05 +01:00
Frederik Gladhorn
351a519340 Merge remote-tracking branch 'origin/5.10.1' into 5.10
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I218ce5567da7ea383009dca2c04beb974511dfcc
2018-01-29 13:44:48 +01:00
Frederik Gladhorn
485244b016 Merge remote-tracking branch 'origin/5.9' into 5.10.1
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.

Change-Id: Ia5d2e6f7079162f571cd7c7994c0f2b3133b1163
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-01-29 13:34:28 +01:00
Heikki Halmet
00e31823d3 Provisioning: Attach subscription to system
Subscriptions need to be reattached when subscriptions have been
renewed by Red Hat.

Directly pushed to get provisioning into working shape.

Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Change-Id: I6e469d7fac3b848193f280702e1e807ce4ea096b
2018-01-29 13:31:17 +01:00
Allan Sandfeld Jensen
18b5dbf7df Add a MSVC2017 platform to the default tested
Is needed for qtwebkit and qtwebengine testing and added in dev, where
MSVC2013 was removed to not add additional pressure on the CI.

Task-number: QTBUG-65830
Change-Id: I48d3a36a9f69f7345d3cf4dc5a652adb62bb461f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-26 15:49:50 +00:00
Oswald Buddenhagen
3504be0d83 Adjust submodule branches
Change-Id: If777dfa31ad635b8a2a6cb98d65c0be5f6e39a39
2018-01-26 16:00:53 +01:00
Heikki Halmet
462a2aae2b Provisioning: Add Squish provisioning for Release Test Automation
Squish is required by RTA for testing.

Task-number: QTQAINFRA-1523
Change-Id: I0c3653565f19cc9b798a0b63325c47b017cf5537
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-01-26 13:12:51 +00:00
Heikki Halmet
dc5f851e78 Provisioning: Add common shared folder
Common shared folder includes scripts of files which are common for all
operating system families. Changes under shared folder will trigger
provisioning for all platforms

Change-Id: I0789f87b76876d5f92673fe2f0e72d770e5f5ea4
Task-number: QTQAINFRA-1451
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-26 13:12:47 +00:00
Tony Sarajärvi
c4cf4fa07f Add nfs-common for mounting to work
Task-number: QTQAINFRA-1690
Change-Id: I43453da3267664c664e80510e3750d1906d00078
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-26 13:12:44 +00:00
Joni Jantti
6d1190aaa0 Provisioning: Use SetEnvVar helper function in scripts
Currently when adding an environment variable in provisioning we have
to check if the system is Ubuntu and use .profile instead of .bashrc.
This check should be done in a function so we don't have to duplicate
it for every provisioning script separately.

Change-Id: I2fa128032123e17d20dfb39cd3668e22e4bb0d55
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-26 13:12:41 +00:00
Qt Submodule Update Bot
7681e742d7 Update submodules on '5.9' in qt5
Change-Id: Ie34e726ef71d33bb0726a10886edd3153783376a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-26 13:12:39 +00:00
Liang Qi
3c3d56c0cc Update submodules on '5.10' in qt5
Change-Id: I7823fe54729d3b385e11b1a2f7b6f6cfec6ebe55
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-26 07:54:42 +00:00
Qt Submodule Update Bot
c0b7daeb10 Update submodules on 'dev' in qt5
Change-Id: I3b1e1f1b46d3cb067e335ce1bef0da3046afed8e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-24 23:01:47 +00:00
Oswald Buddenhagen
282899453d Adjust submodule branches
Change-Id: Id6fe05f393152581b8509fd613084df1f318bc54
2018-01-24 17:49:00 +01:00
Samuli Piippo
953dc011b2 Enable ARM64 build for QNX7
Change-Id: Ic30f4032c73ec16a9f1b93b3afee1e9812074bb7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-24 10:24:13 +00:00
Qt Submodule Update Bot
352b30a15d Update submodules on '5.10' in qt5
Change-Id: I92a54351148ee369eaacca6064c12b73f18be4da
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-24 08:55:01 +00:00
Qt Submodule Update Bot
e32dd4fe58 Update submodules on '5.10' in qt5
Change-Id: Id21e7a1007ee9ea956431fe84890337074271f7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-23 07:58:13 +00:00
Qt Submodule Update Bot
fc840c3459 Update submodules on 'dev' in qt5
Change-Id: Id6db5f3aa546198917e3e14e53c47126c9f4a012
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-23 05:21:41 +00:00
Frederik Gladhorn
052b4b5844 Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I1031266ae727e7bfeae71bf3faed9b5197c16247
2018-01-22 12:19:10 +01:00
Qt Submodule Update Bot
b6a1e9f07e Update submodules on '5.10' in qt5
Change-Id: I9405e2dc8a6a93cbf5d7f86d8dbfd9a96c8b41b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-21 07:36:34 +00:00
Qt Submodule Update Bot
09ec294210 Update submodules on '5.9' in qt5
Change-Id: Iaadacb41390a5b028d99d4427895af6529b13b59
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-20 14:27:18 +00:00
Qt Submodule Update Bot
5f57762934 Update submodules on '5.10' in qt5
Change-Id: I0a49d2eb0c8a7b7a16aa32ba24924299f6d40270
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-20 14:19:44 +00:00
Tony Sarajärvi
dc1560dbef Add dependencies needed to build Yocto
Task-number: QTQAINFRA-1690
Change-Id: I9583c39709849d058e6d44473e074e9327907dd8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-01-19 11:29:58 +00:00
Liang Qi
45528e6874 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0fdced87d2064e8459fa0b9c4e16a53c1f44ac0a
2018-01-19 09:56:46 +01:00
Qt Submodule Update Bot
4319f7da72 Update submodules on 'dev' in qt5
Change-Id: I6a9db841c7c6c9eba6248072caa8069dacb853da
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-19 05:26:04 +00:00
Joni Jantti
786be66eaf Move exception throw to the correct line
This throw was placed on the echo line instead of the actual command.

Change-Id: I907c2ce17afa64c9c4ef628d766d7dfe270ade59
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-19 05:25:09 +00:00
Qt Submodule Update Bot
31a0826fe8 Update submodules on '5.9' in qt5
Change-Id: I48a99c5161698f833ab0f0798690e5fa963057d5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-19 05:25:02 +00:00
Qt Submodule Update Bot
21e7344389 Update submodules on '5.10' in qt5
Change-Id: I7b7796d1651b5b1384f543b9e64c0c836113689c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-19 05:24:06 +00:00
Liang Qi
57ba8230bd Merge remote-tracking branch 'origin/5.9.4' into 5.9
Change-Id: I1c5c5e6e938f33dd8b0b9c40e64d509eeec25774
2018-01-18 23:41:16 +01:00
Oliver Wolff
99595f44f1 Provisioning: Fix disabling windows updates
On some machines the updates were already disabled, which lead
to the call to disable the service failing. Now we just move on without
error.

Change-Id: Ia48f7164c23dfe24e24548558d582cdc0190b7e3
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-18 21:08:25 +00:00
Frederik Gladhorn
b86b3a757b Fix provisioning: NotePad++ path on 64 bit windows
We install the 64 bit version of np++ which is installed in the regular
program files folder.

Change-Id: I702210eaf7dfae75bbfcfd9cc98d8ed96d775f61
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-01-18 21:08:21 +00:00
Frederik Gladhorn
b1198d3402 Fix provisioning: Wait for msvc-2013 update 5 to finish
Installing Update 5 for Visual Studio 2013 Update 5 (KB2829760)...
Removing C:\Windows\Temp\vs12-kb2829760.exe ...
Caught System.UnauthorizedAccessException
Access to the path 'C:\Windows\Temp\vs12-kb2829760.exe' is denied.

Change-Id: I9fe136f0361ee21e38563dd17bf76bf4fd53747f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-18 21:08:19 +00:00
Tony Sarajärvi
7c66e59832 Add nfs-common for mounting to work
Task-number: QTQAINFRA-1690
Change-Id: I43453da3267664c664e80510e3750d1906d00078
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-01-18 16:33:18 +00:00
Tony Sarajärvi
f2f9b14cee Consolidate provisioning script name for qnx in macOS
Change-Id: Id07686bcc677b62a4981a46cabefd40b544815c5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-18 16:33:13 +00:00
Liang Qi
762530ba70 Update submodules on 'dev' in qt5
Change-Id: I30571e17dc4fafbaf66232546bf33ba4965d36e8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-18 07:21:08 +00:00
Qt Submodule Update Bot
b22fccf5ba Update submodules on '5.10' in qt5
Change-Id: Ibbbd5202c450921ba47c33e28034fce631e82546
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-18 05:14:41 +00:00
Jani Heikkinen
2348ead529 Revert "Add 'ForceDebugInfo' -flag to linux desktop binaries"
Now debug symbols are added in qtlibs as well and library size
is huge. We need additional 'separate_debug_info' flag in
addition to this but currently there isn't support for it in
coin. That's why we need to revert this change until coin has
full support for this.

This reverts commit b0b6b05b34.

Change-Id: I7d36d2778433d2034420c209b73d21b5af32249f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-01-18 05:09:07 +00:00
Qt Submodule Update Bot
8aec4db6a6 Update submodules on '5.9.4' in qt5
Change-Id: I21728a4b47373450defe1a90bd9bcf4680f323af
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-18 05:09:01 +00:00
Oliver Wolff
e33ef922ba Use "correct" registry when enabling Windows 10 Developer Mode
As coin is running a 32 bit application the registry key ended
up in the Wow6432Node compatibility area of the registry when run
on a 64 bit Windows. Windows does not use this place to check
for the developer mode setting, so we use the "proper" registry
instead.

If adding the registry key fails the script now reflects that
and exits with a proper exit code.

Change-Id: Ifd6bc7e7b0ed6595a2a967597ab45053cb51e7aa
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-17 16:47:54 +00:00
Qt Submodule Update Bot
b55370e356 Update submodules on '5.10' in qt5
Change-Id: I986f33a9a04f1172c5fbfe37a45f984837a2a684
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-17 13:14:49 +00:00
Frederik Gladhorn
6a875b9f81 Fix checksum for QNX 7 SDK download
Change-Id: Ia37c6d032d1a4c2841482292a2c2c2f8fd468859
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-17 12:20:52 +00:00
Qt Submodule Update Bot
d1aeb5c569 Update submodules on '5.9' in qt5
Change-Id: I0e7cb3a46909c3b72e2639b9ef2214428bd02cb6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-17 12:15:25 +00:00
Qt Submodule Update Bot
5ee73db243 Update submodules on '5.10' in qt5
Change-Id: I43c91914547bb1b27f29ce948707eaf4b8373825
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-16 08:01:20 +00:00
Qt Submodule Update Bot
113ad91c98 Update submodules on '5.9.4' in qt5
Change-Id: I103ce41b4b7c576e36b43215401e83e43a0e522e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-14 17:28:22 +00:00
Liang Qi
1c7ba877cc Move QNX 7 arm build from qt5 to default
QNX 6.6 builds were removed. We need to check QNX in submodules
build.

This change amends 357de3ea13.

Change-Id: Ia04256bf35e45f111f73661c6f3ca445253900ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-14 08:59:49 +00:00
Qt Submodule Update Bot
1540a87590 Update submodules on '5.9' in qt5
Change-Id: I968ccd381929d89ef988d3ac2f468b25cbeb8365
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-13 15:41:12 +00:00
Heikki Halmet
6e4f2f8433 Fix common folder paths for common split change
Change-Id: I9d3f1ce71d7995c88005b81f7f9dc9db892e9de7
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-13 07:31:51 +00:00
Liang Qi
da80efa880 Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I9a419b82cc05549f6d8e6394bec5c349aa1c9c63
2018-01-12 21:14:23 +01:00
Liang Qi
c2d188f225 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
2018-01-12 21:13:56 +01:00
Liang Qi
4175522924 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Idf9c18da5527327178887c257fc56dbc27e1c8ad
2018-01-12 12:06:07 +01:00
Liang Qi
ab25cb7af6 Update submodules on 'dev' in qt5
Change-Id: Iae26c4fdcf07ff7cd1ff53a98ce0fcbf4af1ffac
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-12 08:22:34 +00:00
Qt Submodule Update Bot
fb1c052f3b Update submodules on '5.9' in qt5
Change-Id: I7cfbf55bc3b57092e5f20a32866bb9cfa9160b9b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-11 20:01:11 +00:00
Frederik Gladhorn
d8e1574d5f Install p7zip-full, that contains the 7z binary
p7zip is only a minimal version containing 7zr.

Change-Id: I12531514490b6eb871419bdb61ea5896b175a678
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-01-11 14:20:50 +00:00
Liang Qi
19872ea843 Merge remote-tracking branch 'origin/5.9' into 5.10
Fixed up provisioning script locations after the reshuffeling into
common/platform folders.

Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
2018-01-11 15:13:13 +01:00
Qt Submodule Update Bot
271fedaf88 Update submodules on '5.10' in qt5
Change-Id: If56253b74477a0bdc034f1daf32920d3363a27f4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-11 06:42:49 +00:00
Qt Submodule Update Bot
3e96fec2e1 Update submodules on '5.9' in qt5
Change-Id: If0b6b7bdb5151aa7488afed379785de63ca3aef2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-11 05:22:31 +00:00
Konstantin Tokarev
ebe2b86fd0 Remove 'Packaging' flag from QtWebKit MSVC2017/x86
Qt doesn't provide binaries for this platform.

Change-Id: Iab30435bb480ee898c2409f87facabb26fce9421
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-10 10:35:59 +00:00
Qt Submodule Update Bot
123ff665c3 Update submodules on '5.9' in qt5
Change-Id: I46157aa3edab44a436fbf9a02e6213f5c2a00f85
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-10 10:35:54 +00:00
Heikki Halmet
2a28ce864b Split Common folder based on operating system families
This change will split common folder to four different folders:
Linux, Unix, Windows and MacOS. Each of these folders includes scripts
which are common for their operating system familes

Task-number: QTQAINFRA-1451
Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-01-10 07:58:26 +00:00
Joni Jantti
52da24b78e Remove devtoolset sourcing from openssl provisioning on Ubuntu
This line is a leftover from RHEL script and needs to be removed on
Ubuntu.

Change-Id: I8fc8ab7cff808da997cb88a3cec4c65eaa1528a4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-10 07:58:22 +00:00
Tony Sarajärvi
1c1557aa93 Provisioning: Set CMake to PATH on Ubuntu
Ubuntu uses .profile file instead of .bashrc. We need to use
the correct file accordingly.

Task-number: QTBUG-65594
(cherry picked from commit 22e4664eb0)
Change-Id: Iceeec53882f1a5c97cd8f7ea5b013d543c156acb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-09 19:20:44 +00:00
Qt Submodule Update Bot
5f022e5785 Update submodules on '5.9.4' in qt5
Change-Id: I9d1b498fc931464636734fc30b7852645383fc9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-09 19:20:30 +00:00
Jani Heikkinen
de5d8f3b4f Adjust QNX packaging builds for Qt 5.11
- Add missing 'Packaging' flag for linux and windows QNX builds
- Remove unnecessary 'Packaging' flag from mac QNX build

Change-Id: Ie4c49b9bd93f67f6a2dbbdece99da8c8f5fb3bef
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-01-09 15:56:32 +00:00
Qt Submodule Update Bot
a8e3c392b2 Update submodules on '5.10' in qt5
Change-Id: I8c259b106a628a317c81a59c042e79c3f145a402
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-09 10:57:05 +00:00
Qt Submodule Update Bot
29f29e6ea8 Update submodules on 'dev' in qt5
Change-Id: I71684e67b6c6861fbcbcb6a652dc2d8b2f799e28
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-09 05:21:08 +00:00
Joni Jantti
dc6c54cb2d Provisioning: Ubuntu 16.04 - QNX700
QNX 7.0 is required by RTA on Ubuntu.

Task-number: QTQAINFRA-1671
Change-Id: I82821e096cfa2d35a2176eba6e753a0d71049b72
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-08 15:54:23 +00:00
Qt Submodule Update Bot
a8178a1888 Update submodules on 'dev' in qt5
Change-Id: Iadd154372d1cbf8b133ae8f858c9192c5afad239
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-08 04:56:41 +00:00
Liang Qi
d196866f31 Revert "Temporarily ignore qtwayland"
QtWayland adapted to new api in qtbase.

This reverts commit eba433c126.

Task-number: QTBUG-65600
Change-Id: If46f054adfb8a2db0d82acbd07cb39b2f512530e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-01-07 15:50:41 +00:00
Liang Qi
01b9b9051b Update qtwayland only
Change-Id: Id64117912e009a93422dce6434bc5d6782b881fd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 15:50:38 +00:00
Tony Sarajärvi
2fe8d370e6 Add +x rights to provisioning scrips missing it and consolidate shebang
Change-Id: I1e1fb37bfffd0451c02166227805b40b48d31582
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-07 15:20:39 +00:00
Tony Sarajärvi
22e4664eb0 Fix opcua provisioning by sourcing .profile
When CMake is installed it exports its install
path into .profile. However, freeopcua doesn't source
it as builds do, so it couldn't find the cmake.
Also, as Ubuntu is using .profile in our builds,
this commit fixes so that the PATH is actually written
into the right file.

Task-number: QTBUG-65594
Change-Id: I561a88a07872436bb4a3bd62a2d55fd56a130121
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-07 15:20:37 +00:00
Tony Sarajärvi
84899eca4c Consolidate prefixes of provisioning scripts
Change-Id: I75a4bcb049a2c4d034a74b6838ffe7ddf2c3015e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-07 15:20:34 +00:00
Qt Submodule Update Bot
7139f29749 Update submodules on '5.10' in qt5
Change-Id: I8d3a6f72435d9bd1cf23146656b5bcef958e993d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 15:20:31 +00:00
Liang Qi
eba433c126 Temporarily ignore qtwayland
qtbase changed API, qssize_t was changed to qsizetype. In order for
qtwayland to update, qt5 needs to update first; but in order for
qt5 to update, qtwayland needs to compile.

Ignoring breaks cycle.

Task-number: QTBUG-65600
Change-Id: I978b0ed8dc86898ab1feb8b9cc47960e42095dfa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 13:30:20 +00:00
Liang Qi
04727e9936 Update submodules on 'dev' in qt5
Change-Id: I8b41e6c3f695547ea8b8449f60b2b87be5ddb718
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 13:30:17 +00:00
Qt Submodule Update Bot
65c714aaab Update submodules on '5.9' in qt5
Change-Id: I4901819f1c7141d151b287e945c1e0afa0ca5b16
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 08:38:48 +00:00
Qt Submodule Update Bot
f71d4a3b97 Update submodules on '5.9' in qt5
Change-Id: I54bae68afc005a9e5d8d29e0766504d83d983e13
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-06 17:09:34 +00:00
Liang Qi
2a39f8e5fe Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250
2018-01-06 09:08:20 +01:00
Qt Submodule Update Bot
3bfa9b0b12 Update submodules on '5.9.4' in qt5
Change-Id: Id238fb2be13cf7782a225e43e1d31ab195f56007
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-05 23:06:52 +00:00
Liang Qi
89d4dec818 Merge remote-tracking branch 'origin/5.9.4' into 5.9
Conflicts:
	.gitmodules

Change-Id: I6a2446b8ed4212e3965b37cb2c25f35ba6ed7efc
2018-01-05 22:58:09 +01:00
Tony Sarajärvi
7a37b90702 Drop builds done with VS2013
Task-number: QTQAINFRA-1390
Change-Id: Id3de3706466508cdbfc586b2a39d96083e8434e5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-05 20:43:53 +00:00
Liang Qi
b9b259fd40 Update submodules on '5.9' in qt5
Change-Id: I95a01ff67b3d16a9a989e3b714f82c94a92d6dc4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-05 20:05:41 +00:00
Joni Jantti
82a6a9347f Provisioning: Ubuntu 16.04 - Set timezone to UTC
Task-number: QTBUG-65435
Change-Id: I329926d0f83d47c9e69eee177c600ac629ee9415
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-05 20:05:38 +00:00
Joni Jantti
a742af96fb Provisioning: Ubuntu16.04 - CMake
CMake is missing from the clean installed Ubuntu 16.04.

Change-Id: I965bc3e55eb9b0765f483a84e5584e61054bdd80
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-05 12:30:25 +00:00
Jani Heikkinen
18f6169bee Merge remote-tracking branch 'origin/5.9' into 5.9.4
This merge wasn't done during final downmerge from '5.9' -> '5.9.4'

Change-Id: I516c24ba52575634f3932ff4f40221f31ef06ee0
2018-01-05 07:47:26 +02:00
Oliver Wolff
f51fd755b5 Windows 10: Enable developer mode
In order to be able to run auto tests for UWP, developer mode has to be
enabled.

Change-Id: I4f20fb8d694d5148b7f976c1ef4bb23ff2fb57ba
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2018-01-05 05:37:08 +00:00
Jake Petroules
d3c2de907d Add Apple tvOS and Apple watchOS configs for all modules
...not just qt5. This will eliminate the semi-frequent integration
failures in qt5 submodules updates.

Change-Id: I99a4eb1cf41005adcfd12e385b663a5d8adbc628
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-05 04:15:19 +00:00
Maurice Kalinowski
a417fd37e0 Update FreeOpcUA version
This should fix the latest failures for FreeOpcUA unit tests.

Change-Id: I0a176d300336b208ebcd8f27b4b6218b7f538f5c
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-03 08:33:23 +00:00
Maurice Kalinowski
5fa40393c5 Apply path changes to running process
SetEnvironment only applies changes to PATH for new processes. Currently
the provisioning runs the scripts in one process, hence changes are not
applied when they are already needed.

Change-Id: I82a360686651a57e5c94330a9b56671fca1493e5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-03 08:33:19 +00:00
Maurice Kalinowski
cb327e54bd Fix open62541 provisioning on Linux
pip is an unknown command in the sudo environment.

Change-Id: Ia59c0b98eac6c3d22b8a452988abe17df6a83909
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-03 08:33:13 +00:00
Tony Sarajärvi
4fb893fcf8 Set up proxy for provisioning scripts
Task-number: QTQAINFRA-1669
Change-Id: I582dc5037bd2b46dcd5c9c3b2cb13784e122d6a5
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-01-02 12:52:35 +00:00
Tony Sarajärvi
b9aae857f9 Fix shebangs and give provisioning scripts +x rights
Change-Id: Ib85721600b1e4461470a9ea4fd3b29fca0b35633
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-01-02 12:52:29 +00:00
Tony Sarajärvi
6eee3f6cff Add set -ex to 7z provisioning in RHEL 7.4
Change-Id: If6323055999830954df6893d72ff2031b34f0276
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-02 11:23:43 +00:00
Tony Sarajärvi
da3d21c0e6 Fix the Tier1 image that qtbase builds qemu builds with
Commit fcc0feaacb forgot to
update the Tier1 image in qtbase.txt. It only updated
default.txt and qtdeclarative.txt. Most likely because
qtbase.txt was added after initial changes were made
and not caught in rebase.

Task-number: QTQAINFRA-1574
Change-Id: If5da006172037c27dec5b3ae0b14330bc6f0149f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-02 11:23:38 +00:00
Qt Submodule Update Bot
c8b8ee9c00 Update submodules on 'dev' in qt5
Change-Id: If27f8d737219311944dccb795e70c1061817b965
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-01 18:12:35 +00:00
Lars Knoll
7a96b8dfd4 Revert "Temporarily remove two platforms from the qt5.git build"
This re-enables all platforms we should be testing on, after
having resolved the deadlock between qtbase and declarative.

This reverts commit 62efcd0c0a.

Change-Id: I2bcc34ad2d00036cc8ed37badbca67d4e68f5eac
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-30 08:08:33 +00:00
Lars Knoll
0bc8941e0c Update submodules on 'dev' in qt5
Change-Id: I7bef606c5610c1235d3893a1330d82ed0137259b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-30 08:08:30 +00:00
Qt Submodule Update Bot
497fc75f1a Update submodules on '5.9' in qt5
Change-Id: Id3233e66cce60596a1523a8685ee593a8dec19f2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-29 13:16:45 +00:00
Joni Jantti
19f8a741f3 Make provisioning script prefix style match across platforms
Currently we are using different styles and amount of digits for the
provisioning script prefixes. This change will unify them across the
platforms. Also removes a couple of duplicate files.

Task-number: QTQAINFRA-1668
Change-Id: I039777e7616bccc29c6a4ac55db13326ae8dc87c
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-29 13:16:40 +00:00
Joni Jantti
d6f7d6ed8b Provisioning: VirtualBox for RTA
RTA needs VirtualBox for running GammaRayPlugin RTA tests.

Task-number: QTQAINFRA-1661
Change-Id: If66d6a63355ed5cc8c8525408c2dfc8c4f3d1bac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-29 13:16:36 +00:00
Joni Jäntti
fcc0feaacb Add clean Ubuntu 16.04 provisioning
Currently Ubuntu 16.04 template has stuff installed on its tier 1. We
want to have a clean installed tier 1 and install everything on it
during provisioning. This will save some disk space on our hosts.

Task-number: QTQAINFRA-1574
Change-Id: Ia7e6df62835a8e31943c00996f12ac70c6c71aed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-29 13:16:32 +00:00
Qt Submodule Update Bot
a7ebfbda72 Update submodules on 'dev' in qt5
Change-Id: Ic5a5a6acb55c5d5bac5ef7146c12c699a2b99948
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-29 11:40:27 +00:00
Lars Knoll
62efcd0c0a Temporarily remove two platforms from the qt5.git build
This is required to get a qt5.git update through, where we're having
a catch22 problem. Current qtbase in qt5.git gives compile errors on
some of the tested platforms, while qtdeclarative has test failures
due to (correct) changes in qtbase. So we can't merge the fix for
declarative without updating qt5.git, and we can't update qt5.git
without having that fix merged.

Change-Id: I87f79f6312a6ee2226aeb7b6868fd280ab087bcc
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-12-29 11:40:12 +00:00
Joni Jantti
d29192ad3f Add set -ex to provisioning scripts for openSUSE-42.3
Change-Id: I71fb0074bc07ce3085401ac23be77ea32e52dcfa
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:40 +00:00
Joni Jantti
ca89bec297 Add set -ex to provisioning scripts for RHEL 6.6
Change-Id: I6e6e66cffcbd84af1e093176d65751063492122b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:33 +00:00
Joni Jantti
66595488f0 Add set -ex to provisioning scripts for Ubuntu-16.04
Change-Id: Icc4b58080875255d8c2efe3e5db2c05e18127606
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:29 +00:00
Joni Jantti
28bf922739 Add set -ex to provisioning scripts for macos-10.12
Change-Id: Ieea4f84909c552728614a4d3c23d4c8ab9134fb2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:25 +00:00
Joni Jantti
cec7c07283 Add set -ex to provisioning scripts for osx-10.10
Change-Id: I732df317aa0016b1d970e0d37167a3fc9276a645
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:21 +00:00
Joni Jantti
b23faee265 Add set -ex to provisioning scripts for osx-10.11
Change-Id: I56ecd39a553b8b777eac0f8822cfd3263e972ef5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:17 +00:00
Tony Sarajärvi
70d3800aab Remove provisioning of ICU for VS2012
Visual Studio 2012 isn't used in our builds.

Change-Id: I7f2480a1811efd1c1f164f468407ab55d5c4102d
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 22:11:13 +00:00
Tony Sarajärvi
fb282b2e58 Provision fbx to RHEL 7.4 for 3DStudio
Change-Id: I2aaad4abc2e3d42bdd1f5204d20ee4fea3c0388f
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 22:11:08 +00:00
Tony Sarajärvi
1399d6e130 Add set -ex to provisioning scripts for RHEL 7.4
Task-number: QTQAINFRA-1659
Change-Id: I9e3c1ec559eab29ccb693956201fc2b63f999882
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 22:11:03 +00:00
Joni Jantti
66f9718ebb Provisioning: Clean and move Win8 mqtt scripts to Win8.1
mqtt scripts need to be moved to Windows 8.1 directory from Windows 8.

Change-Id: Idc1b116f608e8cc8ae0a37713661d35b55b26a3a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 11:29:37 +00:00
Joni Jantti
dc0d045c17 Provisioning: Move open62541 from RHEL 7.2 to RHEL 7.4
5.10 -> dev merge switched from RHEL 7.2 to 7.4 and the open62541
provisioning script was left behind to the RHEL 7.2 provisioning
directory.

Task-number: QTQAINFRA-1666
Change-Id: I5c325dae63cb14a9935ddce5f3f751bd62df0ba2
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-12-27 11:29:35 +00:00
Tony Sarajärvi
357de3ea13 Drop QNX 6.6.0 verification from the CI
Task-number: QTQAINFRA-1378
Change-Id: Icc5fb21b6430c916ceecb8d5a504d40938931b06
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 11:29:31 +00:00
Qt Submodule Update Bot
2d71b84893 Update submodules on '5.9' in qt5
Change-Id: I88561b7971943d494f81fe309d849f5c0d94d2e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-24 00:57:34 +00:00
Liang Qi
1bba397539 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh

Change-Id: I5aaf8fa93f7a9f06e30b9730703e8d1e018cb1f7
2017-12-22 21:37:24 +01:00
Simo Fält
de0d7005cc Fix Android provisioning script
We have to accept extra license to enable installing all required
packages.

Task-number: QTQAINFRA-1660
Change-Id: I9d014991be96ff0723688b317a645e281b3e92d0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 5df4ec2ec9)
2017-12-22 15:22:27 +00:00
Oswald Buddenhagen
a0bf828433 Adjust submodule branches
Change-Id: I3d6535fee48d27c87aab32847f5486a331402df1
2017-12-22 12:57:22 +01:00
Tony Sarajärvi
88a1c161e5 Remove unneeded OS X provisioning scripts
Change-Id: Icf03c93adee31baac383d1394857df8c2df4fe59
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-22 05:21:27 +00:00
Jani Heikkinen
21cbacf4b4 Remove 'Packaging' flag from builds we don't need it
We don't offer binaries for INTEGRITY, MSVC2013 32 bit or MSVC2017 32bit
so we don't need 'packaging' flag there either

Task-number: QTBUG-65324
Change-Id: If9e8fdebab44fcafde9b4da893be6f79f6287aac
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-12-22 05:21:20 +00:00
Qt Submodule Update Bot
dd7f4112fd Update submodules on '5.9' in qt5
Change-Id: Ice93ecfe5e5c093c7bf455c05b87383cf157ed2e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-22 05:21:14 +00:00
Liang Qi
730e2c9b0b Revert "Temporarily disable android build on macOS 10.12"
Bring android build on macOS back.

This reverts commit b6249e89fa.

Task-number: QTQAINFRA-1660
Change-Id: I510894cf6bdc7089fea140e3702e5246a6617787
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-21 16:55:12 +00:00
Simo Fält
5df4ec2ec9 Fix Android provisioning script
We have to accept extra license to enable installing all required
packages.

Task-number: QTQAINFRA-1660
Change-Id: Ifae45ce36b5739cea5124eae04e08472ebe9414a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-21 16:55:09 +00:00
Liang Qi
ba6ae3be9a Revert "Temporarily ignore qtcanvas3d"
QtCanvas3D adapted to new internal api in qtdeclarative.

This reverts commit 146bda6468.

Task-number: QTBUG-64766
Change-Id: I709cb8856b674edc1a7d3217fdf68cbe8aca1608
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 08:17:41 +00:00
Liang Qi
6b7ee9a8f0 Update qtcanvas3d only
Task-number: QTBUG-64766
Change-Id: I2ae55f0f4e38ffb98964f960c323334a9049936f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 08:17:38 +00:00
Liang Qi
b6249e89fa Temporarily disable android build on macOS 10.12
Need to be re-enabled when correct fix landed.

Task-number: QTQAINFRA-1660
Change-Id: Ifefb019016322ebf2e7c4ec9320e58555c6918e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 06:39:05 +00:00
Liang Qi
146bda6468 Temporarily ignore qtcanvas3d
qtdeclarative changed internal API.

Task-number: QTBUG-64766
Change-Id: I7a0bbcaf121bf852fc028be275e82a5658c132a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:39:02 +00:00
Liang Qi
b5e287b93b Update submodules on 'dev' in qt5
Change-Id: Ia91b548e08a7d84f47116b79265618ff9d4d8005
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:38:58 +00:00
Simon Hausmann
d55baf5baf Simplify apt package installation and disable daily package maintenance
Instead of using aptdcon, we can continue to use apt-get to install the
software. We just need to make sure that the automatic update and
package upgrade services are disabled. This is generally desirable as we
do not want these kind of activities to occur in the background while
building or running tests.

This also fixes the broken package installation via regex, which apt-get
supports but aptdcon does not.

Revert "Fix Ubuntu 16.04 random provisioning fail"

This reverts commit 537ea17d14.

 Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh

Change-Id: I920e5132bb0a248d3794e1efcf01ce78d28e6ee3
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-12-20 06:38:30 +00:00
Qt Submodule Update Bot
41edaa5fb9 Update submodules on '5.9' in qt5
Change-Id: I85ef0fa0ae59f600ab53e9b566a08b2f22184f33
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:38:26 +00:00
Qt Submodule Update Bot
a4adb7f7d6 Update submodules on '5.10' in qt5
Change-Id: I84aaff41d77d31eb5c4c9aae973aaccd879ede3e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-20 05:38:34 +00:00
Konstantin Tokarev
b3d3adc541 Add libxml2 and libxslt to RHEL 7 for QtWebKit
Change-Id: I5c50ee482aa20f0d9959915c81d2c44cccce6dca
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-19 22:10:34 +00:00
Qt Submodule Update Bot
2e75f02a3f Update submodules on '5.10' in qt5
Change-Id: I7d7808d588470cbb2712cbda34a0c1bcc5730d11
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-19 12:00:51 +00:00
Konstantin Tokarev
2ee0364139 Add GStreamer libraries to openSUSE for QtWebKit and QtMultimedia
Change-Id: Ia40bb35687bbe1ecb429c042d4acfa22599b69b8
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-12-18 18:18:04 +00:00
Albert Astals Cid
04f8860d8c Install cups-devel in OpenSuse
This way we have one build that compiles the "with cups" branch and others (the ubuntu ones) that compile the "without cups" code branch

Change-Id: I45ab3d72c34367789e0f344c917a88269883cffe
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-18 10:58:10 +00:00
Qt Submodule Update Bot
0ae61f0f4d Update submodules on '5.9' in qt5
Change-Id: Ibdf2e0ca968b4fa5c0a5be8c6bfc1d05aa90d17d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-18 05:26:11 +00:00
Qt Submodule Update Bot
9236cd01a2 Update submodules on '5.10' in qt5
Change-Id: I8514e3e83b62ae4ddc527eb73bcfdcd138ac1875
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-16 07:19:34 +00:00
Tony Sarajärvi
ae6ea5349f Remove Windows 8 provisioning scripts
They are replaced by 8.1 scripts.

Change-Id: Ib04c183b75cec2c6e529945f382c53fdeb23f213
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-12-15 11:03:06 +00:00
Konstantin Tokarev
f5dfdedb2d Add libxml2 and libxslt to openSUSE for QtWebKit
Change-Id: Iafb89bf9c12cf1d38c2fe1944d55965319b85ea3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-15 11:03:03 +00:00
Tony Sarajärvi
547a0ded90 Provisioning: Update default compiler to GCC-7 in openSUSE 42.3
Task-number: QTQAINFRA-1258
Change-Id: Ia2683a23ecc55aae4e82f901f446d1cf46895269
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-12-14 17:59:45 +00:00
Tony Sarajärvi
df7255ce44 Swap ICC builds to use system's SQLite library
Task-number: QTBUG-64650
Change-Id: I2c692ae04f0cc02a5fecb12e3a7b905ee89b1af9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-14 17:59:31 +00:00
Qt Submodule Update Bot
3bcc9a9181 Update submodules on '5.10' in qt5
Change-Id: I6c96508c89b6acab297d4f486b3b8966e28e4eee
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-14 17:59:21 +00:00
Liang Qi
def11da274 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	coin/platform_configs/qt5.txt

Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
2017-12-14 11:49:07 +01:00
Liang Qi
475fc2c2ad Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	.gitmodules

Change-Id: If22ccc401db60d550d6e6b474d54a05b363884af
2017-12-13 23:28:56 +01:00
Heikki Halmet
b16eac13e6 Provisioning: Remove Android script from Red Hat 6.6
Android linux builds are run by Red Hat 7.4

Change-Id: I8661b90494c1d43cc87e50136ed185fac93e4916
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-13 19:41:39 +00:00
Jani Heikkinen
b0b6b05b34 Add 'ForceDebugInfo' -flag to linux desktop binaries
Add 'ForceDebugInfo' for RHEL 7.4 as well

Task-number: QTBUG-3934
Change-Id: I121c109f755c1b65bc0a59fc4edcb0a03f870d54
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-12-13 19:41:28 +00:00
Joni Jantti
1dee4e9fca Fix broken and duplicate Ruby provisioning
Ruby is being installed twice on certain Windows platforms and the 32
bit versions of these don't have a working PATH addition.

Task-number: QTQAINFRA-1632
Change-Id: Id7fd269854d17c32df7d0b82ac9e750e645af564
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-13 19:41:24 +00:00
Qt Submodule Update Bot
0565e759c5 Update submodules on '5.9' in qt5
Change-Id: I0a5c2de981acb71511041c19f5ff966b87932367
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-13 19:41:24 +00:00
Heikki Halmet
d06d1081c0 Provisioning: Install Devtoolset-4 to Rhel 7.4
Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for
the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used
instead of Devtoolset-6.

Task-number: QTBUG-64820
Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
(cherry picked from commit adcdf7b49f)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-13 06:02:54 +00:00
Heikki Halmet
44eaaf374a Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: I2f9ce5a094ffe4d07e8bd138c0dcc150d0d916e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit beb73056c3)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-12 16:51:39 +00:00
Liang Qi
c98db75188 Merge remote-tracking branch 'origin/5.9.3' into 5.9
Change-Id: I01a6ee1ecfaabe56e585194ccfab3b25fbd89e8b
2017-12-11 12:31:12 +01:00
Liang Qi
eccfaf1f50 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ica3e7340f572140020318c6e22397fad393f9b15
2017-12-11 12:11:51 +01:00
Liang Qi
91df8a3a8f Fix syntax error - not use comma in platform_configs
ammends d9f2fe1b7f

Task-number: QTQAINFRA-1636
Change-Id: I92d0af1c62f4c6da92fce1a00d7a2b60055ce8dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-11 10:00:50 +00:00
Qt Submodule Update Bot
e067ea2a72 Update submodules on '5.9' in qt5
Change-Id: Ib3d4ff60bd232362ca0cf1ad455f09c83643387d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-11 05:46:41 +00:00
Allan Sandfeld Jensen
35db81f33e Add NSS to RHEL 7.4
Needed by QtWebEngine

Change-Id: I66a737457cb9dd5f2cc53d64f639037926a560ca
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry-picked from 9a9d798ce4)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-12-10 12:56:35 +00:00
Liang Qi
c2c45640e0 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/qt5.txt
	coin/provisioning/common/install-commandlinetools.sh
	coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh

Change-Id: I3b20cda2b35412fd708295e4f9e32cd2d7d638fb
2017-12-09 23:09:15 +01:00
Joni Jantti
828f82b6f0 Add missing name prefixes for Win7 provision scripts
The prefix numbers were missing for Ruby and QNX patch scripts.

Change-Id: I687b244c4657e17c32f0cc8221d3fb0ad3c5578d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:26 +00:00
Tony Sarajärvi
74dd14ae83 Remove provisioning scripts from non existing platform
Change-Id: I01ecb0a9d4050b88fc5010f5a31baa6e776c1848
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-09 18:48:21 +00:00
Joni Jäntti
77fdde0de9 RHEL7.4: install packages in one yum instance
Currently we are opening and closing a yum instance for every package
we install during provisioning. This is a bit inefficient so it's
better to install them in one go.

Task-number: QTQAINFRA-1586
Change-Id: Idbf814f9023da0fe8213b2ed84cd1a27a149fc27
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:15 +00:00
Joni Jäntti
5089c4468f Fix mesa_llvmpipe provisioning script for x64 Windows
This script doesn't extract the dll to System32 on a x64 system.
Calling "sysnative" doesn't seem to work with the custom function being
used.

Change-Id: Iea734a400d8c095ea2e3fe54f38e4756fba406f9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:11 +00:00
Heikki Halmet
b12a1591c4 Provisioning: Install signing tools to Windows
Signing tools are needed when signing offline installers

Change-Id: I98f12e3fdf01d273dff5fda0c2e34707174c6eae
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:05 +00:00
Qt Submodule Update Bot
a0e1f4f480 Update submodules on '5.10' in qt5
Change-Id: I428bbebe2b5e86e6ed7150080ab3ced2a6077fb8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-09 13:48:21 +00:00
Liang Qi
7d04dc1a29 Move INTEGRITY build from qt5 to default
Many failures in qtbase on INTEGRITY happened recently.

Change-Id: Ic55259e694961a53199d30f095159728207f8824
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-08 20:05:59 +00:00
Liang Qi
d9f2fe1b7f Add b2qt developer build for qtbase
Because we had enabled this for qtdeclarative before.

Change-Id: I1efd438ebf51b2e632d3f8f39bd707e7eb5a282e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-08 20:05:56 +00:00
Tony Sarajärvi
5d9e2c49d1 Update ICC compiler from 2018 to 2018 update 1
Change-Id: I2e44c98114afe559e4490d9b9ec3e1d19d7f4696
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-08 20:05:54 +00:00
Heikki Halmet
b6a1fc6aae Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: Ia13838e3f5845351cb682c7d25127c8f36172d3b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit beb73056c3)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-08 10:53:42 +00:00
Liang Qi
8ab923d0e5 Update submodules on '5.9' in qt5
Change-Id: I5f68733c3c00ae4c2d1d23898552c1d2f91dee14
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-05 07:36:21 +00:00
Liang Qi
1f4d727570 Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I8d8c6b21a68caf28913934141f6b1f98be0ff369
2017-12-04 14:17:33 +01:00
Qt Submodule Update Bot
f8712c099d Update submodules on '5.10' in qt5
Change-Id: Ifd29751e627dbefb3f93c5f3ce4ff2cfec5d59fb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-03 15:43:51 +00:00
Heikki Halmet
adcdf7b49f Provisioning: Install Devtoolset-4 to Rhel 7.4
Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for
the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used
instead of Devtoolset-6.

Task-number: QTBUG-64820
Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-12-01 17:55:19 +00:00
Qt Submodule Update Bot
6e54086be5 Update submodules on '5.10.0' in qt5
Change-Id: I398ac279c6a6065e12c953ae129cfcc98e37388a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-01 07:03:38 +00:00
Qt Submodule Update Bot
60f02cdfae Update submodules on '5.9' in qt5
Change-Id: I133cfe933eb47073931c183fa56c540c06471ad6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-30 21:51:44 +00:00
Qt Submodule Update Bot
2b7b098700 Update submodules on '5.10' in qt5
Change-Id: I88c38e77cad31acd45bb0ffea14fbfee48d5ee4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-30 09:35:36 +00:00
Qt Submodule Update Bot
6d37fda8c1 Update submodules on '5.9' in qt5
Change-Id: I9938183f8c87a6bd34989c37045b5df8803b15d0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-30 05:01:05 +00:00
Heikki Halmet
cdbd177b41 Provisioning: Install bluez-libs-devel
bluez-libs-devel is needed to enable Qt Bluetooth

Task-number: QTBUG-64782
Change-Id: Ie668a44463307c7089bb96a087acab04c27dd3a0
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-30 05:00:51 +00:00
Tony Sarajärvi
92a7d95947 Fix indentation in platform configurations
Change-Id: Id4a7bec02b0ee1156e80667538a29ca2baf4cfed
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-30 05:00:39 +00:00
Heikki Halmet
f1db104ff9 Provisioning: Install bluez-libs-devel
bluez-libs-devel is needed to enable Qt Bluetooth

Task-number: QTBUG-64782
Change-Id: Ie668a44463307c7089bb96a087acab04c27dd3a0
(cherry picked from commit 9b722f9df91c4f7a6ca24d3ad18e68e3a76b137b)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-29 15:25:35 +00:00
Qt Submodule Update Bot
ed0f440974 Update submodules on '5.10.0' in qt5
Change-Id: I97468b13eeba051ff2c59162dfb3855a2c8e838e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-29 15:25:32 +00:00
Edward Welbourne
6675a8f416 Add missing shbang to cmake provisioning script
It was given execute permissions when renamed recently; but the
bash-isms in it will only work with that if it uses bash.

Change-Id: I61468257210ba586fdaf1e79531bae0492f9e8ae
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-29 12:03:31 +00:00
Qt Submodule Update Bot
eb3b287df1 Update submodules on '5.10' in qt5
Change-Id: I49d2ac31b572687781d8b1006f64206f57f3890a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-27 07:15:37 +00:00
Qt Submodule Update Bot
8baf4c994e Update submodules on '5.10.0' in qt5
Change-Id: I305d3f429ad7cc3650c26640b4da6077afc796af
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-26 02:00:31 +00:00
Heikki Halmet
beb73056c3 Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: Ia13838e3f5845351cb682c7d25127c8f36172d3b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-26 02:00:23 +00:00
Liang Qi
bc16944191 Merge remote-tracking branch 'origin/5.9.3' into 5.10.0
Conflicts:
	.gitmodules
	coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh

Change-Id: I3bfaa9531a4b62426ec276c764ffda5cffcbdcaa
2017-11-25 16:40:50 +01:00
Qt Submodule Update Bot
fdfe9e05ba Update submodules on '5.10' in qt5
Change-Id: Ibcd840cc4135dc1860facbe2176555662eabc55a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-25 15:37:24 +00:00
Allan Sandfeld Jensen
9a9d798ce4 Add NSS to RHEL 7.4
Needed by QtWebEngine

Change-Id: Ieed87170eccc288523bc966dab1a25025c37abfa
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-25 13:26:30 +00:00
Qt Submodule Update Bot
f60bc7aa9d Update submodules on '5.10' in qt5
Change-Id: I76ddfac0ffac176a5d63b83bf13c4bacac8babbe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-24 06:46:36 +00:00
Qt Submodule Update Bot
f113a65c6e Update submodules on '5.10' in qt5
Change-Id: Ib454b91cd68ec6c109fe007b6667771a006ee95c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-23 17:28:14 +00:00
Qt Submodule Update Bot
5a4b7a56b8 Update submodules on '5.10.0' in qt5
Change-Id: Ia7b0ea9299a26d9e10a859e8d977d24f9cc22dde
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-23 12:46:44 +00:00
Qt Submodule Update Bot
e6ddce15c3 Update submodules on '5.10' in qt5
Change-Id: I12db3b69a01215489142b271976e33050874bf5b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-22 07:52:43 +00:00
Qt Submodule Update Bot
9468be52db Update submodules on '5.9' in qt5
Change-Id: I60dd3f3e809e3c82bc3216948e8a487c77ebb890
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-21 09:20:21 +00:00
Qt Submodule Update Bot
5d6f3486bc Update submodules on '5.10.0' in qt5
Change-Id: I29389744d77591850f3b50ba5bec3b97bd5865b0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-21 09:19:30 +00:00
Qt Submodule Update Bot
208baeb301 Update submodules on '5.10' in qt5
Change-Id: I6c6623f1d66a65e6d3eadeda6acb2bfee9996b6d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-20 20:10:15 +00:00
Liang Qi
47bf73f4d0 Merge remote-tracking branch 'origin/5.10' into 5.10.0
Change-Id: I42aa9ce33260d7ea1cd51ac5ba1bf525f92d1185
2017-11-20 13:54:12 +01:00
Liang Qi
35db040229 Update qtwebengine only
Change-Id: I3f5934b4787c7206391cbfaa305138df447b1d23
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-19 06:55:22 +00:00
Qt Submodule Update Bot
0ec6aad455 Update submodules on '5.9' in qt5
Change-Id: I1784fb95e461ceba61f8a91a410407f43116631b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-17 10:36:31 +00:00
Liang Qi
062b29b311 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Iac3073d85bd94d27c296b307a827ee6bd97c4194
2017-11-16 23:14:25 +01:00
Liang Qi
26fda37639 Update submodules on '5.10' in qt5
Change-Id: I92ef03c6036b4391aa9c380c1b55b9ac388a3b07
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-16 08:51:10 +00:00
Qt Submodule Update Bot
329d718a19 Update submodules on '5.9' in qt5
Change-Id: I35e62f9e2869d95d2432e369dc69f57262925741
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-13 22:15:03 +00:00
Tony Sarajärvi
f84bab04f7 Remove unneeded provisioning scripts
Change-Id: Ie8ff5810f07528fd23044e1b1396fc4fdde58283
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-13 22:14:52 +00:00
Maurice Kalinowski
4096e387f0 OpcUA: Add Open62541 Support
Open62541 is a new backend added to the Qt OpcUA module. Furthermore,
this is going to be used as new test server to verify changes against.

Change-Id: Id08c91644f33734318925d84fb22b0d011604dd9
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2017-11-13 04:53:30 +00:00
Konstantin Tokarev
c016a01b4c Conan: fix names of ICU dll's which are added to qtwebkit binary package
Change-Id: I5e6357e8dc0e5ae44447bc13cfba8429b89934e7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:56 +00:00
Joni Jäntti
841cf6893a Make QtWebKit builds use vanilla Win 10 x64 template
QtWebKit build targets are currently using the old non-vanilla template
for Windows 10 x64.

Change-Id: I67c536bc86939508cb8056ac3b7372096274fa69
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:52 +00:00
Heikki Halmet
6309243064 Provisioning: Install expect
Expect is needed by Release Test Automation (RTA) to automate
configure testing.

Change-Id: I66889c70667a12f962cbea39906bd8b7a1d63517
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:49 +00:00
Tony Sarajärvi
d56552566f Provisioning: FBX SDK
We need to provision the FBX SDK for Qt3DStudio.

Task-number: QTQAINFRA-1449
Change-Id: I52587cd653b7954340d5f58978ffbd008330337c
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:46 +00:00
Liang Qi
90272a84ae Merge remote-tracking branch 'origin/5.9' into 5.10
Also update to pyro toolchain in QEMU way.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh

Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Task-number: QTBUG-64384
Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
2017-11-09 14:05:56 +01:00
Qt Submodule Update Bot
b0eddcbae6 Update submodules on 'dev' in qt5
Change-Id: Iec4f8b9f7178a8d2bc0f848752db976191e14331
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-08 04:51:40 +00:00
Oswald Buddenhagen
94ce420956 Adjust submodule branches
Change-Id: Ia4636256e7797beffbbdddb21f2f6b4839e1020b
2017-11-07 16:58:57 +01:00
Qt Submodule Update Bot
f1a9b684bf Update submodules on '5.10' in qt5
Change-Id: I88d2003d82ca37105d351d00c255e8f6ab303529
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-07 03:52:53 +00:00
Qt Submodule Update Bot
59ee506fe6 Update submodules on 'dev' in qt5
Change-Id: Icf103970bed93741218f7e3165ede8852672eaef
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-05 09:14:08 +00:00
Liang Qi
0aecf8a1df Update qtwebengine only
Change-Id: Ib0480653a5afc9fbf202a5e0108a4536a1ec9f92
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-05 07:24:19 +00:00
Jesus Fernandez
4a4589d878 Don't recommend QtWebView in QtNetworkAuth module
QtWebView is not used in QtNetworkAuth. There is no need to recommend
the QtWebView module.

Change-Id: I2dbb9d4024ada9436725f4dac643574b558fb9ae
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-11-03 11:08:25 +00:00
Liang Qi
d068364935 Update submodules on '5.10' in qt5
Change-Id: Icf4e56ddd72e135dff539281f1b7d81f45132986
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-03 05:14:29 +00:00
Liang Qi
037335f4bf Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I7f1af5ed2b7653f36ebbcee5eb9255b57c4ca8af
2017-11-02 10:29:13 +01:00
Heikki Halmet
5a7288d9b2 Provisioning: Refresh Subscription-manager
Subscription manager need's to be refreshed so that redhat repositories
will stay available for provisioning scripts

Change-Id: Ie93aef60cbd2bb851673b4e1cd8afb5f23b1395c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-11-02 06:35:20 +00:00
Qt Submodule Update Bot
70f20ec55e Update submodules on 'dev' in qt5
Change-Id: I62a76cb248b1c0d1ffe22e085754a31a0c721a5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-01 23:01:12 +00:00
Joni Jäntti
f90790b3ed MinGW provisioning to 64-bit from 32-bit
We are switching to 64-bit MinGW targets in 5.11 branch.

Task-number: QTQAINFRA-1432
Change-Id: Ic806e0e6400ae98351a922ed7f5a545046273ada
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-28 19:11:21 +00:00
Liang Qi
dc66b1f7e1 Update submodules on 'dev' in qt5
Change-Id: I59501a4a693f7979b129ff6f8e19d62b5da34e16
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-28 19:11:18 +00:00
Liang Qi
59cd433253 Update qtwebengine only
Change-Id: I8ab878c59ab56004a7293f85a4014c274dd93b06
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-28 06:15:21 +00:00
Qt Submodule Update Bot
d18655ef5a Update submodules on '5.10' in qt5
Change-Id: I59f1102e56c9882ad9d5c89b026c33bdcf885a51
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-27 13:07:10 +00:00
Qt Submodule Update Bot
081ee56cd0 Update submodules on 'dev' in qt5
Change-Id: Ic3774c799e0fde95edd02076fe33da9accf19ee0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-24 16:54:49 +00:00
Qt Submodule Update Bot
88a5b96c50 Update submodules on '5.10' in qt5
Change-Id: I50fde887007ad394e276749b1ce354008eeb8aff
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-24 04:59:15 +00:00
Liang Qi
6cbd3faac0 Update submodules on 'dev' in qt5
Change-Id: I6854bd7c7219a6d9cf86ff3566bea966ae2771b1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-21 06:57:56 +00:00
Liang Qi
22a2a8a6b9 Update submodules on '5.10' in qt5
Change-Id: I78d5aa1f7b2ecaecf31c4458b2d489633cf7bc17
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-20 13:50:03 +00:00
Liang Qi
c41dd34de7 Update submodules on '5.10' in qt5
Change-Id: I550202469e06a974a942fbc7f207a09236f84a7d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-19 11:39:19 +00:00
Liang Qi
ef983c6a3b Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev 2017-10-05 17:50:40 +00:00
Jędrzej Nowacki
ee8327928d Provision 32 bit libclang on all Windowses
Up to now we were always matching host architecture for
clang version to install. It is not good enough as in
some cases (all?) we build qdoc, which depends on clang,
as 32 bit app, that can not link to 64 bit clang.

Change-Id: I7b635f38821533da32d721e5e55f0067d4d0f62e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-10-05 17:50:37 +00:00
Liang Qi
1099b1ddce Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt

Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
2017-10-05 12:47:24 +02:00
Liang Qi
cdab32be23 Update submodules on 'dev' in qt5
Change-Id: I309c7e0fffbcd8b18c9bacf1587bd247687d9c95
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-05 07:12:25 +00:00
Qt Submodule Update Bot
9a096e6841 Update submodules on '5.10' in qt5
Change-Id: I2bf9e16177826276d6b6f5f8aa1a6708d62912a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-05 06:54:38 +00:00
Qt Submodule Update Bot
ae9f6019bc Update submodules on '5.10' in qt5
Change-Id: Ifedd5a9d3cce47323ff432d7237b1156f4469bdf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-04 06:36:18 +00:00
Qt Submodule Update Bot
cf0a8af55d Update submodules on '5.10' in qt5
Change-Id: I66c6ad9f0c47757615bf9398ccaa2889d22681fd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-02 08:29:12 +00:00
Qt Submodule Update Bot
35a3ba35ef Update submodules on '5.10' in qt5
Change-Id: Ifae0935db8d9862051b605438a4f713dd7e97a34
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-01 09:02:32 +00:00
Qt Submodule Update Bot
7983297c8b Update submodules on '5.10' in qt5
Change-Id: I511688940a93b3e86c0d4782cf332788e390933b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-30 09:29:14 +00:00
Qt Submodule Update Bot
e9c5f633e0 Update submodules on '5.10' in qt5
Change-Id: Ic6c5ea39d6233ef0cf95f38b7ed8da5079631aef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-29 07:58:57 +00:00
Qt Submodule Update Bot
1643c95635 Update submodules on '5.10' in qt5
Change-Id: If4c77fbc983d5ee85655efa8ec46785b5ce2584c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-28 19:02:58 +00:00
Liang Qi
1cfc052b9d Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

Change-Id: I16388eb0c2ebaa08e7bb1255711d64647fdad3ac
2017-09-27 10:26:38 +02:00
Qt Submodule Update Bot
36d633f2fd Update submodules on '5.10' in qt5
Change-Id: I1df55eab97f42f44bf68c41bf6e2a0e5f36fe3ae
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-27 06:47:03 +00:00
Qt Submodule Update Bot
214a38f974 Update submodules on '5.10' in qt5
Change-Id: I1d4c2064ee31a8adc1a048782824b3d597ea3242
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-26 09:24:30 +00:00
Liang Qi
892b1977c5 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I623539ff0e95642bdd58fa3bbac4d1c88afbe519
2017-09-25 08:57:06 +02:00
Qt Submodule Update Bot
90ddfaf35f Update submodules on '5.10' in qt5
Change-Id: I5ef48890ad2a3c87c1dd89bc4ee35f132bd0d967
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-25 06:09:56 +00:00
Qt Submodule Update Bot
452814565e Update submodules on 'dev' in qt5
Change-Id: If80a73c6fbdd0b790df76802e85f85a05d21dc33
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-25 05:06:37 +00:00
Qt Submodule Update Bot
f07e18248f Update submodules on 'dev' in qt5
Change-Id: I1dbe69b48fd449b4336c994fc0b4d6b1385327e5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-23 18:32:29 +00:00
Qt Submodule Update Bot
ce1627df92 Update submodules on '5.10' in qt5
Change-Id: I60fda85bc418ae5d030608184edc242f82d12227
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-23 07:27:16 +00:00
Maurice Kalinowski
b77ab20bf0 Provisioning: Update MQTT provisioning
MQTT_TEST_BROKER_LOCATION needs to be prepended to .bashrc to avoid not
being evaluated. Furthermore, a previous installation might need to be
removed.

Change-Id: I9edaeb13378aa262b453f816260ade01ba414961
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-23 05:48:44 +00:00
Liang Qi
d82fe5cacf Update submodules on '5.10' in qt5
Change-Id: If7ecb5f1d09e34878a553b287771a8eed395bfd1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-22 08:03:30 +00:00
Qt Submodule Update Bot
bfec1f8e3b Update submodules on 'dev' in qt5
Change-Id: I5aedaf510d296b0ab7707e7ddb89affebc28fdce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-22 04:23:19 +00:00
Qt Submodule Update Bot
804bfd8700 Update submodules on '5.10' in qt5
Change-Id: I6fe7831d598a724eb8796e8a8e97a4946f5d6be4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-21 12:25:08 +00:00
Qt Submodule Update Bot
5d5a6d3a87 Update submodules on '5.10' in qt5
Change-Id: Ic0421ee85440e9f08f805c6f475238bf8820da0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-20 05:45:12 +00:00
Joni Jäntti
0c66e761be provisioning: Windows 10 x64/x86 Vulkan SDK
Added provisioning for LunarG Vulkan SDK on Windows 10 x86/x64.

Task-number: QTQAINFRA-1186
Change-Id: Ie6a4d3a9d8b605e4f1301a3045f8165d349f216f
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2017-09-19 06:39:31 +00:00
Simon Hausmann
99af319684 Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10 2017-09-19 06:39:29 +00:00
Qt Submodule Update Bot
1d965fc599 Update submodules on '5.10' in qt5
Change-Id: Ic5c4e7dde129798e0799d74741c69b32c855351f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-19 04:11:22 +00:00
Simon Hausmann
356b20feed Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

Change-Id: Icf3d05fa71052b411febe58c287b9a5b014a275f
2017-09-18 13:51:35 +02:00
Qt Submodule Update Bot
c4a807ca85 Update submodules on '5.10' in qt5
Change-Id: I08e75951d175003a670987e1f9ea35296bc12d16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-18 11:49:50 +00:00
Qt Submodule Update Bot
f02c2e2fde Update submodules on '5.10' in qt5
Change-Id: Ia67db183b40e1bec41677876f7c8c4c4e69f30d9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-17 00:00:57 +00:00
Simon Hausmann
b7d9431716 Fix python installation on OpenSuSE 42.3
The move was forgotten in commit
dd3d32d13c that merged the 42.1 to 42.3
switch from the 5.9 branch.

Change-Id: If76ac7b54187cfb29dafeaccbd3cd56e3e01deab
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-16 05:17:48 +00:00
Maurice Kalinowski
fd76acc661 Add mqtt to qtci-linux-openSUSE-42.3-x86_64
MQTT provisioning happened concurrently with an OpenSUSE update.

Change-Id: I23a8b632ff82e3900931b58d3d06b9f37bda5998
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-14 15:04:30 +00:00
Liang Qi
5141ac6418 Update submodules on 'dev' in qt5
Change-Id: I0030602560b9e47939557c8bcea9abeb8652b373
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-13 13:01:07 +00:00
Qt Submodule Update Bot
3e9b7b16c9 Update submodules on '5.10' in qt5
Change-Id: I155cd4eccb5b298f93fe36437b9db450d6e23a6d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-13 04:16:14 +00:00
Jani Heikkinen
2ef18dac6c Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10 2017-09-10 11:16:26 +00:00
Maurice Kalinowski
a1f173fc67 Provisioning: Install paho mqtt broker
The paho broker is used for testing the Qt Mqtt module, specifically the
client classes.

Change-Id: I252a337eb0454e871669a467dba2d9a379fb33d5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-09-10 11:16:15 +00:00
Qt Submodule Update Bot
eb89f13583 Update submodules on '5.10' in qt5
Change-Id: Ic0236346284e3b30012977f634f52d8aa3851d24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-10 00:01:18 +00:00
Simon Hausmann
dd3d32d13c Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/common/InstallPKGFromURL.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh

Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec
2017-09-06 10:19:35 +02:00
Tony Sarajärvi
cc8a7501f3 Swap B2Qt branch to Pyro
Task-number: QTQAINFRA-1364
Change-Id: I55906a90e26dccd8d32e686368530f27e46e67fc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
2017-09-05 15:15:59 +00:00
Alex Blasche
92b8f50bfa Introduce qtopcua to top-level Qt builds
Change-Id: Iaf9e137c0ae08cc527e14a394cfaf235dfce13fe
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-05 07:09:06 +00:00
Qt Submodule Update Bot
87df3502a7 Update submodules on '5.10' in qt5
Change-Id: Ic754baf143f879f561c4d28c8eae3c8675ef9412
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-01 19:44:43 +00:00
Tony Sarajärvi
664ce64f24 Provisioning: Add QNX 7.0 SDP in macOS 10.12
Task-number: QTQAINFRA-1190
Change-Id: I2edb16464fa320a8e3beabea32ad673f8d6d0352
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-01 19:24:15 +00:00
Tony Sarajärvi
0dbc2a3aaf Add QNX7 as a build target on macOS 10.12 hosts
Task-number: QTQAINFRA-1189
Change-Id: Ica11a1ca1dc7b306da243f719ff48dce4d03d271
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-09-01 19:24:04 +00:00
J-P Nurmi
eb6ce241f0 qtquickcontrols2: recommend qtimageformats
The new image-based style in Qt Quick Controls 2 uses WebP for
animations.

Change-Id: I42360fc29fbfdc1d85cab5ef37b57569e5af6901
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-08-31 14:29:01 +00:00
Qt Submodule Update Bot
4ad6292028 Update submodules on 'dev' in qt5
Change-Id: Id6afc51f57495e9416bdad103292a4be5503049e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-30 11:23:31 +00:00
Qt Submodule Update Bot
bf09762570 Update submodules on '5.10' in qt5
Change-Id: I10ce89cd030062845d72a49266bb077cabd935ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-08-30 04:21:28 +00:00
Martin Smith
cf92d02d8a Provision Ubuntu 16.04 with libclang
It is needed for QDoc.

Task-number: QTBUG-62532
Change-Id: Icfc7d0af8a90cf827f4d6468e95f5aa002872102
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-29 04:32:57 +00:00
Qt Submodule Update Bot
4bddc8d3f6 Update submodules on 'dev' in qt5
Change-Id: Ic635a1050dd225a105925bfbc006ad933f352c27
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-28 07:28:26 +00:00
Alex Blasche
6a44181e8c Update ldconfig cache once freeopcua has been installed
Change-Id: Id9a2fd6c0f4f426906cf5d553db9559e180b27ea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-08-26 12:00:26 +00:00
Timo Aarnipuro
8007941af0 Enable INTEGRITY coin builds
Task-number: QTBUG-61702
Change-Id: If5f10aafc6d2c0853fbc3039aa7368620e04ea20
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-25 13:55:01 +00:00
Oswald Buddenhagen
738509c242 Adjust submodule branches
Change-Id: I24415b4ce9d74e9eb83420a55e9036d1b0785a73
2017-08-25 14:59:40 +02:00
Liang Qi
e6da4a6aa5 Update submodules on 'dev' in qt5
Change-Id: I7192cbb513f05320c792a29a598b535bcd469d85
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-25 11:55:17 +00:00
Liang Qi
ebf8aa15e6 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
	coin/provisioning/common/system_updates.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
2017-08-24 09:12:33 +02:00
Qt Submodule Update Bot
d18d7aaa40 Update submodules on 'dev' in qt5
Change-Id: Ic68d5b4cc41971eb619f2ba32097612aa20df3b1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-29 05:44:26 +00:00
Simon Hausmann
b229f6d1ea Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I2d5232e2c3a7a8e0d90183b0448ba0ddb5351a29
2017-07-26 15:34:03 +02:00
Maurice Kalinowski
42a802efba Update freeopcua version
And also moved to Ubuntu 16.04 as we're not testing 14 anymore.

Change-Id: I3fd12a1ff290e564f15a557da33ce3c0008b4f81
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-26 07:45:00 +00:00
Liang Qi
65eb6e74f8 Update qtwebengine and qt3d only
Task-number: QTBUG-61693
Task-number: QTBUG-61983
Change-Id: I703ea440ae1b572ae97c4c6616f63b5524718931
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-18 04:16:45 +00:00
Simon Hausmann
d615b4a99f Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
		Remove QNX Windows builds, 0358b6d2
		Remove Integrity build temporarily, QTBUG-61702
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
2017-07-14 07:24:32 +00:00
Liang Qi
bded0e1bbc Update qtqa only
Change-Id: I326c5a081af3bdd5e11aff5316c604a64db94a97
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-07 22:02:45 +00:00
Liang Qi
cdbccd5a12 Update submodules on 'dev' in qt5
Change-Id: I3aca18dc902cd9499c5977e606cd256082144695
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-07 21:33:24 +00:00
Liang Qi
82bdc55bc3 Update submodules on 'dev' in qt5
Change-Id: I0c3b28b0ecfefca4211f4944a059e383173415d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-06 06:17:22 +00:00
Liang Qi
cc549c2444 Update qtqa only
Change-Id: I6ef90bb4ce03188a3bcc6e22bbf1e9204e763690
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-04 11:51:53 +00:00
Liang Qi
744634e97f Update qtwebkit only
Change-Id: I767b48af8cf41355cc984f8d884b1bc042cae4bf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-03 18:04:50 +00:00
Jani Heikkinen
f3a2e06e60 Switch qtspeech & qtnetworkauth from tp to addon
qtspeech and qtnetworkauth aren't technology preview modules anymore
from Qt 5.10 ->

Task-number: QTBUG-61436
Change-Id: I1a88f554498461a81ee80f435fccad7d0e542abf
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-29 21:16:52 +00:00
Liang Qi
69188e280c Update submodules on 'dev' in qt5
Change-Id: I40a221e14a1d308619e1e382b08ae16240b81ead
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-29 21:16:49 +00:00
Jesus Fernandez
e6d42ad390 Add qtwebglplugin
Task-number: QTBUG-61443
Change-Id: I0a139c68c41cfa11d110fab1d7c97276c4d022a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-06-28 15:34:08 +00:00
Liang Qi
b99923d6ee Update qtdeclarative only
Change-Id: Id092226dfa273fff8459b6a256ce5e5e87c364ed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-26 22:27:57 +00:00
Dominik Holland
1859f9b26c Download and install vc_redist 2015 on windows 7 and 8
This is a dependency of the python3 packages for windows

Change-Id: I6f45dcb1d64f43dedd883d33fdc85038c24fc501
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-26 08:12:40 +00:00
Dominik Holland
a765838889 Fix the python3 packages on openSUSE 42.1
Change-Id: Ie445949ac90bf6a9ce7b519bbe3c32d2d1e1a69b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-13 16:39:12 +00:00
Oliver Wolff
0787472145 Add winrtrunner to common tools on Windows 10 machines
winrtrunner is needed for running auto tests on winrt. As the tool
resides in qttools and not qtbase and it not changed often, it was
decided to handle it similar to jom and see it as an external tool.

Change-Id: I9636962df51f98bef6aad3e340c565f50e393949
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 05:43:15 +00:00
Qt Submodule Update Bot
026f813fcb Update submodules on 'dev' in qt5
Change-Id: I23fe8d00027c73dd5ea774589853a4e22c70e402
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-12 05:43:12 +00:00
Qt Submodule Update Bot
9101ac782f Update submodules on 'dev' in qt5
Change-Id: I5f4b2743d35576c0b6df2ee62ec404d337974c3c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-07 05:06:50 +00:00
Qt Submodule Update Bot
38ae7edf69 Update submodules on 'dev' in qt5
Change-Id: Ib7ce19810c0daa4c0cf39198c580dc6baa22c74a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-04 08:52:58 +00:00
Qt Submodule Update Bot
eeb1a20326 Update submodules on 'dev' in qt5
Change-Id: I3a885b5f914584fa259fbd94553e8f03fb160573
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-30 05:51:44 +00:00
Dominik Holland
a5f3f8ed48 Install python3 on all platforms
Task-number: QTAUTO-345
Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-11 10:29:12 +00:00
Jake Petroules
d48b0c3402 Remove Static from the tvOS configuration
This further helps with the shared library coverage on iOS-like
platforms as iOS and tvOS are nearly identical, until such time iOS can
be moved to shared libraries for official releases as well.

Change-Id: I7dbc448890759a4e49a242d4c5bcb00f6c673f4e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-06 09:18:10 +00:00
Jake Petroules
dfb0befca3 Remove Static from the watchOS configuration
This was unintentionally added, and helps with the shared library
coverage on iOS-like platforms until such time iOS and tvOS can be moved
to shared libraries for official releases as well.

Change-Id: Iabae0503a0ce3fe538b97fc1941a1ccf19024429
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-05 06:12:36 +00:00
Qt Submodule Update Bot
596702c398 Update submodules on 'dev' in qt5
Change-Id: Ia5664a1fa14008265e4df4b4937d6f1de96c30c9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-04 05:44:15 +00:00
Qt Submodule Update Bot
76ea20881e Update submodules on 'dev' in qt5
Change-Id: I8b9a5e7630127bc423854ec2d680a51e779b2db3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-03 10:10:56 +00:00
Jake Petroules
ddf574fd81 Make Apple tvOS and Apple watchOS configurations available
Change-Id: I53b71d04c8cdf68f136a6ca057282c656307919e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-25 21:14:41 +00:00
Qt Submodule Update Bot
ec5efb6b70 Update submodules on 'dev' in qt5
Change-Id: I662d698fcf213f2f5e936827dffafe0605309a31
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-25 07:14:38 +00:00
Qt Submodule Update Bot
79bc19fc8e Update submodules on 'dev' in qt5
Change-Id: I0ef28d11ce0ca7d1ba5c67c36748ebf377dc6787
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-21 05:06:10 +00:00
Tony Sarajärvi
e5f0b04f12 Update Xcode 8.3.1 to macOS 10.12
Change-Id: Ie311d7374b74ce1179f7a8bb981733be016d387f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-18 22:08:33 +00:00
Simon Hausmann
8b4e259b22 Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Iddf09c38c811979458639c759056a032187493de
2017-04-17 18:34:04 +00:00
Simon Hausmann
18999572b4 Update qt3d manually to pull in Ubuntu 16.04 fixes
Change-Id: Iddea4ee53f0afd5d1b2a85d190f19e82a87d61ea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-17 11:47:41 +00:00
Liang Qi
415ea08693 Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I88192479624510cb34227f401d9e8b07977f9711
2017-04-09 09:40:45 +02:00
Qt Submodule Update Bot
5e30cba1fd Update submodules on 'dev' in qt5
Change-Id: Ie2ddd1a461354278d4570e0dc98dcf4d339183d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-08 20:07:26 +00:00
Qt Submodule Update Bot
703e71840e Update submodules on 'dev' in qt5
Change-Id: Id5c90ac07c171d06f5d4bc06021cbfedad77a5b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-08 14:06:40 +00:00
Qt Submodule Update Bot
c0a148bb7d Update submodules on 'dev' in qt5
Change-Id: I82c6dff79747702f65c17b094f2decad3f471cc6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-07 13:06:53 +00:00
Qt Submodule Update Bot
25113b3315 Update submodules on 'dev' in qt5
Change-Id: If1a1dc0efcd16aa0887622800394d45d11f120cb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-02 06:13:28 +00:00
Qt Submodule Update Bot
ddc800b37f Update submodules on 'dev' in qt5
Change-Id: Ic47ce220597dda941335d6e0ea5dab224c900af3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-31 06:37:34 +00:00
Liang Qi
37e3da674c Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I370742cb0aa2b362dded7131adb08bc7af44a02b
2017-03-28 10:20:15 +02:00
Liang Qi
1da7bdd25e Update submodules on 'dev' in qt5
Change-Id: I5df7b6ba38a1e641aa8d154d8184a12cbd2f85bd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-23 20:50:56 +00:00
Liang Qi
8889075b0d Update submodules on 'dev' in qt5
Change-Id: I9ef55bdca766e92281b92011b63ba9781f4db53f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-22 15:30:04 +00:00
Liang Qi
e9d91a3949 Update submodules on 'dev' in qt5
Change-Id: Ie422699479ce2da8c94cde3987a4685348aa7a21
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-16 06:20:31 +00:00
Liang Qi
f65308d371 Merge remote-tracking branch 'origin/5.9' into dev
This change also integrated latest dev branch of qtremoteobjects
and qtwebengine.

Conflicts:
	.gitmodules
	qtremoteobjects
        qtwebengine

Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
2017-03-07 19:40:36 +01:00
Liang Qi
82cea36531 Update submodules on 'dev' in qt5
Change-Id: Ia4717e7b16c135827c15e03bb8581d2a2f196547
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-01 19:53:58 +00:00
Liang Qi
92cec830f0 Update submodules on 'dev' in qt5
Change-Id: I789836bf447b14fe223489acea9fcb898d8a35aa
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-01 05:22:15 +00:00
567 changed files with 4590 additions and 2739 deletions

95
.gitmodules vendored
View File

@@ -1,66 +1,66 @@
[submodule "qtbase"] [submodule "qtbase"]
path = qtbase path = qtbase
url = ../qtbase.git url = ../qtbase.git
branch = 5.9.3 branch = 5.11
status = essential status = essential
[submodule "qtsvg"] [submodule "qtsvg"]
depends = qtbase depends = qtbase
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtdeclarative"] [submodule "qtdeclarative"]
depends = qtbase depends = qtbase
recommends = qtsvg qtxmlpatterns recommends = qtsvg qtxmlpatterns
path = qtdeclarative path = qtdeclarative
url = ../qtdeclarative.git url = ../qtdeclarative.git
branch = 5.9.3 branch = 5.11
status = essential status = essential
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
depends = qtbase depends = qtbase
path = qtactiveqt path = qtactiveqt
url = ../qtactiveqt.git url = ../qtactiveqt.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtscript"] [submodule "qtscript"]
depends = qtbase depends = qtbase
recommends = qttools recommends = qttools
path = qtscript path = qtscript
url = ../qtscript.git url = ../qtscript.git
branch = 5.9.3 branch = 5.11
status = deprecated status = deprecated
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtmultimedia path = qtmultimedia
url = ../qtmultimedia.git url = ../qtmultimedia.git
branch = 5.9.3 branch = 5.11
status = essential status = essential
[submodule "qttools"] [submodule "qttools"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtactiveqt recommends = qtdeclarative qtactiveqt
path = qttools path = qttools
url = ../qttools.git url = ../qttools.git
branch = 5.9.3 branch = 5.11
status = essential status = essential
[submodule "qtxmlpatterns"] [submodule "qtxmlpatterns"]
depends = qtbase depends = qtbase
path = qtxmlpatterns path = qtxmlpatterns
url = ../qtxmlpatterns.git url = ../qtxmlpatterns.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qttranslations"] [submodule "qttranslations"]
depends = qttools depends = qttools
path = qttranslations path = qttranslations
url = ../qttranslations.git url = ../qttranslations.git
branch = 5.9.3 branch = 5.11
status = essential status = essential
priority = 30 priority = 30
[submodule "qtdoc"] [submodule "qtdoc"]
depends = qtdeclarative depends = qtdeclarative
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
branch = 5.9.3 branch = 5.11
status = essential status = essential
priority = 40 priority = 40
[submodule "qtrepotools"] [submodule "qtrepotools"]
@@ -81,14 +81,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation path = qtlocation
url = ../qtlocation.git url = ../qtlocation.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtsensors"] [submodule "qtsensors"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtsensors path = qtsensors
url = ../qtsensors.git url = ../qtsensors.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtsystems"] [submodule "qtsystems"]
depends = qtbase depends = qtbase
@@ -121,27 +121,27 @@
recommends = qtdeclarative qtandroidextras recommends = qtdeclarative qtandroidextras
path = qtconnectivity path = qtconnectivity
url = ../qtconnectivity.git url = ../qtconnectivity.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtwayland"] [submodule "qtwayland"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qt3d"] [submodule "qt3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d path = qt3d
url = ../qt3d.git url = ../qt3d.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtimageformats"] [submodule "qtimageformats"]
depends = qtbase depends = qtbase
path = qtimageformats path = qtimageformats
url = ../qtimageformats.git url = ../qtimageformats.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtquick1"] [submodule "qtquick1"]
depends = qtscript depends = qtscript
@@ -154,51 +154,51 @@
depends = qtdeclarative depends = qtdeclarative
path = qtgraphicaleffects path = qtgraphicaleffects
url = ../qtgraphicaleffects.git url = ../qtgraphicaleffects.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtquickcontrols"] [submodule "qtquickcontrols"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtgraphicaleffects recommends = qtgraphicaleffects
path = qtquickcontrols path = qtquickcontrols
url = ../qtquickcontrols.git url = ../qtquickcontrols.git
branch = 5.9.3 branch = 5.11
status = essential status = essential
[submodule "qtserialbus"] [submodule "qtserialbus"]
depends = qtserialport depends = qtserialport
path = qtserialbus path = qtserialbus
url = ../qtserialbus.git url = ../qtserialbus.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtserialport"] [submodule "qtserialport"]
depends = qtbase depends = qtbase
path = qtserialport path = qtserialport
url = ../qtserialport.git url = ../qtserialport.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtx11extras"] [submodule "qtx11extras"]
depends = qtbase depends = qtbase
path = qtx11extras path = qtx11extras
url = ../qtx11extras.git url = ../qtx11extras.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtmacextras"] [submodule "qtmacextras"]
depends = qtbase depends = qtbase
path = qtmacextras path = qtmacextras
url = ../qtmacextras.git url = ../qtmacextras.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtwinextras"] [submodule "qtwinextras"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtwinextras path = qtwinextras
url = ../qtwinextras.git url = ../qtwinextras.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtandroidextras"] [submodule "qtandroidextras"]
depends = qtbase depends = qtbase
path = qtandroidextras path = qtandroidextras
url = ../qtandroidextras.git url = ../qtandroidextras.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtenginio"] [submodule "qtenginio"]
depends = qtdeclarative depends = qtdeclarative
@@ -211,101 +211,108 @@
recommends = qtdeclarative recommends = qtdeclarative
path = qtwebsockets path = qtwebsockets
url = ../qtwebsockets.git url = ../qtwebsockets.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtwebchannel"] [submodule "qtwebchannel"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtwebsockets recommends = qtdeclarative qtwebsockets
path = qtwebchannel path = qtwebchannel
url = ../qtwebchannel.git url = ../qtwebchannel.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtwebengine"] [submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel depends = qtquickcontrols qtwebchannel
recommends = qtlocation qttools recommends = qtlocation qttools
path = qtwebengine path = qtwebengine
url = ../qtwebengine.git url = ../qtwebengine.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
priority = 10 priority = 10
[submodule "qtcanvas3d"] [submodule "qtcanvas3d"]
depends = qtdeclarative depends = qtdeclarative
path = qtcanvas3d path = qtcanvas3d
url = ../qtcanvas3d.git url = ../qtcanvas3d.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtwebview"] [submodule "qtwebview"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtwebengine recommends = qtwebengine
path = qtwebview path = qtwebview
url = ../qtwebview.git url = ../qtwebview.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtquickcontrols2"] [submodule "qtquickcontrols2"]
depends = qtgraphicaleffects depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2 path = qtquickcontrols2
url = ../qtquickcontrols2.git url = ../qtquickcontrols2.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtpurchasing"] [submodule "qtpurchasing"]
depends = qtbase qtandroidextras depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative qtandroidextras
path = qtpurchasing path = qtpurchasing
url = ../qtpurchasing.git url = ../qtpurchasing.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtcharts"] [submodule "qtcharts"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtcharts path = qtcharts
url = ../qtcharts.git url = ../qtcharts.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtdatavis3d"] [submodule "qtdatavis3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtdatavis3d path = qtdatavis3d
url = ../qtdatavis3d.git url = ../qtdatavis3d.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtvirtualkeyboard"] [submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git url = ../qtvirtualkeyboard.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtgamepad"] [submodule "qtgamepad"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtgamepad path = qtgamepad
url = ../qtgamepad.git url = ../qtgamepad.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtscxml"] [submodule "qtscxml"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtscxml path = qtscxml
url = ../qtscxml.git url = ../qtscxml.git
branch = 5.9.3 branch = 5.11
status = addon status = addon
[submodule "qtspeech"] [submodule "qtspeech"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtspeech path = qtspeech
url = ../qtspeech.git url = ../qtspeech.git
branch = 5.9.3 branch = 5.11
status = preview status = addon
[submodule "qtnetworkauth"] [submodule "qtnetworkauth"]
depends = qtbase depends = qtbase
recommends = qtwebview
path = qtnetworkauth path = qtnetworkauth
url = ../qtnetworkauth.git url = ../qtnetworkauth.git
branch = 5.9.3 branch = 5.11
status = preview status = addon
[submodule "qtremoteobjects"] [submodule "qtremoteobjects"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtremoteobjects path = qtremoteobjects
url = ../qtremoteobjects.git url = ../qtremoteobjects.git
branch = 5.9.3 branch = 5.11
status = preview
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 5.11
status = preview status = preview

View File

@@ -1,24 +1,27 @@
Template Target OS Target arch Compiler Features Template Target OS Target arch Compiler Features
----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
qtci-windows-7-x86-3 Mingw53 DeveloperBuild Release OpenGLDynamic qtci-windows-7-x86-3 Mingw53 DeveloperBuild Release OpenGLDynamic
qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-Ubuntu-16.04-x86_64-2 GCC NoWidgets ForceDebugInfo
qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-osx-10.11-x86_64-3 Clang Release NoFramework DisableTests
qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release
qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release
qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-Ubuntu-16.04-x86_64-2 GCC TestOnly LicenseCheck
qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

View File

@@ -1,25 +1,22 @@
Template Target OS Target arch Compiler Features Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 MSVC2017 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 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-7-x86-3 Mingw53 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 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 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 Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests
qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests
qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

View File

@@ -0,0 +1,4 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC DeveloperBuild DisableTests
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC DeveloperBuild DisableTests

View File

@@ -1,4 +1,4 @@
Template Target OS Target arch Compiler Features Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- --------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC DeveloperBuild
qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC DeveloperBuild

View File

@@ -1,5 +1,4 @@
Template Target OS Target arch Compiler Features Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-7 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests

View File

@@ -0,0 +1,6 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic

View File

@@ -1,62 +0,0 @@
. "$PSScriptRoot\helpers.ps1"
$scriptsPath = "C:\Python27\Scripts"
& "$scriptsPath\pip.exe" install --upgrade conan==0.24.0
# Use Qt Project repository by default
& "$scriptsPath\conan.exe" remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert
[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")
function Start-Process-Logged
{
Write-Host "Start-Process", $args
Start-Process @args
}
function Run-Conan-Install
{
Param (
[string]$ConanfilesDir,
[string]$BuildinfoDir,
[string]$Arch,
[string]$Compiler,
[string]$CompilerVersion,
[string]$CompilerRuntime,
[string]$CompilerLibcxx
)
if ($CompilerRuntime) {
$extraArgs = "-s compiler.runtime=$($CompilerRuntime)"
}
if ($CompilerLibcxx) {
$extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)"
}
$manifestsDir = "$PSScriptRoot\conan_manifests"
Get-ChildItem -Path "$ConanfilesDir\*.txt" |
ForEach-Object {
$conanfile = $_.FullName
$outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)"
New-Item $outpwd -Type directory -Force
$process = Start-Process-Logged `
"$scriptsPath\conan.exe" `
-WorkingDirectory $outpwd `
-ArgumentList "install -f $conanfile --no-imports --verify $manifestsDir", `
'-s', ('compiler="' + $Compiler + '"'), `
"-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" `
-NoNewWindow -Wait -Verbose `
-PassThru # Return process object
if ($process.ExitCode -ne 0) {
Write-Host "conan exited with code $($process.ExitCode)"
Exit(1)
}
Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt"
}
}

View File

@@ -1,10 +0,0 @@
. "$PSScriptRoot\helpers.ps1"
$zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip"
Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip
Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty
Remove-Item $zip
[Environment]::SetEnvironmentVariable("QT3DSTUDIO_3RDPARTY_DIR", "C:/Utils/Qt3DStudio3rdparty", "Machine")

View File

@@ -1,90 +0,0 @@
#!/bin/bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite 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$
##
#############################################################################
# A helper script used for downloading a file from a URL or an alternative
# URL. Also the SHA1 is checked for the file. Target filename should also
# be given.
#
# If called directly from another script, it will exit the parent script
# as well, if not called in its own subshell with parentheses.
# shellcheck source=try_catch.sh
source "${BASH_SOURCE%/*}/try_catch.sh"
ExceptionDownloadPrimaryUrl=100
ExceptionDownloadAltUrl=101
ExceptionSHA1=102
function DownloadURL {
url=$1
url_alt=$2
expectedSha1=$3
targetFile=$4
try
(
try
(
echo "Downloading from primary URL '$url'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl
)
catch || {
case $ex_code in
$ExceptionDownloadPrimaryUrl)
echo "Failed to download '$url' multiple times"
echo "Downloading tar.gz from alternative URL '$url_alt'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl
;;
esac
}
echo "Checking SHA1 on PKG '$targetFile'"
echo "$expectedSha1 *$targetFile" > $targetFile.sha1
shasum --check $targetFile.sha1 || throw $ExceptionSHA1
)
catch || {
case $ex_code in
$ExceptionDownloadAltUrl)
echo "Failed downloading PKG from primary and alternative URLs"
exit 1;
;;
$ExceptionSHA1)
echo "Failed checksum on $targetFile."
exit 1;
;;
esac
}
}

View File

@@ -1,136 +0,0 @@
#!/bin/bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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 receives URLs to a compressed file. It then downloads it,
# uncompresses it and installs it by default
# to /Applications/. This can be overridden by a target parameter.
# shellcheck source=try_catch.sh
source "${BASH_SOURCE%/*}/try_catch.sh"
# shellcheck source=DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
ExceptionDownload=99
ExceptionCreateTmpFile=100
ExceptionCreateTmpDirectory=101
ExceptionUncompress=102
ExceptionMoveApp=103
ExceptionDeleteTmpFile=104
ExceptionRemoveTmpDirectory=105
ExceptionUnknownFormat=106
function InstallAppFromCompressedFileFromURL {
url=$1
url_alt=$2
expectedSha1=$3
appPrefix=$4
target=$5
if [ "" == "$target" ]; then
target="/Applications/"
fi
try
(
basefilename=${url##*/}
extension=${basefilename##*.}
filename=${basefilename%.*}
if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then
extension="tar.gz"
fi
echo "Extension for file: $extension"
echo "Creating temporary file and directory"
targetFile=$(mktemp "$TMPDIR$(uuidgen).$extension") || throw $ExceptionCreateTmpFile
# macOS 10.10 mktemp does require prefix
if [[ $OSTYPE == "darwin14" ]]; then
targetDirectory=$(mktemp -d -t '10.10') || throw $ExceptionCreateTmpDirectory
else
targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
fi
(DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile") || throw $ExceptionDownload
echo "Uncompress $targetFile"
case $extension in
"tar.gz")
tar -xzf "$targetFile" --directory "$targetDirectory" || throw $ExceptionUncompress
;;
"zip")
unzip "$targetFile" -d "$targetDirectory" || throw $ExceptionUncompress
;;
*)
throw $ExceptionUnknownFormat
;;
esac
echo "Moving app to '$target'"
sudo mv "$targetDirectory/$appPrefix/"* "$target" || throw $ExceptionMoveApp
echo "Removing file '$targetFile'"
rm "$targetFile" || throw $ExceptionDeleteTmpFile
echo "Removing directory '$targetDirectory'"
rm -rf "$targetDirectory" || throw $ExceptionRemoveTmpDirectory
)
catch || {
case $ex_code in
$ExceptionDownload)
exit 1;
;;
$ExceptionCreateTmpFile)
echo "Failed to create temporary file"
exit 1;
;;
$ExceptionUncompress)
echo "Failed extracting compressed file."
exit 1;
;;
$ExceptionMoveApp)
echo "Failed moving app to '$target'."
exit 1;
;;
$ExceptionDeleteTmpFile)
echo "Failed deleting temporary file."
exit 1;
;;
$ExceptionRemoveTmpDirectory)
echo "Failed deleting temporary file."
exit 1;
;;
$ExceptionUnknownFormat)
echo "Unknown file format."
exit 1;
;;
esac
}
}

View File

@@ -1,124 +0,0 @@
#!/bin/bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite 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=try_catch.sh
source "${BASH_SOURCE%/*}/try_catch.sh"
# shellcheck source=DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
ExceptionDownload=99
ExceptionCreateTmpFile=100
ExceptionCreateTmpDirectory=101
ExceptionUncompress=102
ExceptionMoveApp=103
ExceptionDeleteTmpFile=104
ExceptionRemoveTmpDirectory=105
ExceptionUnknownFormat=106
function InstallFromCompressedFileFromURL {
url=$1
url_alt=$2
expectedSha1=$3
installDirectory=$4
appPrefix=$5
try
(
basefilename=${url##*/}
extension=${basefilename##*.}
filename=${basefilename%.*}
if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then
extension="tar.gz"
fi
echo "Extension for file: $extension"
echo "Creating temporary file and directory"
targetFile=$(mktemp "$TMPDIR$(uuidgen)XXXXX.$extension") || throw $ExceptionCreateTmpFile
targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
(DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile") || throw $ExceptionDownload
echo "Uncompress $targetFile"
case $extension in
"tar.gz")
tar -xzf "$targetFile" --directory "$targetDirectory" || throw $ExceptionUncompress
;;
"zip")
unzip "$targetFile" -d "$targetDirectory" || throw $ExceptionUncompress
;;
*)
throw $ExceptionUnknownFormat
;;
esac
echo "Moving app to $installDirectory"
sudo mkdir -p "$installDirectory"
sudo mv "$targetDirectory/$appPrefix/"* "$installDirectory" || throw $ExceptionMoveApp
echo "Removing file '$targetFile'"
rm "$targetFile" || throw $ExceptionDeleteTmpFile
echo "Removing directory '$targetDirectory'"
rm -rf "$targetDirectory" || throw $ExceptionRemoveTmpDirectory
)
catch || {
case $ex_code in
$ExceptionDownload)
exit 1;
;;
$ExceptionCreateTmpFile)
echo "Failed to create temporary file"
exit 1;
;;
$ExceptionUncompress)
echo "Failed extracting compressed file."
exit 1;
;;
$ExceptionMoveApp)
echo "Failed moving app to target location."
exit 1;
;;
$ExceptionDeleteTmpFile)
echo "Failed deleting temporary file."
exit 1;
;;
$ExceptionRemoveTmpDirectory)
echo "Failed deleting temporary file."
exit 1;
;;
$ExceptionUnknownFormat)
echo "Unknown file format."
exit 1;
;;
esac
}
}

View File

@@ -1,104 +0,0 @@
#!/bin/bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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=try_catch.sh
source "${BASH_SOURCE%/*}/try_catch.sh"
ExceptionCreateTmpFile=100
ExceptionDownloadPrimaryUrl=101
ExceptionDownloadAltUrl=102
ExceptionSHA1=103
ExceptionInstallerPKG=104
ExceptionDeleteTmpFile=105
function InstallPKGFromURL {
url=$1
url_alt=$2
expectedSha1=$3
targetDirectory=$4
try
(
echo "Creating temporary file"
targetFile=$(mktemp "$TMPDIR$(uuidgen).pkg") || trow $ExceptionCreateTmpFile
try
(
echo "Downloading PKG from primary URL '$url'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl
)
catch || {
case $ex_code in
$ExceptionDownloadPrimaryUrl)
echo "Failed to download '$url' multiple times"
echo "Downloading PKG from alternative URL '$url_alt'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl
;;
esac
}
echo "Checking SHA1 on PKG '$targetFile'"
echo "$expectedSha1 *$targetFile" > $targetFile.sha1
/usr/bin/shasum --check $targetFile.sha1 || throw $ExceptionSHA1
echo "Run installer on PKG"
sudo installer -package "$targetFile" -target "$targetDirectory" || throw $ExceptionInstallerPKG
echo "Removing file '$targetFile'"
rm "$targetFile" || throw $ExceptionDeleteTmpFile
)
catch || {
case $ex_code in
$ExceptionCreateTmpFile)
echo "Failed to create temporary file"
exit 1;
;;
$ExceptionDownloadAltUrl)
echo "Failed downloading PKG from primary and alternative URLs"
exit 1;
;;
$ExceptionSHA1)
echo "Failed to check sha1sum."
exit 1;
;;
$ExceptionInstallerPKG)
echo "Failed running installer on PKG."
exit 1;
;;
$ExceptionDeleteTmpFile)
echo "Failed deleting temporary file."
exit 1;
;;
esac
}
}

View File

@@ -1,2 +0,0 @@
# Disable the NTP from syncing
w32tm /config /syncfromflags:NO

View File

@@ -1,5 +0,0 @@
# Turning off win defender.
#
# If disabled manually, windows will automatically enable it after
# some period of time. Disabling it speeds up the builds.
REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F

View File

@@ -1,125 +0,0 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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 installs ICU.
$version = "53_1"
if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) {
$url_official_2012 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_64_devel.7z"
$url_cache_2012 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_64_devel.7z"
$sha1_2012 = "8A8C371F3ED58E81BBCF58CF5F8388CEF51FA9AC"
$url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z"
$url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z"
$sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F"
$icuPackage_msvc2012_64 = "C:\Windows\Temp\icu-$version-msvc2012_64.7z"
$icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z"
if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_64_devel\)) {
echo "Fetching from URL ..."
Download $url_official_2012 $url_cache_2012 $icuPackage_msvc2012_64
Verify-Checksum $icuPackage_msvc2012_64 $sha1_2012
Get-ChildItem $icuPackage_msvc2012_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_64_devel\""}
echo "Cleaning $icuPackage_msvc2012_64..."
Remove-Item -Recurse -Force $icuPackage_msvc2012_64
echo "ICU MSVC2012 = $version" >> ~\versions.txt
}
if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) {
echo "Fetching from URL ..."
Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64
Verify-Checksum $icuPackage_msvc2013_64 $sha1_2013
Get-ChildItem $icuPackage_msvc2013_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_64_devel\""}
echo "Cleaning $icuPackage_msvc2013_64..."
Remove-Item -Recurse -Force $icuPackage_msvc2013_64
echo "ICU MSVC2013 = $version" >> ~\versions.txt
}
# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine")
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine")
# FIXME: do we really want to use the 4.8.2 ICU build?
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine")
} else {
$url_official_2012_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_32_devel.7z"
$url_cache_2012_32 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_32_devel.7z"
$sha1_2012_32 = "F2FF287EEB0163B015D37AE08871165FBA87BCF0"
$url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z"
$url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z"
$sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800"
$icuPackage_msvc2012_32 = "C:\Windows\Temp\icu-$version-msvc2012_32.7z"
$icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z"
if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_32_devel\)) {
echo "Fetching from URL ..."
Download $url_official_2012_32 $url_cache_2012_32 $icuPackage_msvc2012_32
Verify-Checksum $icuPackage_msvc2012_32 $sha1_2012_32
Get-ChildItem $icuPackage_msvc2012_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_32_devel\""}
echo "Cleaning $icuPackage_msvc2012_32..."
Remove-Item -Recurse -Force $icuPackage_msvc2012_32
echo "ICU MSVC2012 = $version" >> ~\versions.txt
}
if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) {
echo "Fetching from URL ..."
Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32
Verify-Checksum $icuPackage_msvc2013_32 $sha1_2013_32
Get-ChildItem $icuPackage_msvc2013_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_32_devel\""}
echo "Cleaning $icuPackage_msvc2013_32..."
Remove-Item -Recurse -Force $icuPackage_msvc2013_32
echo "ICU MSVC2013 = $version" >> ~\versions.txt
}
# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_32_devel\\icu53_1", "Machine")
[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine")
}

View File

@@ -1,32 +0,0 @@
param([Int32]$archVer=32)
. "$PSScriptRoot\..\common\helpers.ps1"
# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
# The Clang library (C-bindings), version 3.9 or higher is required for building.
Get-Content "$PSScriptRoot\..\common\sw_versions.txt" | Foreach-Object {
$var = $_.Split('=')
New-Variable -Name $var[0] -Value $var[1]
$libclang_version = $libclang_version -replace '["."]'
}
if ( $archVer -eq 64 ) {
$sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
$url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_64.7z"
} else {
$sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
$url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z"
}
$zip = "c:\users\qt\downloads\libclang.7z"
$destination = "C:\Utils\libclang-" + $libclang_version
Download $url $url $zip
Verify-Checksum $zip $sha1
C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils\
Rename-Item C:\Utils\libclang $destination
[Environment]::SetEnvironmentVariable("LLVM_INSTALL_DIR", $destination, [EnvironmentVariableTarget]::Machine)
del $zip
echo "libClang = $libclang_version" >> ~/versions.txt

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
@@ -37,8 +37,9 @@
# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
source "${BASH_SOURCE%/*}/../common/try_catch.sh" source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/android" targetFolder="/opt/android"
sdkTargetFolder="$targetFolder/sdk" sdkTargetFolder="$targetFolder/sdk"
@@ -60,65 +61,43 @@ toolsSourceFile="$basePath/$toolsFile"
ndkTargetFile="/tmp/$ndkFile" ndkTargetFile="/tmp/$ndkFile"
ndkSourceFile="$basePath/$ndkFile" ndkSourceFile="$basePath/$ndkFile"
ExceptionDownload=99 DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
ExceptionUnzipTools=100 DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
ExceptionUnzipNdk=101 echo "Unzipping Android NDK to '$targetFolder'"
ExceptionRmTools=102 sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
ExceptionRmNdk=103 echo "Unzipping Android Tools to '$sdkTargetFolder'"
ExceptionSdkManager=104 sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
rm "$ndkTargetFile"
rm "$toolsTargetFile"
try echo "Changing ownership of Android files."
( if uname -a |grep -q "el6\|el7"; then
(DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile") || throw $ExceptionDownload
(DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile") || throw $ExceptionDownload
echo "Unzipping Android NDK to '$targetFolder'"
sudo unzip -q "$ndkTargetFile" -d "$targetFolder" || throw $ExceptionUnzipNdk
echo "Unzipping Android Tools to '$sdkTargetFolder'"
sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools
rm "$ndkTargetFile" || throw $ExceptionRmNdk
rm "$toolsTargetFile" || throw $ExceptionRmTools
echo "Changing ownership of Android files."
sudo chown -R qt:wheel "$targetFolder" sudo chown -R qt:wheel "$targetFolder"
else
sudo chown -R qt:users "$targetFolder"
fi
echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager if [ "$http_proxy" != "" ]; then
proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1)
proxy_port=$(echo $proxy | cut -d':' -f3)
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
else
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
fi
echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
echo "export ANDROID_NDK_HOST=linux-x86_64" >> ~/.bashrc SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
echo "Android SDK tools = $toolsVersion" >> ~/versions.txt echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
echo "Android NDK = $ndkVersion" >> ~/versions.txt echo "Android NDK = $ndkVersion" >> ~/versions.txt
)
catch || {
case $ex_code in
$ExceptionDownload)
exit 1;
;;
$ExceptionUnzipTools)
echo "Failed to unzip Android SDK Tools."
exit 1;
;;
$ExceptionUnzipNdk)
echo "Failed to unzip Android NDK."
exit 1;
;;
$ExceptionRmTools)
echo "Failed to remove temporary tools package '$toolsTargetFile'."
exit 1;
;;
$ExceptionRmNdk)
echo "Failed to remove temporary NDK package '$ndkTargetFile'."
exit 1;
;;
$ExceptionSdkManager)
echo "Failed to run sdkmanager."
exit 1;
;;
esac
}
cd $sdkTargetFolder/tools/bin
echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86"
echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-21;google_apis;x86" -c 2048M -f
# Purely informative, show the list of avd devices
./avdmanager list avd

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
@@ -37,8 +37,8 @@
# CMake is needed for autotests that verify that Qt can be built with CMake # CMake is needed for autotests that verify that Qt can be built with CMake
# shellcheck source=InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="3.6.2" version="3.6.2"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
@@ -49,5 +49,4 @@ appPrefix="cmake-$version-Linux-x86_64"
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
echo "Adding $targetFolder/bin to PATH" SetEnvVar "PATH" "$targetFolder/bin:\$PATH"
echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc

View File

@@ -0,0 +1,44 @@
#!/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$
##
#############################################################################
set -ex
echo "Disable Network Time Protocol (NTP)"
if uname -a |grep -q "Ubuntu"; then
sudo timedatectl set-ntp false
else
systemctl &>/dev/null && sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off
fi

View File

@@ -1,3 +1,5 @@
#!/usr/bin/env bash
# We need to disable selinux while we are overwriting some binaries # We need to disable selinux while we are overwriting some binaries
# required by it. If this is not done, ICU provisioning will create # required by it. If this is not done, ICU provisioning will create
# template that is not booting. # template that is not booting.

View File

@@ -0,0 +1,62 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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 installs FBX SDK
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
set -e
tarballName="fbx20161_2_fbxsdk_linux.tar.gz"
targetFolder="/opt/fbx"
cachedUrl="http://ci-files01-hki.intra.qt.io/input/fbx/$tarballName"
officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$tarballName"
sha1="b0a08778de025e2c6e90d6fbdb6531f74a3da605"
tmpFolder="/tmp"
targetFile="$tmpFolder/$tarballName"
installer="$tmpFolder/fbx20161_2_fbxsdk_linux"
DownloadURL "$cachedUrl" "$officialUrl" "$sha1" "$targetFile"
sudo tar -C $tmpFolder -xf "$targetFile"
sudo mkdir -p $targetFolder
(echo "yes"; echo "n") | sudo "$installer" -w "$tmpFolder" "$targetFolder"
rm -rf "$targetFile"
# Set env variables
SetEnvVar "FBXSDK" "$targetFolder"
echo "FBX SDK = 2016.1.2" >> ~/versions.txt

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
@@ -35,7 +35,8 @@
# This script installs INTEGRITY # This script installs INTEGRITY
source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="11.4.4" version="11.4.4"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz"
@@ -46,10 +47,10 @@ appPrefix=""
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
echo "export INTEGRITY_BSP=platform-cortex-a9" >> ~/.bashrc SetEnvVar "INTEGRITY_BSP" "platform-cortex-a9"
echo "export INTEGRITY_PATH=$targetFolder/comp_201654" >> ~/.bashrc SetEnvVar "INTEGRITY_PATH" "$targetFolder/comp_201654"
echo "export INTEGRITY_DIR=$targetFolder/int1144" >> ~/.bashrc SetEnvVar "INTEGRITY_DIR" "$targetFolder/int1144"
echo "export INTEGRITY_GL_INC_DIR=\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc" >> ~/.bashrc SetEnvVar "INTEGRITY_GL_INC_DIR" "\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc"
echo "export INTEGRITY_GL_LIB_DIR=\$INTEGRITY_DIR/libs/Vivante" >> ~/.bashrc SetEnvVar "INTEGRITY_GL_LIB_DIR" "\$INTEGRITY_DIR/libs/Vivante"
echo "INTEGRITY = $version" >> ~/versions.txt echo "INTEGRITY = $version" >> ~/versions.txt

View File

@@ -0,0 +1,69 @@
#!/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite 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
# 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
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
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 ba3b55ab4afafe6bc9d2cb922eafd51c6cee4629
mkdir build
cd build
cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib/open62541 ..
make
sudo make install
sudo /sbin/ldconfig
SetEnvVar "QTOPCUA_OPEN62541_LIB_PATH" "/usr/local/lib/open62541"
SetEnvVar "QTOPCUA_OPEN62541_INCLUDE_PATH" "/usr/local/include/open62541"

View File

@@ -1,4 +1,4 @@
#!/bin/env bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
@@ -36,8 +36,8 @@
# This script install OpenSSL from sources. # This script install OpenSSL from sources.
# Requires GCC and Perl to be in PATH. # Requires GCC and Perl to be in PATH.
source "${BASH_SOURCE%/*}/try_catch.sh" source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
source "${BASH_SOURCE%/*}/DownloadURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="1.0.2g" version="1.0.2g"
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
@@ -50,36 +50,16 @@ sha="36af23887402a5ea4ebef91df8e61654906f58f2"
# QTQAINFRA-1436 # QTQAINFRA-1436
opensslHome="${installFolder}openssl-1.0.2" opensslHome="${installFolder}openssl-1.0.2"
ExceptionDownload=99 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
ExceptionTar=100
ExceptionConfig=101
try tar -xzf "$targetFile" -C "$installFolder"
( # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
(DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile") || throw $ExceptionDownload mv "${opensslHome}g" "${opensslHome}"
pushd "$opensslHome"
tar -xzf "$targetFile" -C "$installFolder" || throw $ExceptionTar echo "Running configure"
# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) perl Configure shared android
mv "${opensslHome}g" "${opensslHome}"
pushd "$opensslHome"
perl Configure shared android || throw $ExceptionConfig
echo "export OPENSSL_ANDROID_HOME=$opensslHome" >> ~/.bashrc SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
echo "OpenSSL for Android = $version" >> ~/versions.txt
)
catch || {
case $ex_code in
$ExceptionDownload)
exit 1;
;;
$ExceptionTar)
echo "Failed to extract $targetFile"
exit 1;
;;
$ExceptionConfig)
echo "Failed to run 'config'."
exit 1;
;;
esac
} echo "OpenSSL for Android = $version" >> ~/versions.txt

View File

@@ -0,0 +1,66 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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 installs QNX 6.6.0.
set -ex
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660.tar.gz"
sha1="E292CCAEF447AC1AA4DAD7802D604A5531ACD8D0"
folderName="qnx660"
targetFile="qnx660.tar.gz"
wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
echo "$sha1 $targetFile" | sha1sum --check
if [ ! -d "$targetFolder" ]; then
mkdir -p $targetFolder
fi
sudo tar -C $targetFolder -xvzf $targetFile
sudo chown -R qt:users "$targetFolder"/"$folderName"
# Verify that we have last file in tar
if [ ! -f $targetFolder/$folderName/qnx660-env.sh ]; then
echo "Installation failed!"
exit -1
fi
rm -rf $targetFile
# Set env variables
SetEnvVar "QNX_660" "$targetFolder$folderName"
echo "QNX SDP = 6.6.0" >> ~/versions.txt

View File

@@ -1,4 +1,4 @@
#!/bin/env bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
@@ -36,15 +36,18 @@
# This script installs QNX 7. # This script installs QNX 7.
set -ex set -ex
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/" targetFolder="/opt/"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz" sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz"
sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113" sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113"
folderName="qnx700" folderName="qnx700"
targetFile="qnx700.tar.xz" targetFile="qnx700.tar.xz"
wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
echo "$sha1 $targetFile" | sha1sum --check echo "$sha1 $targetFile" | sha1sum --check
if [ ! -d "$targetFolder" ]; then if [ ! -d "$targetFolder" ]; then
mkdir -p $targetFolder mkdir -p $targetFolder
fi fi
sudo tar -C $targetFolder -Jxf $targetFile sudo tar -C $targetFolder -Jxf $targetFile
sudo chown -R qt:users "$targetFolder"/"$folderName" sudo chown -R qt:users "$targetFolder"/"$folderName"
@@ -56,6 +59,8 @@ if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
fi fi
rm -rf $targetFile rm -rf $targetFile
# Set env variables # Set env variables
echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc SetEnvVar "QNX_700" "$targetFolder$folderName"
echo "QNX SDP = 7.0.0" >> ~/versions.txt echo "QNX SDP = 7.0.0" >> ~/versions.txt

View File

@@ -1,4 +1,4 @@
#!/bin/env bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
@@ -33,48 +33,59 @@
## ##
############################################################################# #############################################################################
# This script modifies system settings for automated use # This script receives URLs to a compressed file. It then downloads it,
# uncompresses it and installs it by default
# to /Applications/. This can be overridden by a target parameter.
# shellcheck source=../common/try_catch.sh set -ex
source "${BASH_SOURCE%/*}/../common/try_catch.sh"
NTS_IP=10.212.2.216 # shellcheck source=DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
ExceptionGsettings1=100 function InstallAppFromCompressedFileFromURL {
ExceptionGsettings2=101 url=$1
ExceptionGsettings3=102 url_alt=$2
ExceptionNTS=103 expectedSha1=$3
appPrefix=$4
target=$5
try if [ "" == "$target" ]; then
( target="/Applications/"
echo "Timeout for blanking the screen (0 = never)" fi
gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1
echo "Prevents screen lock when screesaver goes active."
gsettings set org.gnome.desktop.screensaver lock-enabled false || throw $ExceptionGsettings2
echo "Disable questions on shutdown."
gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true || throw $ExceptionGsettings3
echo "Set Network Test Server address to $NTS_IP in /etc/hosts" basefilename=${url##*/}
echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS extension=${basefilename##*.}
) filename=${basefilename%.*}
catch || { if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then
case $ex_code in extension="tar.gz"
$ExceptionGsettings1) fi
echo "Failed to disable black screen."
exit 1; echo "Extension for file: $extension"
echo "Creating temporary file and directory"
targetFile=$(mktemp "$TMPDIR$(uuidgen).$extension")
# macOS 10.10 mktemp does require prefix
if [[ $OSTYPE == "darwin14" ]]; then
targetDirectory=$(mktemp -d -t '10.10')
else
targetDirectory=$(mktemp -d)
fi
(DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile")
echo "Uncompress $targetFile"
case $extension in
"tar.gz")
tar -xzf "$targetFile" --directory "$targetDirectory"
;; ;;
$ExceptionGsettings2) "zip")
echo "Failed to prevent screen lock." unzip -q "$targetFile" -d "$targetDirectory"
exit 1;
;; ;;
$ExceptionGsettings3) *)
echo "Failed to disable questions on shutdown." exit 1
exit 1;
;;
$ExceptionNTS)
echo "Failed to set network teset server address into /etc/hosts."
exit 1;
;; ;;
esac esac
echo "Moving app to '$target'"
sudo mv "$targetDirectory/$appPrefix/"* "$target"
echo "Removing file '$targetFile'"
rm "$targetFile"
echo "Removing directory '$targetDirectory'"
rm -rf "$targetDirectory"
} }

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
@@ -33,31 +33,27 @@
## ##
############################################################################# #############################################################################
source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
set -ex set -ex
packageEpel="epel-release-latest-7.noarch.rpm" function InstallPKGFromURL {
OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel" url=$1
CachedUrl="http://ci-files01-hki.intra.qt.io/input/redhat/$packageEpel" url_alt=$2
SHA1="5512b80e5b71f2370d8419fa16a0bc14c5edf854" expectedSha1=$3
targetDirectory=$4
DownloadURL $OfficialUrl $CachedUrl $SHA1 ./$packageEpel
sudo rpm -Uvh $packageEpel
sudo rm -f $packageEpel
# install python3
sudo yum install -y python34-devel
# install pip3
packagePip="get-pip.py"
OfficialUrlPip="https://bootstrap.pypa.io/$packagePip"
CachedUrlPip="http://ci-files01-hki.intra.qt.io/input/redhat/$packagePip"
SHA1Pip="3d45cef22b043b2b333baa63abaa99544e9c031d"
DownloadURL $OfficialUrlPip $CachedUrlPip $SHA1Pip ./$packagePip
sudo python3 $packagePip
sudo rm -f $packagePip
sudo pip3 install virtualenv
echo "Creating temporary file"
targetFile=$(mktemp "$TMPDIR$(uuidgen).pkg")
echo "Downloading PKG from primary URL '$url'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || (
echo "Failed to download '$url' multiple times"
echo "Downloading PKG from alternative URL '$url_alt'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
)
echo "Checking SHA1 on PKG '$targetFile'"
echo "$expectedSha1 *$targetFile" > $targetFile.sha1
/usr/bin/shasum --check $targetFile.sha1
echo "Run installer on PKG"
sudo installer -package "$targetFile" -target "$targetDirectory"
echo "Removing file '$targetFile'"
rm "$targetFile"
}

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
@@ -39,6 +39,8 @@
# shellcheck source=./InstallAppFromCompressedFileFromURL.sh # shellcheck source=./InstallAppFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz" AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz"
@@ -47,5 +49,6 @@ appPrefix="cmake-3.6.2-Darwin-x86_64"
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
echo "export PATH=/Applications/CMake.app/Contents/bin:\$PATH" >> ~/.bashrc SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH"
echo "CMake = 3.6.2" >> ~/versions.txt echo "CMake = 3.6.2" >> ~/versions.txt

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate AutomaticDownload -boolean FALSE

View File

@@ -0,0 +1,73 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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 installs FBX SDK
set -ex
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
targetFolder="/opt/fbx"
cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName"
officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$fileName"
sha1="f82535423c700c605320c52e13e781c92208ec6b"
targetFolder="/tmp"
targetFile="$targetFolder/$fileName"
installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg"
ExceptionExtractPrimaryUrl=100
echo "Extracting '$cachedUrl'"
tar -xzf "$cachedUrl" -C "$targetFolder" || (
echo "Failed to uncompress from '$cachedUrl'"
echo "Downloading from '$officialUrl'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl"
echo "Checking SHA1 on PKG '$targetFile'"
echo "$sha1 *$targetFile" > $targetFile.sha1
shasum --check $targetFile.sha1
echo "Extracting '$targetFile'"
tar -xzf "$targetFile" -C "$targetFolder"
)
rm -rf "$targetFile"
echo "Running installer for '$installer'"
sudo installer -pkg "$installer" -target "/"
# Set env variables
SetEnvVar "FBXSDK" "/Applications/Autodesk/FBX\ SDK/2016.1.2/"
echo "FBX SDK = 2016.1.2" >> ~/versions.txt

View File

@@ -0,0 +1,62 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite 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$
##
#############################################################################
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
set -ex
# Command line tools is need by homebrew
function InstallCommandLineTools {
url=$1
url_alt=$2
expectedSha1=$3
packageName=$4
version=$5
DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName
echo "Mounting $packageName"
hdiutil attach /tmp/$packageName
cd "/Volumes/Command Line Developer Tools"
echo "Installing"
sudo installer -verbose -pkg *.pkg -target /
cd /
# Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
sleep 3
echo "Unmounting"
umount /Volumes/Command\ Line\ Developer\ Tools/
echo "Removing $packageName"
rm /tmp/$packageName
echo "Command Line Tools = $version" >> ~/versions.txt
}

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
@@ -44,48 +44,18 @@
# shellcheck source=../common/try_catch.sh function InstallXCode() {
source "${BASH_SOURCE%/*}/try_catch.sh"
function InstallXCode()
{
ExceptionCPIO=103
ExceptionAcceptLicense=105
ExceptionDeveloperMode=113
sourceFile=$1 sourceFile=$1
version=$2 version=$2
try echo "Uncompressing and installing '$sourceFile'"
( xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
echo "Uncompressing and installing '$sourceFile'"
xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi) || throw $ExceptionCPIO
echo "Accept license" echo "Accept license"
sudo xcodebuild -license accept || throw $ExceptionAcceptLicense sudo xcodebuild -license accept
echo "Enabling developer mode, so that using lldb does not require interactive password entry" echo "Enabling developer mode, so that using lldb does not require interactive password entry"
sudo /usr/sbin/DevToolsSecurity -enable || throw $ExceptionDeveloperMode sudo /usr/sbin/DevToolsSecurity -enable
echo "Xcode = $version" >> ~/versions.txt
)
catch || {
case $ex_code in
$ExceptionCPIO)
echo "Failed to unarchive .cpio."
exit 1;
;;
$ExceptionDeveloperMode)
echo "Failed to enable developer mode."
exit 1;
;;
$ExceptionAcceptLicense)
echo "Failed to accept license."
exit 1;
;;
esac
}
echo "Xcode = $version" >> ~/versions.txt
} }

View File

@@ -0,0 +1,63 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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 installs JDK
set -ex
echo "Installing Java Development Kit"
targetFile=jdk-8u102-macosx-x64.dmg
url=ci-files01-hki.intra.qt.io:/hdd/www/input/mac
# url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg
echo "Mounting $targetFile"
sudo mount "$url" /Volumes
sudo cp "/Volumes/$targetFile" /tmp
sudo umount /Volumes
sudo hdiutil attach "/tmp/$targetFile"
echo Installing JDK
cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /
echo "Unmounting $targetFile"
sudo hdiutil unmount /Volumes/JDK\ 8\ Update\ 102/ -force
echo "Disable auto update"
sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false
echo "JDK Version = 8 update 102" >> ~/versions.txt

View File

@@ -0,0 +1,11 @@
#!/usr/bin/env bash
function InstallPip {
python=$1
# Will install pip utility for python
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
sudo "$python" get-pip.py
rm get-pip.py
}

View File

@@ -0,0 +1,59 @@
#!/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$
##
#############################################################################
# This script installs python2
# shellcheck source=./InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
# shellcheck source=./../unix/SetEnvVar.sh
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-2.7.14-macosx10.6.pkg"
AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg"
SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09"
DestDir="/"
InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
InstallPip python2.7
/Library/Frameworks/Python.framework/Versions/2.7/bin/pip install virtualenv
SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH"
echo "python2 = 2.7.14" >> ~/versions.txt

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
@@ -36,7 +36,12 @@
# This script installs python3 # This script installs python3
# shellcheck source=./InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
# shellcheck source=./../unix/SetEnvVar.sh
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" 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" AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg"
@@ -45,8 +50,12 @@ DestDir="/"
InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
InstallPip python3.6
/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv /Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv
echo "export PYTHON3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
echo "export PIP3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
echo "python3 = 3.6.1" >> ~/versions.txt echo "python3 = 3.6.1" >> ~/versions.txt

View File

@@ -0,0 +1,49 @@
#!/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$
##
#############################################################################
# On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'.
# In order to make all unix provioning scripts run on macOS without special case handling
# a symbolic link is created.
# The shasum tool is a perl script which does some globbing to determine the perl version. The
# symbolic link has to point directly to the binary including the perl version.
# Additionally the CI seems to have multiple parallel perl versions installed which causes
# multiple shasum tools to be present (shasum5.16, shasum5.18).
#
# Currently this is
# /usr/local/bin/sha1sum -> /usr/bin/shasum5.18
[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin
SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1)
sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##

View File

@@ -1,5 +0,0 @@
#!/usr/bin/env bash
# Will install pip utility for python
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
sudo python get-pip.py
rm get-pip.py

View File

@@ -1,7 +0,0 @@
. "$PSScriptRoot\helpers.ps1"
$installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe"
Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.intra.qt.io/input/ruby/rubyinstaller-2.3.1.exe $installer
Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36"
& $installer /DIR=C:\ruby /VERYSILENT

View File

@@ -0,0 +1,2 @@
proxy="http://proxy.intra.qt.io:3128"

View File

@@ -0,0 +1,61 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite 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$
##
#############################################################################
# A helper script used for downloading a file from a URL or an alternative
# URL. Also the SHA1 is checked for the file. Target filename should also
# be given.
#
# If called directly from another script, it will exit the parent script
# as well, if not called in its own subshell with parentheses.
function DownloadURL {
url=$1
url_alt=$2
expectedSha1=$3
targetFile=$4
echo "Downloading from primary URL '$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"
)
echo "Checking SHA1 on PKG '$targetFile'"
echo "$expectedSha1 *$targetFile" > $targetFile.sha1
sha1sum --check $targetFile.sha1
rm -f $targetFile.sha1
}

View File

@@ -1,8 +1,8 @@
#!/bin/env bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
## Copyright (C) 2016 The Qt Company Ltd. ## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/ ## Contact: http://www.qt.io/licensing/
## ##
## This file is part of the test suite of the Qt Toolkit. ## This file is part of the test suite of the Qt Toolkit.
@@ -33,32 +33,47 @@
## ##
############################################################################# #############################################################################
# Patch QNX SDK due to issues in the standard library.
# The patches are available here:
# http://www.qnx.com/download/feature.html?programid=27555
# A copy of the patch must be in the root of the Coin path in
# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
set -ex set -ex
sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565"
function InstallZipPackageFromURL { # shellcheck source=DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
function InstallFromCompressedFileFromURL {
url=$1 url=$1
expectedSha1=$2 url_alt=$2
targetDirectory=$3 expectedSha1=$3
installDirectory=$4
appPrefix=$5
targetFile=`mktemp` basefilename=${url##*/}
wget --tries=5 --waitretry=5 --output-document=$targetFile $url extension=${basefilename##*.}
echo "$expectedSha1 $targetFile" | sha1sum --check filename=${basefilename%.*}
if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then
tempDir=`mktemp -d` extension="tar.gz"
/usr/bin/unzip -o -d $tempDir $targetFile fi
trap "sudo rm -fr $targetFile $tempDir" EXIT echo "Extension for file: $extension"
echo "Creating temporary file and directory"
sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/ targetFile=$(mktemp "$TMPDIR$(uuidgen)XXXXX.$extension")
targetDirectory=$(mktemp -d)
DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile"
echo "Uncompress $targetFile"
case $extension in
"tar.gz")
tar -xzf "$targetFile" --directory "$targetDirectory"
;;
"zip")
unzip "$targetFile" -d "$targetDirectory"
;;
*)
exit 1
;;
esac
echo "Moving app to $installDirectory"
sudo mkdir -p "$installDirectory"
sudo mv "$targetDirectory/$appPrefix/"* "$installDirectory"
echo "Removing file '$targetFile'"
rm "$targetFile"
echo "Removing directory '$targetDirectory'"
rm -rf "$targetDirectory"
} }
echo "Patching QNX"
baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip"
InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/"

View File

@@ -0,0 +1,51 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite 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$
##
#############################################################################
# A helper script used for setting environment variables on Unix systems
set -ex
function SetEnvVar {
name=$1
path=$2
echo "Setting environment variable $name to $path."
if uname -a |grep -q "Ubuntu"; then
echo "export $name=$path" >> ~/.profile
else
echo "export $name=$path" >> ~/.bashrc
fi
}

View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
## Copyright (C) 2016 The Qt Company Ltd. ## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/ ## Contact: http://www.qt.io/licensing/
## ##
## This file is part of the test suite of the Qt Toolkit. ## This file is part of the test suite of the Qt Toolkit.
@@ -32,18 +32,8 @@
## ##
############################################################################# #############################################################################
function RemoveDir { set -ex
param=$1
if [ ! -d $param ] source "${BASH_SOURCE%/*}/../shared/http_proxy.txt"
then
echo "'$param' don't exists"
else
echo "Removing $param..."
sudo rm -fr $param
fi
}
# Remove Android (wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io && echo "Setting http_proxy to $proxy" && export http_proxy=$proxy) || echo "Proxy not detected at $proxy"
param="/opt/android"
RemoveDir $param

View File

@@ -0,0 +1,40 @@
#!/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$
##
#############################################################################
set -ex
echo "Disable Network Time Protocol (NTP)"
echo "sudo launchctl unload /System/Library/LaunchDaemons/org.ntp.ntpd.plist" >> /Users/qt/.bash_profile

View File

@@ -40,8 +40,10 @@
# In case of Linux, we expect to get the values as args # In case of Linux, we expect to get the values as args
set -e set -e
source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
. $BASEDIR/sw_versions.txt . $BASEDIR/../shared/sw_versions.txt
url=$1 url=$1
sha1=$2 sha1=$2
version=$3 version=$3
@@ -58,12 +60,7 @@ zip="libclang.7z"
destination="/usr/local/libclang-$version" destination="/usr/local/libclang-$version"
curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url" curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url"
_shasum=sha1sum echo "$sha1 $zip" | sha1sum --check
if [[ "$OSTYPE" == "darwin"* ]]; then
echo "DARWIN"
_shasum=/usr/bin/shasum
fi
echo "$sha1 $zip" | $_shasum --check
7z x $zip -o/tmp/ 7z x $zip -o/tmp/
rm -rf $zip rm -rf $zip

View File

@@ -0,0 +1,55 @@
#!/bin/bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the test suite 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 installs paho testing broker
# shellcheck source=./InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0"
PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
SHA1="532fe145096cdd8d679f425cbfd883289150c968"
targetFolder="/opt/paho_broker"
appPrefix="paho.mqtt.testing-$CommitSHA"
sudo rm -fr "$targetFolder"
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
echo "Adding MQTT broker path to environment"
SetEnvVar "MQTT_TEST_BROKER_LOCATION" "$targetFolder/interoperability/startbroker.py"
echo "MQTT_BROKER = $CommitSHA" >> ~/versions.txt

View File

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

View File

@@ -0,0 +1,58 @@
. "$PSScriptRoot\helpers.ps1"
$scriptsPath = "C:\Python27\Scripts"
Run-Executable "$scriptsPath\pip.exe" "install --upgrade conan==0.24.0"
# Use Qt Project repository by default
Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert"
Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos"
function Run-Conan-Install
{
Param (
[string]$ConanfilesDir,
[string]$BuildinfoDir,
[string]$Arch,
[string]$Compiler,
[string]$CompilerVersion,
[string]$CompilerRuntime,
[string]$CompilerLibcxx
)
if ($CompilerRuntime) {
$extraArgs = "-s compiler.runtime=$($CompilerRuntime)"
}
if ($CompilerLibcxx) {
$extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)"
}
$manifestsDir = "$PSScriptRoot\conan_manifests"
Get-ChildItem -Path "$ConanfilesDir\*.txt" |
ForEach-Object {
$conanfile = $_.FullName
$outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)"
New-Item $outpwd -Type directory -Force
for ($i = 1; $i -le 5; $i++) {
try {
Push-Location $outpwd
Run-Executable "$scriptsPath\conan.exe" "install -f $conanfile --no-imports --verify $manifestsDir", `
'-s', ('compiler="' + $Compiler + '"'), `
"-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" `
break;
} catch {
if ($i -eq 5) {
throw "Could not install conan content"
}
} finally {
Pop-Location
}
}
Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt"
}
}

View File

@@ -0,0 +1,11 @@
. "$PSScriptRoot\helpers.ps1"
$zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip"
$url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip"
Download $url $url $zip
Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty
Remove-Item -Path $zip
Set-EnvironmentVariable "QT3DSTUDIO_3RDPARTY_DIR" "C:/Utils/Qt3DStudio3rdparty"

View File

@@ -30,7 +30,8 @@
## $QT_END_LICENSE$ ## $QT_END_LICENSE$
## ##
############################################################################# #############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script allows the Windows Remote Desktop Access # This script allows the Windows Remote Desktop Access
reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server" /v fDenyTSConnections /t REG_DWORD /d 0 /f Run-Executable "reg.exe" "add `"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server`" /v fDenyTSConnections /t REG_DWORD /d 0 /f"

View File

@@ -0,0 +1,69 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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$
##
#############################################################################
# Requires: 7z, perl and msys
. "$PSScriptRoot\helpers.ps1"
# OpenSSL need to be configured from sources for Android build in windows 7
# Msys need to be installed to target machine
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
$version = "1.0.2j"
$zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
$destination = "C:\Utils\openssl-android-master"
Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip C:\Utils
Extract-7Zip C:\Utils\openssl-$version.tar C:\Utils
Rename-Item C:\Utils\openssl-$version $destination
Remove-Item -Path $zip
Remove-Item C:\Utils\openssl-$version.tar
Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc"
Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar"
Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r10e\platforms\android-18\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"
Write-Host "Configuring OpenSSL $version for Android..."
Push-Location $destination
Run-Executable "C:\msys\1.0\bin\bash.exe" "-c `"c:/strawberry/perl/bin/perl Configure shared android`""
Pop-Location
# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h

View File

@@ -0,0 +1,100 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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 installs Android sdk and ndk
# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version $sdkBuildToolsVersion
# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself.
# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
# That's why we need to use Andoid-21 API version in Qt 5.9.
# NDK
$ndkVersion = "r10e"
$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip"
$ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357"
$ndkFolder = "c:\utils\android-ndk-$ndkVersion"
$ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
# SDK
$sdkVersion = "r24.4.1"
$sdkApi = "ANDROID_API_VERSION"
$sdkApiLevel = "android-21"
$sdkBuildToolsVersion = "23.0.3"
$sdkCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\android-sdk_$sdkVersion-windows.zip"
$sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip"
$sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49"
$sdkFolder = "c:\utils\android-sdk-windows"
$sdkZip = "c:\Windows\Temp\android_sdk_$sdkVersion.zip"
function Install($1, $2, $3, $4) {
$cacheUrl = $1
$zip = $2
$checksum = $3
$offcialUrl = $4
Download $offcialUrl $cacheUrl $zip
Verify-Checksum $zip "$checksum"
Extract-Zip $zip C:\Utils
}
function SdkUpdate ($1, $2) {
Write-Host "Running Android SDK update for $1..."
cmd /c "echo y |$1\tools\android update sdk --no-ui --all --filter $2"
}
Write-Host "Installing Android ndk $nkdVersion"
Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl
Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolder
Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder
#Write-Host "Installing Android sdk $sdkVersion"
Install $sdkCachedUrl $sdkZip $sdkChecksum $sdkOfficialUrl
Set-EnvironmentVariable "ANDROID_SDK_HOME" $sdkFolder
Set-EnvironmentVariable "ANDROID_API_VERSION" $sdkApiLevel
# SDK update
SdkUpdate $sdkFolder $sdkApiLevel
SdkUpdate $sdkFolder tools
SdkUpdate $sdkFolder platform-tools
SdkUpdate $sdkFolder build-tools-$sdkBuildToolsVersion
# kill adb. This process prevents provisioning to continue
$p = Get-Process -Name "adb" -ErrorAction:SilentlyContinue
if ($p -ne $null) {
Write-Host "Stopping adb.exe"
Stop-Process -Force $p
} else {
Write-Host "adb.exe not running"
}

View File

@@ -40,7 +40,7 @@ $zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip"
$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
$cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip" $cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip"
echo "Removing old cmake" Write-Host "Removing old cmake"
Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue
Download $officialurl $cachedurl $zip Download $officialurl $cachedurl $zip
@@ -52,5 +52,5 @@ Rename-Item $defaultinstallfolder C:\CMake
Add-Path "C:\CMake\bin" Add-Path "C:\CMake\bin"
echo "CMake = $version" >> ~\versions.txt Write-Output "CMake = $version" >> ~\versions.txt

View File

@@ -30,8 +30,6 @@
## $QT_END_LICENSE$ ## $QT_END_LICENSE$
## ##
############################################################################# #############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script disables the automatic Windows updates Get-WmiObject Win32_OSRecoveryConfiguration -EnableAllPrivileges | Set-WmiInstance -Arguments @{ AutoReboot=$False }
stop-service wuauserv
set-service wuauserv startup disabled

View File

@@ -0,0 +1,4 @@
. "$PSScriptRoot\helpers.ps1"
# Disable the NTP from syncing
Run-Executable "w32tm.exe" "/config /syncfromflags:NO"

View File

@@ -30,10 +30,11 @@
## $QT_END_LICENSE$ ## $QT_END_LICENSE$
## ##
############################################################################# #############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script prevents Windows from going to sleep # This script prevents Windows from going to sleep
powercfg -change -monitor-timeout-ac 0 Run-Executable "powercfg.exe" "-change -monitor-timeout-ac 0"
powercfg -change -standby-timeout-ac 0 Run-Executable "powercfg.exe" "-change -standby-timeout-ac 0"
powercfg -change -disk-timeout-ac 0 Run-Executable "powercfg.exe" "-change -disk-timeout-ac 0"
powercfg -change -hibernate-timeout-ac 0 Run-Executable "powercfg.exe" "-change -hibernate-timeout-ac 0"

View File

@@ -30,7 +30,8 @@
## $QT_END_LICENSE$ ## $QT_END_LICENSE$
## ##
############################################################################# #############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script disables the Windows UAC # This script disables the Windows UAC
C:\Windows\System32\cmd.exe /k %windir%\System32\reg.exe ADD HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System /v EnableLUA /t REG_DWORD /d 0 /f Run-Executable "reg.exe" "ADD HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System /v EnableLUA /t REG_DWORD /d 0 /f"

View File

@@ -0,0 +1,8 @@
# Turning off win defender.
#
# If disabled manually, windows will automatically enable it after
# some period of time. Disabling it speeds up the builds.
. "$PSScriptRoot\helpers.ps1"
Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F"

View File

@@ -0,0 +1,54 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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 disables the automatic Windows updates
$service = get-service wuauserv
if (-not $service) {
Write-Host "Windows Update service not found."
exit 0
}
if ($service.Status -eq "Stopped") {
Write-Host "Windows Update service already stopped."
} else {
Write-Host "Stopping Windows Update service."
Stop-Service -Name "wuauserv" -Force
}
$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode"
if ($startup -ne "Disabled") {
set-service wuauserv -startup disabled
} else {
Write-Host "Windows Update service startup already disabled."
}

View File

@@ -0,0 +1,19 @@
. "$PSScriptRoot\helpers.ps1"
# This script installs DirectX SDK
$package = "DXSDK_Jun10.exe"
$cacheUrl = "\\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
Write-Host "Installing DirectX SDK"
Run-Executable $exe "/u"
Remove-Item -Path $exe
Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt

View File

@@ -0,0 +1,39 @@
#############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
Start-Process -NoNewWindow -FilePath "C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\ngen.exe" -ArgumentList ExecuteQueuedItems -Wait
if( (is64bitWinHost) -eq 1 ) {
Start-Process -NoNewWindow -FilePath "C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319\ngen.exe" -ArgumentList ExecuteQueuedItems -Wait
}

View File

@@ -0,0 +1,66 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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 FBX SDK
$version = "2016.1.2"
$name = "fbx20161_2_fbxsdk_vs2015_win"
$packageName = "$name.7z"
$installerName = "$name.exe"
$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\fbx\$packageName"
$sha1 = "3690400625672bef6369bcf90dcde4d78b493b24"
# The executable is an interactive installer only. We can't run it in a script silently.
# $officialUrl = "http://download.autodesk.com/us/fbx_release_older/2016.1.2/$installerName"
# This sha is for the executable
# $sha1 = "54f581c7c19cf5a08cf5e7bc62b8cc7f0617558e"
#$targetFile = "C:\Windows\Temp\$packageName"
$targetFolder = "C:\Program Files\"
#Write-Host "Downloading '$installerName'"
#Download $officialUrl $cacheUrl $targetFile
#Verify-Checksum $targetFile $sha1
Write-Host "Extracting '$cacheUrl'"
Extract-7Zip $cacheUrl $targetFolder
#Remove-Item -Recurse -Force "$packageName"
Set-EnvironmentVariable "FBXSDK" "$targetFolder\Autodesk\FBX\FBX SDK\2016.1.2"
Write-Output "FBX SDK = $version" >> ~\versions.txt

View File

@@ -5,13 +5,32 @@ function Verify-Checksum
[string]$Expected=$(throw("Checksum required")), [string]$Expected=$(throw("Checksum required")),
[ValidateSet("sha1","md5")][string]$Algorithm="sha1" [ValidateSet("sha1","md5")][string]$Algorithm="sha1"
) )
Write-Host "Verifying checksum of $File"
$fs = new-object System.IO.FileStream $File, "Open" $fs = new-object System.IO.FileStream $File, "Open"
$algo = [type]"System.Security.Cryptography.$Algorithm" $algo = [type]"System.Security.Cryptography.$Algorithm"
$crypto = $algo::Create() $crypto = $algo::Create()
$hash = [BitConverter]::ToString($crypto.ComputeHash($fs)).Replace("-", "") $hash = [BitConverter]::ToString($crypto.ComputeHash($fs)).Replace("-", "")
$fs.Close() $fs.Close()
if ($hash -ne $Expected) { if ($hash -ne $Expected) {
Write-Error "Checksum verification failed, got: '$hash' expected: '$Expected'" throw "Checksum verification failed, got: '$hash' expected: '$Expected'"
}
}
function Run-Executable
{
Param (
[string]$Executable=$(throw("You must specify a program to run.")),
[string[]]$Arguments
)
if ([string]::IsNullOrEmpty($Arguments)) {
Write-Host "Running `"$Executable`""
$p = Start-Process -FilePath "$Executable" -Wait -PassThru
} else {
Write-Host "Running `"$Executable`" with arguments `"$Arguments`""
$p = Start-Process -FilePath "$Executable" -ArgumentList $Arguments -Wait -PassThru
}
if ($p.ExitCode -ne 0) {
throw "Process $($Executable) exited with exit code $($p.ExitCode)"
} }
} }
@@ -21,24 +40,21 @@ function Extract-7Zip
[string]$Source, [string]$Source,
[string]$Destination [string]$Destination
) )
echo "Extracting '$Source' to '$Destination'..." Write-Host "Extracting '$Source' to '$Destination'..."
if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) { if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
$zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles} -ne $null)[0] '7-zip\7z.exe' $zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe'
if (-not (test-path $zipExe)) { if (-not (test-path $zipExe)) {
$zipExe = join-path ${env:ProgramW6432} '7-zip\7z.exe' $zipExe = "C:\Utils\sevenzip\7z.exe"
if (-not (test-path $zipExe)) { if (-not (test-path $zipExe)) {
$zipExe = "C:\Utils\sevenzip\7z.exe" throw "Could not find 7-zip."
if (-not (test-path $zipExe)) {
throw "Could not find 7-zip."
}
} }
} }
} else { } else {
$zipExe = "7z.exe" $zipExe = "7z.exe"
} }
& $zipExe x $Source "-o$Destination" -y Run-Executable "$zipExe" "x -y `"-o$Destination`" `"$Source`""
} }
function Extract-Zip function Extract-Zip
@@ -47,7 +63,7 @@ function Extract-Zip
[string]$Source, [string]$Source,
[string]$Destination [string]$Destination
) )
echo "Extracting '$Source' to '$Destination'..." Write-Host "Extracting '$Source' to '$Destination'..."
New-Item -ItemType Directory -Force -Path $Destination New-Item -ItemType Directory -Force -Path $Destination
$shell = new-object -com shell.application $shell = new-object -com shell.application
@@ -66,7 +82,7 @@ function Extract-Dev-Folders-From-Zip
$shell = new-object -com shell.application $shell = new-object -com shell.application
echo "Extracting contents of $package" Write-Host "Extracting contents of $package"
foreach ($subDir in "lib", "include", "bin", "share") { foreach ($subDir in "lib", "include", "bin", "share") {
$zip = $shell.Namespace($package + "\" + $zipDir + "\" + $subDir) $zip = $shell.Namespace($package + "\" + $zipDir + "\" + $subDir)
if ($zip) { if ($zip) {
@@ -97,12 +113,14 @@ function Download
) )
$ProgressPreference = 'SilentlyContinue' $ProgressPreference = 'SilentlyContinue'
try { try {
Write-Host "Downloading from cached location ($CachedUrl) to $Destination"
if ($CachedUrl.StartsWith("http")) { if ($CachedUrl.StartsWith("http")) {
Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
} else { } else {
Copy-Item $CachedUrl $Destination Copy-Item $CachedUrl $Destination
} }
} catch { } catch {
Write-Host "Cached download failed: Downloading from official location: $OfficialUrl"
Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination
} }
} }
@@ -112,18 +130,33 @@ function Add-Path
Param ( Param (
[string]$Path [string]$Path
) )
echo "Adding $Path to Path" Write-Host "Adding $Path to Path"
$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
[Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine) [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine)
$Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
} }
function is64bitWinHost function Set-EnvironmentVariable
{ {
if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { Param (
return 1 [string]$Key = $(BadParam("a key")),
} [string]$Value = $(BadParam("a value."))
else { )
return 0 Write-Host "Setting environment variable `"$($Key)`" to `"$($Value)`""
}
[Environment]::SetEnvironmentVariable($Key, $Value, [EnvironmentVariableTarget]::Machine)
}
function Is64BitWinHost
{
return [environment]::Is64BitOperatingSystem
}
function isProxyEnabled {
return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyEnable
}
function getProxy {
return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
} }

View File

@@ -0,0 +1,45 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $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 installs ICU.
$version = "53_1"
if (Is64BitWinHost) {
# FIXME: do we really want to use the 4.8.2 ICU build?
Set-EnvironmentVariable "CI_ICU_PATH_Mingw49" "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1"
}

View File

@@ -31,16 +31,15 @@
## ##
############################################################################# #############################################################################
. "$PSScriptRoot\..\common\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
# This script will install Dependency Walker 2.2.6000 # This script will install Dependency Walker 2.2.6000
$version = "2.2.6000" $version = "2.2.6000"
if( (is64bitWinHost) -eq 1 ) { if (Is64BitWinHost) {
$arch = "_x64" $arch = "_x64"
$sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA" $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA"
} } else {
else {
$arch = "_x86" $arch = "_x86"
$sha1 = "bfec714057e8449b0246051be99ba46a7760bab9" $sha1 = "bfec714057e8449b0246051be99ba46a7760bab9"
} }
@@ -49,15 +48,15 @@ $url_official = "http://www.dependencywalker.com/depends22" + $arch + ".zip"
$dependsPackage = "C:\Windows\Temp\depends-$version.zip" $dependsPackage = "C:\Windows\Temp\depends-$version.zip"
$TARGETDIR = "C:\Utils\dependencywalker" $TARGETDIR = "C:\Utils\dependencywalker"
if(!(Test-Path -Path $TARGETDIR )){ if (!(Test-Path -Path $TARGETDIR )) {
New-Item -ItemType directory -Path $TARGETDIR New-Item -ItemType directory -Path $TARGETDIR
} }
Download $url_official $url_cache $dependsPackage Download $url_official $url_cache $dependsPackage
Verify-Checksum $dependsPackage $sha1 Verify-Checksum $dependsPackage $sha1
Get-ChildItem $dependsPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} Extract-7Zip $dependsPackage $TARGETDIR
echo "Cleaning $dependsPackage.." Write-Host "Cleaning $dependsPackage.."
Remove-Item -Recurse -Force "$dependsPackage" Remove-Item -Recurse -Force -Path "$dependsPackage"
echo "Dependency Walker = $version" >> ~\versions.txt Write-Output "Dependency Walker = $version" >> ~\versions.txt

View File

@@ -30,16 +30,15 @@
## $QT_END_LICENSE$ ## $QT_END_LICENSE$
## ##
############################################################################# #############################################################################
. "$PSScriptRoot\..\common\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
# Install Git version 2.13.0 # Install Git version 2.13.0
$version = "2.13.0" $version = "2.13.0"
if( (is64bitWinHost) -eq 1 ) { if (Is64BitWinHost) {
$arch = "-64-bit" $arch = "-64-bit"
$sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7" $sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7"
} } else {
else {
$arch = "-32-bit" $arch = "-32-bit"
$sha1 = "03c7df2e4ef61ea6b6f9c0eb7e6d5151d9682aec" $sha1 = "03c7df2e4ef61ea6b6f9c0eb7e6d5151d9682aec"
} }
@@ -47,11 +46,11 @@ $gitPackage = "C:\Windows\Temp\Git-" + $version + $arch + ".exe"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + $arch + ".exe" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + $arch + ".exe"
$url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + $arch + ".exe" $url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + $arch + ".exe"
echo "Fetching Git $version..." Write-Host "Fetching Git $version..."
Download $url_official $url_cache $gitPackage Download $url_official $url_cache $gitPackage
Verify-Checksum $gitPackage $sha1 Verify-Checksum $gitPackage $sha1
echo "Installing Git $version..." Write-Host "Installing Git $version..."
cmd /c "$gitPackage /SILENT /COMPONENTS="icons,ext\reg\shellhere,assoc,assoc_sh"" Run-Executable "$gitPackage" "/SILENT /COMPONENTS=`"icons,ext\reg\shellhere,assoc,assoc_sh`""
remove-item $gitPackage Remove-Item -Path $gitPackage
echo "Git = $version" >> ~\versions.txt Write-Output "Git = $version" >> ~\versions.txt

View File

@@ -31,18 +31,17 @@
## ##
############################################################################# #############################################################################
. "$PSScriptRoot\..\common\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
# This script will install Java SE # This script will install Java SE
$installdir = "C:\Program Files\Java\jdk1.8.0_144" $installdir = "C:\Program Files\Java\jdk1.8.0_144"
$version = "8u144" $version = "8u144"
if( (is64bitWinHost) -eq 1 ) { if (Is64BitWinHost) {
$arch = "x64" $arch = "x64"
$sha1 = "adb03bc3f4b40bcb3227687860798981d58e1858" $sha1 = "adb03bc3f4b40bcb3227687860798981d58e1858"
} } else {
else {
$arch = "i586" $arch = "i586"
$sha1 = "3b9ab95914514eaefd72b815c5d9dd84c8e216fc" $sha1 = "3b9ab95914514eaefd72b815c5d9dd84c8e216fc"
} }
@@ -51,28 +50,31 @@ $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jdk-" + $version
$official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe" $official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe"
$javaPackage = "C:\Windows\Temp\jdk-$version.exe" $javaPackage = "C:\Windows\Temp\jdk-$version.exe"
echo "Fetching Java SE $version..." Write-Host "Fetching Java SE $version..."
$ProgressPreference = 'SilentlyContinue' $ProgressPreference = 'SilentlyContinue'
try { try {
echo "...from local cache" Write-Host "...from local cache"
Invoke-WebRequest -UseBasicParsing $url_cache -OutFile $javaPackage Download $url_cache $url_cache $javaPackage
} catch { } catch {
echo "...from oracle.com" Write-Host "...from oracle.com"
$client = new-object System.Net.WebClient $client = new-object System.Net.WebClient
$cookie = "oraclelicense=accept-securebackup-cookie" $cookie = "oraclelicense=accept-securebackup-cookie"
$client.Headers.Add("Cookie", $cookie) $client.Headers.Add("Cookie", $cookie)
$client.DownloadFile($official_url, $javaPackage) $client.DownloadFile($official_url, $javaPackage)
Invoke-WebRequest -UseBasicParsing $official_url -OutFile $javaPackage Download $official_url $official_url $javaPackage
} }
Verify-Checksum $javaPackage $sha1 Verify-Checksum $javaPackage $sha1
cmd /c "$javaPackage /s SPONSORS=0" Run-Executable "$javaPackage" "/s SPONSORS=0"
echo "Cleaning $javaPackage.." Write-Host "Cleaning $javaPackage.."
Remove-Item -Recurse -Force "$javaPackage" Remove-Item -Recurse -Force -Path "$javaPackage"
[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine) Write-Host "Remove Java update from startup"
reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f
Set-EnvironmentVariable "JAVA_HOME" "$installdir"
Add-Path "$installdir\bin" Add-Path "$installdir\bin"
echo "Java SE = $version $arch" >> ~\versions.txt Write-Output "Java SE = $version $arch" >> ~\versions.txt

View File

@@ -31,7 +31,7 @@
## ##
############################################################################ ############################################################################
. "$PSScriptRoot\..\common\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
function InstallMinGW function InstallMinGW
{ {
@@ -55,14 +55,13 @@ function InstallMinGW
Download $url_official $url_cache $mingwPackage Download $url_official $url_cache $mingwPackage
Verify-Checksum $mingwPackage $sha1 Verify-Checksum $mingwPackage $sha1
Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} Extract-7Zip $mingwPackage $TARGETDIR
echo "Adding MinGW environment variable." Set-EnvironmentVariable "$envvar" ("$targetdir\mingw" + $win_arch.Substring($win_arch.get_Length()-2))
[Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine)
echo "Cleaning $mingwPackage.." Write-Host "Cleaning $mingwPackage.."
Remove-Item -Recurse -Force "$mingwPackage" Remove-Item -Recurse -Force -Path "$mingwPackage"
echo "MinGW = $version $release" >> ~\versions.txt Write-Output "MinGW = $version $release" >> ~\versions.txt
} }

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