Commit Graph

277 Commits

Author SHA1 Message Date
Tony Sarajärvi
8a93a8fe6a Provisioning: cleanup path from cmake_linux.sh
Change-Id: Iced9f0c7811b9de076aee115502de0841c1a59cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-30 12:20:39 +00:00
Joni Jäntti
0e4d668e35 Add official URL to MinGW Windows 10 provisioning
MinGW currently uses only internal URL without backup. Added the
official URL to these scripts with SHA1 checksum verification.

Change-Id: Id9b8a1bf1110201414e9d79c9e713475118ff661
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-27 06:04:11 +00:00
Simo Fält
0b251bbdc0 Provisioning: Install Python3 development libs to OpenSUSE
Those are required to build Pyside#5.9 branch.

Change-Id: I315c72155815d8b6b0b2c5eee4d3922374262c7a
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2017-09-26 07:30:25 +00:00
Heikki Halmet
512f8ff0a2 Change Packaging and iOS builds to macOS 10.12
This changes swap packaging and iOS builds
from 10.10 to 10.12

Task-number: QTQAINFRA-1095
Change-Id: I681c0abc29bfeb240dd61f8a95c811d353979013
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-25 09:10:31 +00:00
Liang Qi
04ccf0e8db Merge remote-tracking branch 'origin/5.6' into 5.9
42b502f is not needed for branches >= 5.8, configure.exe does not
exist anymore.

30660bf was not applied to 5.9 branch, the scripts were not
adapted to new template.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17
2017-09-22 21:15:52 +02:00
Liang Qi
e7472f4308 Merge remote-tracking branch 'origin/5.6.3' into 5.6
Conflicts:
	.gitmodules

Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c
2017-09-18 09:42:25 +02:00
Simon Hausmann
57043fb07b Clean up QNX patching
Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches
from ci-files01 instead.

Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-16 05:35:10 +00:00
Heikki Halmet
12fd0d5b9b Ensure 'clean' android Installation
Remove old android installation and make sure new 'clean' android
folder is created.

Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-15 10:38:24 +00:00
Tony Sarajärvi
b0a9259c6e Provision and build QNX660 on Win 10 x64
Changes the mingw from 4.9 to 5.3.

Task-number: QTQAINFRA-1208
Change-Id: I360b9806c35e597a4b9fd0d57c10eebfb8643905
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-14 12:08:39 +00:00
Tony Sarajärvi
2a5f54d07e provisioning: install MinGW 530 and 630 for Win10 x64
MinGW is an alternative option for Visual Studio. It's
used to create desktop builds and for cross compiling
Android and QNX. At this point it is still unclear which
version is going to be used for what, but as both are
supported, let's think ahead and provide them both.
This also allows us to debug with the other, if the
other is causing problems.

Task-number: QTQAINFRA-1289
Change-Id: I2a922669c07d49370e608c093be80481c8613dc7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-14 12:08:36 +00:00
Tony Sarajärvi
892833cda9 Provisioning: Invoke installer with Start-Process
By launching an installer with Start-Process and -Wait,
we make sure no handles are left holding on to the
installer when we try to delete it at cleanup.

Change-Id: Ic9b700ea1ce9e70089ba4cb7e91d9765ca976333
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-09-14 12:08:32 +00:00
Tony Sarajärvi
a9cf936a63 Provision: Move Python3 scripts from win8 to win8.1 folder
Task-number: QTAUTO-345
Task-number: QTBUG-63133
Change-Id: I739e18a7fcb1abc72092f91662e506cfffcecb0c
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-14 12:08:28 +00:00
Simon Hausmann
b1c268a8eb Build examples also on Linux with namespaces
With this change we get coverage for namespace related build breakages
in examples of Linux-only modules, such as wayland.

Change-Id: Id9464140059c459a19ce702d6b21a552f8137a2c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-09-12 16:20:51 +00:00
Dominik Holland
528580bbcd Install python3 on all platforms
This forward-ports commit a99d3432f7
to 5.9, which should have been done in
6bf5691ca8 but accidentally left out.
It reuses parts of commit a5f3f8ed48
that was initially cherry-picked to 5.6.

Task-number: QTAUTO-345
Task-number: QTBUG-63133
Change-Id: Ib401dd06bfc4d4aaf8b8ce1a8509697993d4397e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-12 13:59:10 +00:00
Simo Fält
92d1bdcb43 Provisioning: Fix shasum path
Commit c48355ebb5 changed
the path of shasum, which was not intended. While the
DownloadURL.sh utility is used by rhel in addition to
macOS we can't rely on /usr/bin/shasum but we have to
use the one found from PATH.

Change-Id: I67bb37dcb72ba3d8d1f279646e44228b27137ec9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-08 04:34:41 +00:00
Tony Sarajärvi
8852587991 Provision openSUSE 42.3 and add to CI
Replaces 42.1 that isn't supported anymore by
openSUSE.org.

Task-number: QTQAINFRA-1257
Task-number: QTQAINFRA-1259
Change-Id: I660f812ec27a28d413dc52657985c41d1b8dab01
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-06 06:13:06 +00:00
Konstantin Tokarev
6dfd0c7b38 Use 64-bit host for VS2017 builds of QtWebKit
Change-Id: I92bec3662bf39fb5a3572f093af09b2b75bda589
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-09-05 13:46:17 +00:00
Simo Fält
c48355ebb5 Provisioning: Fix DownloadURL utility's shasum check
MacOS 10.10 has older shasum tool, which does not support oneliner
verification.

Change-Id: If00b846d5772aa1991960675d022249d63e7bd77
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-05 11:36:43 +00:00
Simo Fält
a3f4bf703b Provisioning: Fix helper function's mktemp in macOS 10.10
It seems that macOS 10.10 has a non standard mktemp command. It doesn't
work as expected but prints usage and exit instead.

Change-Id: I37be6eb01474466c2b6bbae4f38876673bd9c295
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-04 14:23:05 +00:00
Tony Sarajärvi
a7b1b00350 Provisioning: Hide powershell progress bar for performance
Change-Id: I74abdcc2e7d2dccf4f85cd64fe5fb4b56e54d613
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-04 12:12:17 +00:00
Joni Jäntti
dbf737a5c0 Fix Add-Path helper function and start using it in scripts
This function was broken and only added the latest addition to the
actual PATH.

Change-Id: Ida352c7b605c1b9748bb98e4f51ce68a765c3ce3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-04 12:11:17 +00:00
Akseli Salovaara
4e1f4665c5 Build Windows MSVC2013 & MSVC2015 32bit binaries on 64bit host
From Qt 5.6.3 onwards building QtWebEngine Windows 32bit binaries
requires Windows 64bit machine. Linking requires more RAM than
Windows 32bit can address. Change MSVC2013 & MSVC2015
integration host machines accordingly.

Change-Id: I5b88536507dcf59efd124d4e8c3ead79772021fb
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-04 07:10:14 +00:00
Aapo Keskimolo
42b502f7bc Add UploadConfigureExe feature
We used to solve the requirement for uploading configure.exe from
product version, but we can add this as a feature and remove the
dependency to product version.

Change-Id: If671e7193771453cd5cd41e881875c44ff0992fb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-02 11:32:38 +00:00
Frederik Gladhorn
8c8be48167 Prefer apt-get over apt in scripts
apt explicitly warns that it doesn't have a stable UI, so it shouldn't
be used in scripts. This should have no implications in practice.

Change-Id: Id0bb0d44e73b80a19f6ba4ca1aa4d92c09d10a92
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-09-02 05:48:25 +00:00
Tony Sarajärvi
8470310388 Provisioning: Add variables properly in .bashrc
If we, in a provisioning script, add $PATH to another
file, that $PATH gets expanded there and now. We need it
written as $PATH to the target file, so that it gets expanded
when the other file is run. Not at the moment of running this
provisioning script.

Change-Id: Ie2c64764f9e0a676307cb3a144162cbc35eb33fb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-02 05:48:06 +00:00
Tony Sarajärvi
d1dfb5767f Swap B2Qt branch to Morty
Task-number: QTQAINFRA-1364
Change-Id: I9b114d2cbea60928fac4aa8dec9721099b92f5f6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-09-02 05:47:47 +00:00
Tony Sarajärvi
3ca7658781 Provision vanilla Windows 8.1 x86 and use it
Replaces existing Windows 8 x86 builds with
a vanilla tier 1 image that gets all needed
software provisioned except for VS2013 that is
pre-installed.
Also modifies existing provisioning scripts
under common to support this 32bit OS.

Task-number: QTQAINFRA-1383
Change-Id: I495cb2d78b4d2d8b2abb9af1254fff0a78a570d9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-01 13:02:12 +00:00
Joni Jäntti
05dd83c73a provisioning: windows: ICU
Fixed ICU script to actually install ICU instead of just setting the
environment variables. It is required to build qtwebkit.

Change-Id: I8881f9c11599d99b4d400595c9b929cf6f37088a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-01 08:05:57 +00:00
Joni Jäntti
30660bf987 Make CI use a new provisioned Win 10 template
Added all the provisioning scripts that install required
programs and make changes to certain settings. These are needed to
build qt5. This replaces the old Windows 10 template.

Task-number: QTQAINFRA-1263
Change-Id: Ieeb2ae3c53841644996d99ca86228df6f825a63a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2017-09-01 08:05:54 +00:00
Simon Hausmann
6bf5691ca8 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/provisioning/common/InstallPKGFromURL.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh

Change-Id: I87b10d75250eecd5271be201fdf6b1d27cc5a791
2017-08-31 11:25:26 +02:00
Simo Fält
a99d3432f7 Install python3 on all platforms
Python3 is required in 5.6 by pyside-setup.

Task-number: QTAUTO-345
Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit a5f3f8ed48)
(cherry picked from commit a765838889)
(cherry picked from commit 1859f9b26c)
2017-08-30 19:57:54 +00:00
Simon Hausmann
1bd2b2acfa Fix code duplication for cmake installation on Linux
Share the code for installing cmake on Linux.

Change-Id: I535f2696151ea4db26dc7194a1fe7016799ed0e2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-30 17:16:59 +00:00
Joni Jäntti
c7a9bb92e1 Fix adding to path lines for Windows provisioning scripts
Currently the path addition command will forget the previous addition
when adding a new string. This hasn't been found out because python
was the only script using this command. Now we also need to set the
path for ruby, so the python string is left out.

Change-Id: I39721d78111550189e52a9f095030033f9660c0a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
2017-08-30 17:16:56 +00:00
Tony Sarajärvi
835ef953f0 Provisioning: Fine tune cmake provisioning script
Add version printing and move version strings to variables for
easier reuse.

Change-Id: I5372872bf455609dfb7cc7bbcf7a110cd71933fb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-08-30 17:16:52 +00:00
Tony Sarajärvi
f05289d622 Provisioning: Add $PATH properly in .bashrc
If we, in a provisioning script, add $PATH to another
file, that $PATH gets expanded there and now. We need it
written as $PATH to the target file, so that it gets expanded
when the other file is run. Not at the moment of running this
provisioning script.

Change-Id: Id963f0f8b1cc74b02d35c1a91eb974ed816839ab
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-08-30 17:16:48 +00:00
Simon Hausmann
207eb4069b Fix cmake and python installation on RHEL 7.2 and OpenSuSE 42.1
The merge commit 74eb853384 accidentally
brought forward the removal of files from commit
49ccf716dc that were not supposed to
propagate.

Change-Id: Ia5d6b2205c75f0856c3fed104149980c75a55840
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-08-29 10:23:22 +00:00
Simon Hausmann
3a000ed41a Fix target architecture for Boot2Qt declarative tests
Amends 7456e028a7 and therefore allows
the re-use of the boot2qt build artifacts.

Change-Id: I4b01bf13e0004c4c3c3a2be00b02760e0ad3ffdd
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-25 09:08:10 +00:00
Alexandru Croitor
dfaabde5dc Enable developer mode on macOS platforms
Previously when a VM user tried to attach lldb to a process via ssh,
lldb would fail with the following error message:
"error: process exited with status -1 (unable to attach)". If this
were done over VNC rather than ssh, the user would instead get a UI
popup to enter a password to allow debugging the process.

When trying to debug an application using Xcode for the first time,
Xcode will offer to enable the so called "Developer Mode" which allows
attaching a debugger without specifying a password every time.

This change enables "Developer Mode", so that every VM user doesn't
have to.

Change-Id: Ie4e473a982c908afd456ac1773bbdaf4ce778094
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-24 04:49:06 +00:00
Simo Fält
9d65cd5ca5 Provisioning: Install libclang and its dependencies to macos 10.12
Libs and llvm-config is required by pyside. In order to extract
libclang package, we need to install 7zip. 7zip is installed
with homebrew.

Change-Id: I35367dca1f79dbc9e2f1513480f6fc9bb69730d3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-23 05:50:26 +00:00
Liang Qi
74eb853384 Merge remote-tracking branch 'origin/5.6' into 5.9
Move the Documentation feature to the corresponding Ubuntu 16.04, where
the CI would have used it by magic.

Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io>
Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a
2017-08-22 08:22:02 +02:00
Kari Oikarinen
c2493f9d6d Use libusb compiled with MSVC 2015
QDB has to change to using Windows 10 for releases, because Windows 8.1
is no longer available for non-qt5 builds as a packaging platform in 5.9
branch.

Don't provision libusb on earlier Windows versions, since they don't
have a compatible compiler.

Change-Id: I771a24fcf208c4961483a39e51cb7d95f004ed55
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-08-21 17:49:27 +00:00
Sami Nurmenniemi
79db6fc856 Do not use font files from boot2qt toolchain
Previously font configuration files were used from the host system.
Updating the toolchain to Morty introduces Cantarell font which
causes toolchain fonts to be used by Qemu. This change forces
also the actual font files to be used from the host system
regardless of what is in the toolchain.

Task-number: QTBUG-62528
Change-Id: I00de0baa952c9b898edc6b9da8d1d8814f6c722b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-21 09:39:57 +00:00
Frederik Gladhorn
896bb94c74 Remove outdated provisioning scripts
Ubuntu 14.04 and OS X 10.8 are no longer relevant

Change-Id: Ib18dda605501fbbf2a6cac578a1b34d82102fae4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-08-19 14:51:39 +00:00
Simo Fält
629e24b979 Provisioning: Install libclang to OpenSUSE
The script will install custom package, which is known
to match with pyside requirements.

Change-Id: I28ff7877ef1bba50f8d32007af87e70c0ddc398a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2017-08-17 19:52:48 +00:00
Simo Fält
62c6676f87 Provisioning: Install pip for macOS 10.12
Pip is required to provision python packages.

Change-Id: I73ab7556bb6b9ccc57ef078f422bfbba4bfed6a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:41 +00:00
Simo Fält
3690fe06a4 Provisioning: Update CMake on osx 10.10
Pyside requires cmake 3.1.0 or more recent.

Change-Id: Ic376d5e5af9f9b0692a2de7c4ec35e6c8bfa9465
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:35 +00:00
Tony Sarajärvi
f238362a4b Provisioning: move installing Android NDK and SDK back in line
Installing the NDK and SDK takes a lot of time and finding potential
other problems require us to first download the entire Android SDK.
By moving it back in line, we first make sure the other stuff work
before taking care of this.

Change-Id: Ibae82dca247c8ae063548dbafa5a348102bf8ddb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:29 +00:00
Tony Sarajärvi
7db6a1cd0f Provisioning: Reduce verbosity of uncompressing Xcode
Change-Id: Id09ace3fcdf53c3b6921ed277c9fe571b5c43e3b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:24 +00:00
Simo Fält
c9f842af84 Provisioning: Install virtualenv for macOS 10.12
Python virtualenv command is used when building pyside modules,
which installs additional Python modules during build time
and requires access to installation directories.

Change-Id: Id34ac8b36710ba04d8db263acdaf2bd31e314de8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:18 +00:00
Kari Oikarinen
1720ed0b6f Adapt comments to qdb repository move
Change-Id: I3ecdc952d1323a14471cdc87b6854b857d4297a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-16 18:57:26 +00:00