aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.7' in qt55.7Liang Qi2017-01-224-0/+0
| | | | | | Change-Id: I76217028f257a0e536bec7d2ba78f960925d5d55 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2017-01-1114-0/+540
|\ | | | | | | | | | | | | | | | | | | | | This change also includes an update of the CI platform configurations to the values that were previously in the CI source tree for builds of the 5.7 branch. This is done within the same change as the merge to preserve atomicity. Task-number: QTQAINFRA-1074 Change-Id: Ie7bde30bd64d439cd17ea789102550ab9fb44194
| * Add CI build configurationsSimon Hausmann2017-01-112-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | These files were previously stored in the CI source tree, but they do belong here. They describe the different configurations under which we want to build Qt and its submodules, in terms of underlying virtual machine template, host OS, target OS and CI related features that may also map to Qt configuration features. Task-number: QTQAINFRA-1074 Change-Id: I7ce48e3b15da757166eeac7531478d3746c8aa7f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Provision: Cmake 3.6.2Heikki Halmet2017-01-114-0/+212
| | | | | | | | | | | | | | | | Red Hat 6.6 needs cmake for GammaRay OpenSUSE 42.1 and Ubuntu 14.04 needs cmake for pyside Change-Id: I64b25be70057b86be7bfc96fb07446f7727bbefe Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add provision helper file to install compressed packagesTony Sarajärvi2017-01-111-0/+120
| | | | | | | | | | Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add DownloadURL.sh provisioning helper scriptTony Sarajarvi2017-01-111-0/+85
| | | | | | | | | | Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add provisioning try-catch helper script for bashTony Sarajarvi2017-01-111-0/+64
| | | | | | | | | | Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Improve build performance on WindowsSimon Hausmann2017-01-095-0/+15
| | | | | | | | | | | | | | | | | | Disable the windows search indexing service, which has a tendency to start indexing source code archives that we've just extracted. We are not interested in this service. Change-Id: I1d3f5178a035bc951499d993641a9315db9712ca Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2017-01-065-0/+25
|\| | | | | | | Change-Id: I9def17eb03e1c08d1e44c8f90841b1bf5160d638
| * Provisioning: Disable Windows DefenderSimo Fält2017-01-065-0/+25
| | | | | | | | | | | | | | This will reduct the timeouts coin has had recently with win machines. Change-Id: I32118f226194a3ea5e3c85d24103ec8341925d3c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Updated conan manifests after modification of packagesKonstantin Tokarev2016-12-2412-56/+62
| | | | | | | | | | | | Change-Id: I60eee501254d41b438085b7b687af6aa2c085dba Reviewed-by: Vitaliy Slobodin <vitaliy.slobodin@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-12-2118-0/+179
|\| | | | | | | | | | | | | Conflicts: coin/provisioning/common/02-python.ps1 Change-Id: I6b5f2c464cc350798c7c73fba9e79a3f4f534586
| * Remove shutdown "helpers" for macOSSimon Hausmann2016-12-214-34/+0
| | | | | | | | | | | | | | | | | | It turns out that they don't quite work the way we expected them to, and instead we Coin is going to shut down the VMs directly at the right time. Change-Id: I9f7a6f2f898002a25544fc513a0c2414fcd5c263 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Provision: Install pyside python dependencies to WindowsSimo Fält2016-12-191-0/+4
| | | | | | | | | | | | | | | | To test successfully pyside dependencies with Coin, we need python virtual env. Change-Id: I59c620b7da9c78d2b5c55e233d75597b747a8e84 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Provision: Install pyside python dependencies to LinuxSimo Fält2016-12-193-0/+15
| | | | | | | | | | | | | | | | To test successfully pyside dependencies with Coin, we need python-dev packages and virtual env. Change-Id: I29a5eed769798da4e4799eb5ccdff1cd032070d5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Provision: Android openssl 1.0.2j for Windows 7Heikki Halmet2016-12-162-0/+46
| | | | | | | | | | | | | | | | | | | | | | We are currently using too old openssl for Android builds in Windows 7. Openssl version need to be at least 1.0.1. This script will configure openssl 1.0.2j for Android using tools from msys. Change-Id: I9ab9a3b4f9f3953cf99bf15fee631f5a7961b42d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Improve disabling of screensaver on macOSSimon Hausmann2016-12-084-4/+96
| | | | | | | | | | | | | | | | | | | | Setting the idleTime on currentHost works well, until the hardware UUID changes and thus the host ID for the setting. With kvm that happens quite frequently, with vmware less but also occasionally (deep clone for example). By disabling the screensaver on start-up we can cover all cases quite easily. Change-Id: Ibdcf404430656f9caa47386ca3c732366ddfc8c7 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Suppress shutdown indicator in UbuntuJędrzej Nowacki2016-12-074-0/+12
| | | | | | | | | | | | | | | | | | We want to quit machines without being asked, if we are really sure. Change-Id: Ic7156f5b0fe236c0270d8c2e4fcc322a82776caf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Disable the screensaver on macOS definitely and permanentlySimon Hausmann2016-12-074-0/+12
| | | | | | | | | | | | Change-Id: I8856eebfe91b9e1cc2cc318a1e7ea80348f1486e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Fix paths for provisioning on macOSSimon Hausmann2016-12-074-0/+0
| | | | | | | | | | | | | | | | | | The directory names were missing the architecture, otherwise the content was unused. Change-Id: I0316da5c4b1352012f27ce330c3319a8aedf01ea Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Fix macOS provisioning not shutting down cleanlyFrederik Gladhorn2016-12-074-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | After provisioning we want the machine to be sensibly shut down since we will use the disk image later. VSphere doesn't manage to shut down 10.8 VMs. Help out by calling shutdown. For the other OS X/macOS versions, this is also desirable since controlling the power state of these machines is hard with different virtualization solutions (we're looking at OpenNebula/KVM). Change-Id: Ieabc14f9c8c1af9421a0ef91dd670f4790a84461 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | Update submodules on '5.7' in qt5Liang Qi2016-12-126-0/+0
| | | | | | | | | | Change-Id: I87579c99e2ee1c2b7ab4d1cf3d403443f215cddb Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-12-014-1/+122
|\| | | | | | | Change-Id: Ib22c9e0f5c3e7c256ca083de33e6ad0475f20ce9
| * don't fail to check out some modules in pinned modeOswald Buddenhagen2016-11-301-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when used without the --branch option, we clone with --no-checkout, to avoid unnecessarily checking out files twice when the recorded sha1 doesn't happen to be the tip of the default branch. however, that would leave the index in a dirty state which would make the subsequent submodule update abort at some point, silently. to deal with the problem, we ignore this type of index dirtyness and use submodule update with --force. Task-number: QTBUG-57289 Change-Id: I6fc9693b0eaadfb04d2d80f9c8f1f2e11be47ae9 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * refuse to operate with dirty submodulesOswald Buddenhagen2016-11-301-0/+28
| | | | | | | | | | | | | | | | the operation would later error out anyway, after spending a lot of time fetching the remotes, and leaving a partially updated state behind. Change-Id: Ib2a688e446a9bd4ba3b15fc73082224433c18388 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Update submodules on '5.6' in qt5Liang Qi2016-11-3035-0/+0
| | | | | | | | | | Change-Id: I88a559589ffd21c7436df6c644c92db21244860d Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Liang Qi2016-11-262-0/+0
| | | | | | | | | | Change-Id: Id212d3e785bef2ca0aa0d9fad3b7933369626643 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Add basic Ubuntu 16.04 provisioningFrederik Gladhorn2016-11-252-0/+48
| | | | | | | | | | Change-Id: Iaae5bb295bfd48cc5bc036baef9b0fa899d393ef Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.6' in qt5Liang Qi2016-11-2510-0/+0
| | | | | | | | | | Change-Id: I65e6b60cdc03f25d050854c68220fa96ee140bf6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Liang Qi2016-11-234-0/+0
| | | | | | | | | | Change-Id: I885a6ee78c480bda7f325a21d73d3f95863f9ad4 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Provision OPENSSL env variable for openSUSE 13.1Tony Sarajärvi2016-11-221-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | Fix building on OpenSuse after openssl update. Every linux distro seems to patch openssl in a different way to deal with broken/outdated SSL issues. We seem unable to detect what suse did when running configure, so this is a stop-gap measure. Change-Id: I5e375e9c5c1615358dbce0b8dd91476cb4f4e45b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.6' in qt5Liang Qi2016-11-225-0/+0
| | | | | | | | | | Change-Id: I73b32ee6ef5a643c78bb297230fb675a5a3dd64f Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Liang Qi2016-11-185-0/+0
| | | | | | | | | | Change-Id: I6635f499760dbd4b58e0c65150c886b64ece8391 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Copy conanfile to conanbuildinfos directoryKonstantin Tokarev2016-11-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conanfile is required for running "conan imports" as a part of "make install" procedure, however its original location is unknown to build system of module. Conanfile is copied with its conventional name "conanfile.txt" to avoid tying module build system to more qt5.git layout peculiarities. In future we may want to have several conanfiles in one provisioning dir, like qtwebkit-mingw.txt and qtwebkit-msvc.txt. Also simplified syntax of PowerShell variables interpolation, $() is needed only for interpolating expressions. Task-number: QTQAINFRA-998 Change-Id: I6904e80f4f85bb5269b0830272c6eaa2c8100789 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Updated conan to 0.16.0Konstantin Tokarev2016-11-304-2/+5
| | | | | | | | | | | | | | | | | | | | * Use --no-imports when installing packages, imports will be performed on "make install" step with new "conan imports" command. * Add txt generator to all conanfiles because it will be needed for "conan imports". Change-Id: Ie5e7ac6bfbf14dfa32ce82136b6be5e39476e393 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update submodules on '5.7' in qt5Liang Qi2016-11-262-0/+0
| | | | | | | | | | Change-Id: I81e9785dce8bbbe6bada7d90732cda708c98d0a4 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.7' in qt5Liang Qi2016-11-2533-0/+0
| | | | | | | | | | Change-Id: I5bc3cdd755a3e29c936c1db7c51d0e1418be3a97 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update Ruby on Win7Konstantin Tokarev2016-11-231-0/+1
| | | | | | | | | | | | | | | | | | QtWebKit requires newer Ruby than version installed on Windows 7 builders. Install the same version as is installed on Windows 10 builders. Task-number: QTQAINFRA-997 Change-Id: Id8e5d47028ef8403bb28daf1446d95dc8f2ab564 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Added conan zlib package for MinGW on Windows 7Konstantin Tokarev2016-11-233-0/+62
| | | | | | | | | | Change-Id: I48d904e95fce905b15b0099fee956c06773c4a75 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update submodules on '5.7' in qt5Liang Qi2016-11-222-0/+0
| | | | | | | | | | Change-Id: I96e1ca64b6c2f6d4abb318d8e55f865eb24d4465 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.7' in qt5Liang Qi2016-11-201-0/+0
| | | | | | | | | | Change-Id: Ibd8707fd3c3219d7777bb4a82cfbbbf31837e960 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | When installing Python ensure that pip is installed tooKonstantin Tokarev2016-11-181-0/+2
| | | | | | | | | | | | | | | | | | If Python is not deinstalled cleanly (01-windows_removethemall.ps1 just erases installation directory) pip is not bootstrapped by new installation. Fix it by running ensurepip module. Change-Id: I3a7ed87eed30118876d7022eed94b8a571677529 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Use full paths for invoking stuff from Python27\ScriptsKonstantin Tokarev2016-11-181-2/+4
| | | | | | | | | | Change-Id: I52094cc4b27b9e3a6fe3dd12c504777b8bb7bc75 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Fixed broken conan manifest in qtci-windows-7-x86Konstantin Tokarev2016-11-181-2/+2
| | | | | | | | | | Change-Id: I5c88b0d6e8ee6d8599b800a713d65111fbb4ad2a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Provisioning should fail in case of conan errorsKonstantin Tokarev2016-11-181-2/+9
| | | | | | | | | | Change-Id: I54ee86f5cf0f39cd7bafe71682b93a2a3c8fce5c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Rename conan.ps1 and python.ps1 file in configuration dirs tooKonstantin Tokarev2016-11-188-0/+0
| | | | | | | | | | | | | | | | Order of files really matters in configuration directories, but I renamed only main implementations in previous commit. Fixed that. Change-Id: Ia541fa8fd36b3d52580ba9814e9f4c38aadce460 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update submodules on '5.7' in qt5Liang Qi2016-11-185-0/+0
| | | | | | | | | | Change-Id: I158e1550ffa19117258088b718dfaaa9d3f110df Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-172-10/+23
|\| | | | | | | Change-Id: I1c5420f9d0a192f55623b2d46aec7a15b7877609
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-165-0/+0
| | | | | | | | | | Change-Id: Ieda66165e735256fa25f335804f54d3574bdcd25 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * produce less ugly paths to the commit template in submodulesOswald Buddenhagen2016-11-141-1/+1
| | | | | | | | | | | | Change-Id: I7ebf3c46088e193c8f4605532c1f4a1b6d62d230 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 20:57:31 +0000