Conflicts:
coin/platform_configs/default.txt
This also reverts c9d5341307 as on macOS
10.11 in 5.9 we're using a fresh virtual machine template that doesn't
have stale virtualenv/python installations.
Change-Id: Iab50fde0388c97967ada7c40374345ce4327613a
There are multiple Python installations in our macOS 10.11 Tier1
template. Most of them are pretty old and not even working properly.
One of the affected Python tool is virtualenv, which atm is creating
Python 2.6 env by default even if Python 2.7 is the default Python.
Change-Id: I8bc0900976a9dc79637539802345175c85b7b433
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
MinGW packages will be upgraded in another patch.
Task-number: QTBUG-61728
Change-Id: Ie6a1996b7850282a7cdcbe5ceba61f1ce473cf69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Also upgrade to Conan 0.24.0.
Task-number: QTBUG-61829
Change-Id: Ia01609e5f2d8121eb216b03bc8e95bca7225042e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
We need to use x86 packages from qtci-windows-10-x86_64 configuration,
so splitting Conan manifests by configuration is not a good idea anymore.
Task-number: QTBUG-61829
Change-Id: I8b2fc00865cce372ca6b5ec75b4775d345d0d18f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Some of the macOS templates are cleaner than others and are mising some
basic tools like 7z. Homebrew provides easy way to install wide range of
tools via command line.
Change-Id: I5a8528bb4a13ef9a72e2467c51a8b5d45f9a3d84
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
PySide versions following 5.6 use a C++ parser based on Clang.
The Clang library (C-bindings), version 3.9 or higher is
required for building.
Change-Id: Ia7bcad46e3214d6d8b688354c9abdc83a513573c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Makefile-based generators of CMake are much less efficient than Ninja. They
generate bloated Makefiles that call back to cmake often. Main offender on
Windows is cmake_depends command which seems to do lots of disk reads.
QtWebKit can now switch to ninja automatically if it's present in PATH.
This should help to reduce build times.
Change-Id: I33d3f4d766a630f8ca4fb64b719fe2e8a5c2e00c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Install the DLL for general availability on all Windows systems. Due to
its distinct name it will not be picked up by anyone unless Qt
explicitly selects it.
This gives us the ability to choose the GLES backend to use in Qt.
Change-Id: Ie36f202ead7080a8f7690734d305bd27f0c9f56b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
The correct paths to the headers are
c:\utils\postgresql[x86]\pgsql\include
not
c:\utils\postgresql[x86]\pgsql\pgsql\include
Same for libs.
Regression introduced by commit ce47238ed9
but only noticed in the 5.9 branch.
Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* There's no need to have a numbered prefix in the common directory
* Instead of deleting directories trees worth several gigabytes of data,
just rename the directory. The underlying storage system is
copy-on-write and so deleting the files produces more data than just
moving the directory out of the way. Deleting the files does not
actually free up any physical disk space.
Change-Id: I6de02d56f3485651726ea11183ce7571d5b61520
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
We're better off copying off the internal server using CIFS than using
PowerShell's incredibly slow Invoke-WebRequest.
Change-Id: Ic39cf08be70335e9309575d543155bffaceb0db0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
We have a prepared package on the internal server that has everything
necessary included. This way we do not have to download the actual
update content from the internet.
Change-Id: Ie4cb3116a4f91a47df5be1c2b2e473d7ddec9a78
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Similar to the mysql change (parent commit) it's faster to rename any
older artifacts and install only what we need. This also generalizes the
zip archive extraction code for "dev" packages.
Change-Id: I3ad1f23efaed80fab3e0778a3e8c46317138f1ad
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Instead of deleting the files from a previous installation, which will
not actually release any disk space but just make the qcow2 file
larger, let's just rename the directory the old files are in.
That is a significantly faster operation.
* When extracting the zip archive, only extract what we need for Qt:
Libraries, binaries and headers. We can skip the installation of
several thousand documentation files for example, which takes a long
time.
* Instead of downloading the zip archive via PowerShell's
Invoke-WebRequest we can get the data much faster using CopyItem off
the CIFS share. As a bonus this is also more robust against download
failures.
Change-Id: I9128bd70e5f4a4ebcdbf046765e76b63bad033a5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Previously provisioning disabled screensaver on startup
but didn't affect current session. Thus the screensaver
hits the VMs while provisioning and without this commit
the screen gets locked. This prevents the lock and
we get to the desktop on the VMs.
Change-Id: Icd783127e898ece6bebb5598ab86f12d5062eeb5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
MSVC 2017 and Build Tools updated to version 15.1. Also missing
component 'Visual C++ compilers and libraries for ARM' installed
for winrt arm
Also script added to storage msvc version numbers to versions.txt
Change-Id: I015e15d5d613b178c1266a2aecee5c3270780486
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
After enabling QNX 7, we are moving some QNX 6.6 config
to be ran with qt5 integration only.
Task-number: QTQAINFRA-1111
Change-Id: I230b5f8b8631558ccfa156ae4f949ed045c40972
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
If normal fontconfig paths are used, qemu parses what ever files it finds from
the toolchain sysroot and the rest from the system fonts. Fix by copying the
system font configurations to a location which prefix that can't be found from
the toolchain sysroot. Links must also be dereferenced or their targets remain
pointing to the toolchain sysroot.
Task-number: QTBUG-59966
Change-Id: I9710c9fdebe81114080f47f1f59b2a049f87c070
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Default shell for 'qt' user is Dash. It doesn't read .bashrc
at all. Coin uses bash, but uses it non-interactively which
in .bashrc means that it bails out immediately. So same result,
.bashrc isn't read in Ubuntus.
Change-Id: Id466c86f8cc813aacd5f41c4b267b44e93759377
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Assuming that the JDK dmg will always be mounted via /dev/disk1s1 breaks
when another disk is present in the system and the DMG ends up at disk2
for example.
Change-Id: Ia196a6ae18f455144802167c0887bf18dafbc101
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Remove unused installation on macOS 10.10 as we only build packages
on 10.11.
* Replace the use of the ~1GB downloads of the zip files with a direct
extraction via NFS. This is more resilient to flakyness in the network
connection.
Change-Id: I1bfe5bbf00a6614233b517801daf130069094ec9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Instead of downloading a 4+GB archive and uncompressing it in /tmp,
let's uncompress the archive via NFS and feed the data straight into
cpio. This should be faster and avoids curl's error handling that's
happy to abort instead of re-trying.
Change-Id: Ifa5d842c50111ccdbd56e795b270ee6433a63adf
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Provision the INTEGRITY SDK and enable the builds
for Qt5 builds.
Task-number: QTBUG-59076
Task-number: QTBUG-59077
Change-Id: I448a16e45312b88eb5f710a600956c076480e253
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
The script neglected the result of the sha1 after download.
Even with a failure it exited nicely.
Change-Id: I6c0e25c2b764a0ad54acbe317eddf395a56d7f1c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
First test using QFont fails if fonts-noto-cjk is installed. This
happens because running fontcache for that font takes > 5 mins when
run on QEMU. Running fc-cache doesn't help since host version creates
cache for a wrong architecture and running armv7 fc-cache segfaults
on QEMU.
Change-Id: I6667b29ad4c4cae8d242e3af63defb603a6e6ec7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
This also fixes the 7Z extraction code to work on the windows 7 x86
installation where 7z is not in the PATH anymore with revision 2. The
fallback code was 64-bit only and needs the null check for ProgramFiles(x86)
along with the fall back to ProgramFiles to locate the 7z executable.
Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
When provisioning windows machine, it seems that detecting architecture
by checking [System.Environment]::Is64BitProcess doesn't work properly.
Instead pass 32 or 64 as an argument when calling powershell script.
Change-Id: I890ad141b8ef194275848d0e656431753463cd2b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Visual Studios will be pre-provisioned to tier1/vanilla os when visual
studio update is needed. Even if using pre-configured offline
installer with specific workload and components the installation is
still taking too long. This way we'll reduce provisioning time
significantly
Change-Id: I1f831aef648716dc640ce9cbfb4e63aa54e7afd0
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
This is needed to cross-build to 32bit x86 which WebEngine needs for
Boot2Qt ARM builds.
Task-number: QTBUG-59504
Change-Id: I9851d97949dc67c6f564cf09443b0a04998b2590
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Qt should not require command line tools to be installed.
When they are installed, we can accidentally rely on
on the tools instead of sysroot.
Task-number: QTBUG-58325
Change-Id: I9ad942c6f67e4c1b7348258a9178ab497ee58800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
