aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common
Commit message (Collapse)AuthorAgeFilesLines
* Pass compiler.runtime setting to conanKonstantin Tokarev2016-10-051-3/+8
| | | | | | | | | | When MSVC is not autodected, necessary setting compiler.runtime has undefined value, breaking installation of packages. This setting is not supported by MinGW, so it should be optional. Task-number: QTQAINFRA-998 Change-Id: Ia1a09eee14275314c160c7c45cd6ab276367dcdb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Execute Conan installer synchronouslyKonstantin Tokarev2016-10-051-1/+1
| | | | | | | | | | | PowerShell runs .exe's asynchronously by default, unlike all other commands. This behavior creates race condition when conanfile processing starts before conan installation is completed. Addition of "| Out-Null" to installer invocation makes it synchronous. Task-number: QTQAINFRA-998 Change-Id: Ic423514f15886e6ad9eb5c9422dd5382a3362380 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-043-0/+134
|\ | | | | | | | | | | | | Conflicts: coin/provisioning/common/helpers.ps1 Change-Id: I9bf6180f7d2ee1ff1c7722eed3c21d416ba7410e
| * Python to provisioning for WindowsHeikki Halmet2016-09-303-0/+154
| | | | | | | | | | | | | | | | | | Installs Python version 2.7.10. Python is required for building Qt 5 from source. More specifically qtdeclarative and qtwebkit require it. Change-Id: I63c8f3294a8a4799df5e52fbd41a36db8686950e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Revert "Changed slash direction in CI_CONAN_BUILDINFO_DIR"Konstantin Tokarev2016-10-011-1/+1
| | | | | | | | | | | | | | | | | | This actually breaks conan integration in Coin instead of fixing it. This reverts commit b0b0c9c471359393697389c870aaaad51dbb022f. Change-Id: Ifbdc9dbfd89d5b670221463e6d303691ad45936d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Upgrade CMake to 3.6.2Konstantin Tokarev2016-09-301-0/+10
| | | | | | | | | | | | | | | | | | QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on Windows 10 machines. Task-number: QTQAINFRA-996 Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Changed slash direction in CI_CONAN_BUILDINFO_DIRKonstantin Tokarev2016-09-261-1/+1
| | | | | | | | | | Change-Id: I13bea231301f12a3992abc11119fc34543e75ab2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning WindowsKonstantin Tokarev2016-09-181-2/+2
| | | | | | | | | | Change-Id: I841783122edf82739826cc0a7672d8c809870e97 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Do not use qmake and cmake generator automatically for each conanfileKonstantin Tokarev2016-09-171-1/+1
| | | | | | | | | | | | | | | | | | Keep conanfiles self-contained. "txt" generator is not going to be used by coin internally, drop it. Task-number: QTQAINFRA-998 Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Install conan dependencies if there is conanfile.txt for moduleKonstantin Tokarev2016-09-141-0/+26
| | | | | | | | | | Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Install Conan on Win10Konstantin Tokarev2016-09-141-0/+7
| | | | | | | | | | | | | | | | QtWebKit will use Conan to install 3rd party dependencies like ICU. Task-number: QTQAINFRA-997 Change-Id: I4b9bfeb86b28abfdef52afcf249428c3ec41f32a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update Ruby on Win10Konstantin Tokarev2016-09-142-0/+27
| | | | | | | | | | | | | | | | QtWebKit requires newer Ruby than version installed on Windows 10 builders. Task-number: QTQAINFRA-997 Change-Id: Id4f917a824daaab4aeb1445a3a16906663208b6d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Add script to patch QNX SDK headers for Qt atomicsFrederik Gladhorn2016-06-161-0/+51
|/ | | | | | | | Applies http://www.qnx.com/download/feature.html?programid=27555 to the QNX SDK on our continuous integration machines. Change-Id: I6d24b5024b3e5981c30bbf9a26a1bb4dfaca4e80 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Export CI_JOM_PATH variable on all templates with jomJędrzej Nowacki2016-05-301-0/+2
| | | | | | | | That is needed to change provisioning way in Coin, as currently it depends on variables hard-coded in Coin agent. Change-Id: I0bc5c76717e994824b85a4353a7218db4b648344 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Export CI_ICU_PATH variables on all windows templatesJędrzej Nowacki2016-05-301-0/+9
| | | | | | | | That is needed to change provisioning way in Coin, as currently it depends on variables hard-coded in Coin agent. Change-Id: I15068bec57dd9d67be05ef753d566b456fb8a2fc Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Coin provisioning: overwrite files while unzippingJędrzej Nowacki2016-05-301-1/+1
| | | | | Change-Id: I5cf59322f5a34cffe9fe8668755800bccb8cc13a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Add script to install jom through powershellFrederik Gladhorn2016-04-282-0/+38
Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 12:57:29 +0000