aboutsummaryrefslogtreecommitdiffstats
path: root/coin
Commit message (Collapse)AuthorAgeFilesLines
* Set the list of submodules to those needed for Qbswip/qbs/masterwip/qbs/1.10Jake Petroules2017-11-142-31/+0
| | | | Change-Id: I8b4dc36d4b0a3af7eb393a4c7fd28b7db29989f2
* Merge remote-tracking branch 'origin/5.6.3' into 5.6Liang Qi2017-09-1812-2/+101
|\ | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c
| * Ensure 'clean' android Installationv5.6.3Heikki Halmet2017-09-151-1/+7
| | | | | | | | | | | | | | | | 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>
| * Provision and build QNX660 on Win 10 x64Tony Sarajärvi2017-09-143-0/+49
| | | | | | | | | | | | | | | | | | 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>
| * provisioning: install MinGW 530 and 630 for Win10 x64Tony Sarajärvi2017-09-143-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Provisioning: Invoke installer with Start-ProcessTony Sarajärvi2017-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
| * Provision: Move Python3 scripts from win8 to win8.1 folderTony Sarajärvi2017-09-144-0/+0
| | | | | | | | | | | | | | | | 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>
* | Provisioning: Fix shasum pathSimo Fält2017-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | Commit c48355ebb58cb058df5b2ca519b6b89fbd09f380 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>
* | Provisioning: Fix DownloadURL utility's shasum checkSimo Fält2017-09-051-1/+2
| | | | | | | | | | | | | | | | MacOS 10.10 has older shasum tool, which does not support oneliner verification. Change-Id: If00b846d5772aa1991960675d022249d63e7bd77 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Provisioning: Hide powershell progress bar for performanceTony Sarajärvi2017-09-041-0/+1
| | | | | | | | | | Change-Id: I74abdcc2e7d2dccf4f85cd64fe5fb4b56e54d613 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Fix Add-Path helper function and start using it in scriptsJoni Jäntti2017-09-044-5/+7
|/ | | | | | | | 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>
* Build Windows MSVC2013 & MSVC2015 32bit binaries on 64bit hostAkseli Salovaara2017-09-041-2/+2
| | | | | | | | | | 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>
* Add UploadConfigureExe featureAapo Keskimolo2017-09-022-13/+13
| | | | | | | | | 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>
* Provision vanilla Windows 8.1 x86 and use itTony Sarajärvi2017-09-0140-92/+241
| | | | | | | | | | | | | 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>
* provisioning: windows: ICUJoni Jäntti2017-09-011-2/+118
| | | | | | | | 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>
* Make CI use a new provisioned Win 10 templateJoni Jäntti2017-09-0113-4/+15
| | | | | | | | | | | | 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>
* Install python3 on all platformsSimo Fält2017-08-3018-1/+319
| | | | | | | | | | | 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 a5f3f8ed482d314d092e1a6ddc5568839bb59c74) (cherry picked from commit a7658388892bc70c3c5f3a6f6e31639ef5b766d1) (cherry picked from commit 1859f9b26ce0177cb83e917148b10ff08bb25db7)
* Fix code duplication for cmake installation on LinuxSimon Hausmann2017-08-303-106/+55
| | | | | | | Share the code for installing cmake on Linux. Change-Id: I535f2696151ea4db26dc7194a1fe7016799ed0e2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix adding to path lines for Windows provisioning scriptsJoni Jäntti2017-08-302-1/+6
| | | | | | | | | | | 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>
* Provisioning: Fine tune cmake provisioning scriptTony Sarajärvi2017-08-301-4/+51
| | | | | | | | Add version printing and move version strings to variables for easier reuse. Change-Id: I5372872bf455609dfb7cc7bbcf7a110cd71933fb Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Provisioning: Add $PATH properly in .bashrcTony Sarajärvi2017-08-302-2/+2
| | | | | | | | | | | 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>
* Provisioning: Disable system updatesHeikki Halmet2017-08-165-0/+56
| | | | | | | | This change will disable system updates from App Store to prevent unnecessary network load Change-Id: I7915ec6ffce681a850abef59d58f953effd6deb0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Make CI use a new win 8.1 provisioning instead of win 8Joni Jäntti2017-08-1159-206/+810
| | | | | | | | | | | | | 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 8 template. Made all the Windows platforms use the scripts under provisioning/common/ instead of duplicate files. Task-number: QTQAINFRA-1357 Change-Id: Ic3f0b50079b212437fff711379f243753ab84872 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update provisioning scripts with new intra.qt.io addressTony Sarajärvi2017-08-0814-20/+20
| | | | | Change-Id: I9b4c5e9d0fe8e0e84596ad9086f563d11e97930b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove unused provisioning scriptsSimon Hausmann2017-08-047-167/+0
| | | | | | | | | RHEL 7.2, Ubuntu 15.04, 16.04 and OpenSuSE 42.1 are not used in the Qt 5.6 branch. Let's remove the scripts to avoid confusion. Change-Id: I3829ea320ad77ebd25c9cf5bebfeed89f37f44dc Reviewed-by: Simo Fält <simo.falt@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Add Documentation feature to one Ubuntu 14.04 buildFrederik Gladhorn2017-08-041-1/+1
| | | | | | | | | When creating packages, we build the docs on one configuration. Previously that was done by magic inside the continuous integration system. Make it a bit less magic by having a flag for it. Change-Id: Iee5be7037023929b319beffaacb1592dc87d6078 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Provisioning: Fix virtualenv in macOS 10.11Simo Fält2017-07-191-0/+17
| | | | | | | | | | 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>
* Use updated Ubuntu 14.04 in CIJędrzej Nowacki2017-07-181-4/+4
| | | | | | | | | | | | | The system packages in the base template were updated via apt-get on 12.07.2017. We hoped that it will solve mysterious problem of a network interface being randomly disabled. Sadly we had no luck, but getting all security updates also make sense. Change-Id: I34d7a56a2c5530376f74bb35faf461e2e18da14a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Centralize Mesa LLVMPipe installation on WindowsSimon Hausmann2017-06-207-11/+68
| | | | | | | | | | | 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>
* Fix Postgresql and Mysql environment variablesSimon Hausmann2017-06-122-8/+8
| | | | | | | | | | | | | | | | | | 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 ce47238ed94f3a989c13fef93b037904589910cf but only noticed in the 5.9 branch. Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Remove QNX Windows buildsSimon Hausmann2017-06-071-2/+0
| | | | | | | | | We can't get those to work with the faster KVM based VMs, so disable these builds for the time being. Task-number: QTQAINFRA-1208 Change-Id: I74c19374d57e3f84d8f982b95aade4a779623228 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Disable tests on macOS 10.10Simon Hausmann2017-06-071-1/+1
| | | | | | | | | | | We cannot run graphical tests reliably on 10.10 anymore with the new virtualization without vmware. As outlined in the referenced task, we occasionally get the Window Server locking up. So for the time being, this change disables testing on 10.10. Task-number: QTQAINFRA-1198 Change-Id: I020d4a298562554838cd7e898df52438db536d7a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Clean up windows cleanup scriptSimon Hausmann2017-06-066-6/+6
| | | | | | | | | | | | | * 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>
* Speed up Windows installation of cmake, python, opengl, mysys and AndroidSimon Hausmann2017-06-067-10/+10
| | | | | | | | | 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>
* Speed up Visual Studio update installationSimon Hausmann2017-06-063-34/+62
| | | | | | | | | | 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>
* Improve Postgresql installation on WindowsSimon Hausmann2017-06-063-23/+44
| | | | | | | | | 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>
* Improve mysql installationSimon Hausmann2017-06-061-44/+34
| | | | | | | | | | | | | | | | | | * 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>
* MSVC 2017 updated and missing component for winrt armHeikki Halmet2017-05-036-7/+93
| | | | | | | | | | | 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>
* Improve Android SDK/NDK installation on macOSSimon Hausmann2017-04-242-123/+10
| | | | | | | | | | | | * 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>
* Provisioning: MSVC 2017 Build ToolsHeikki Halmet2017-04-244-5/+101
| | | | | | | MSVC 2017 build tools are pre-provisioned to windows 10 templates Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Provisioning: Change tier1 templates for Windows 10Heikki Halmet2017-04-136-6/+162
| | | | | | | | These tier 1 templates includes changes needed by 5.9, but we can use these same tier 1 templates for 5.6 also Change-Id: I3ad0d75ab89f7b6502b758fb94f984cc6e0b7f16 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix provision help script DownloadURL.shTony Sarajärvi2017-04-101-0/+4
| | | | | | | | 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>
* Provisioning: Bug fix patch for msvc 2015 update 3Heikki Halmet2017-03-312-0/+100
| | | | | | | This bug fix patch is needed for QtWebEngine Change-Id: Id2c624461fbe27d9fd12a149281cae324bf8b14e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Coin provisioning: Use arg instead of autodetecting architectureSimo Fält2017-03-3012-32/+28
| | | | | | | | | 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>
* Provisioning: Move Visual Studio installation to pre-provisioningHeikki Halmet2017-03-226-71/+10
| | | | | | | | | | | 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>
* Provision: Storage icu version to versions.txtHeikki Halmet2017-02-281-0/+3
| | | | | | | ~/versions.txt will be used to storage sw version information Change-Id: Ia84e0fc55f5bbcf4afd902ce601556defcc565a0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Update opengl32.dll x86 on Windows 10 x64Akseli Salovaara2017-02-101-0/+63
| | | | | | | | | | OpenGL32 update is needed for autotests to pass. At least tst_qglbuffer vertexBuffer will fail without an update. This update is already in place on Windows x86 and x64 CI hosts but applied only to System32 -folders. Change-Id: I223ffc53ecba77030385f29463c419acdc12e1a3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Install postgresql x86 and x64 libraries to Windows 10Akseli Salovaara2017-02-101-0/+84
| | | | | | | | Install both x86 and x64 libraries in order to enable Windows x86 builds on Windows x64 hosts. Environment variables are used by Coin. Change-Id: Ied654efb2f33ab1c643f38a1ea50a127aeb7af7e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Install OpenSSL x86 and x64 libraries to Windows 10 x64Akseli Salovaara2017-02-101-0/+86
| | | | | | | | Install both x86 and x64 libraries in order to enable Windows x86 builds on Windows x64 hosts. Environment variables are used by Coin. Change-Id: Idada7fc41202298c6f1b2919f0f4343b717e890a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Provisioning: Install MySQL x86 and x64 libraries to Windows10 x64Akseli Salovaara2017-02-101-0/+112
| | | | | | | | Install both x86 and x64 libraries in order to enable Windows x86 builds on Windows x64 hosts. Environment variables are used by Coin. Change-Id: I8eea51a0bfd05bc72d1d004649211c7bc5901d97 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>