aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86_64
Commit message (Collapse)AuthorAgeFilesLines
* Pass compiler.runtime setting to conanKonstantin Tokarev2016-10-051-1/+2
| | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-042-0/+2
|\ | | | | | | | | | | | | Conflicts: coin/provisioning/common/helpers.ps1 Change-Id: I9bf6180f7d2ee1ff1c7722eed3c21d416ba7410e
| * Python to provisioning for WindowsHeikki Halmet2016-09-302-0/+2
| | | | | | | | | | | | | | | | | | 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>
* | Upgrade CMake to 3.6.2Konstantin Tokarev2016-09-301-0/+1
| | | | | | | | | | | | | | | | | | 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>
* | Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning WindowsKonstantin Tokarev2016-09-181-1/+1
| | | | | | | | | | 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-0/+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>
* | Added cmake_installer, imports and explicit library types to conanfilesKonstantin Tokarev2016-09-171-0/+15
| | | | | | | | | | | | Task-number: QTQAINFRA-997 Change-Id: I70b51a47c12928944d9f48be13332fce12296af1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Changed BuildinfoDir of conan to use Coin-compatible compiler nameKonstantin Tokarev2016-09-171-1/+1
| | | | | | | | | | | | Task-number: QTQAINFRA-998 Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Install conan dependencies if there is conanfile.txt for moduleKonstantin Tokarev2016-09-141-0/+7
| | | | | | | | | | Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Added conanfiles for qtwebkitKonstantin Tokarev2016-09-141-0/+4
| | | | | | | | | | | | Task-number: QTQAINFRA-997 Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Install Conan on Win10Konstantin Tokarev2016-09-141-0/+1
| | | | | | | | | | | | | | | | 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-141-0/+1
|/ | | | | | | | 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>
* Clean up Windows provisioning scriptsFrederik Gladhorn2016-06-162-10/+0
| | | | | | | | The execution policy is set by the CI. The command usually fails as it is in the scritps right now since it must be run as admin. Change-Id: Ie31cb7fc15720cc6d76646bf475b3d60a02014d8 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Export CI_ICU_PATH variables on all windows templatesJędrzej Nowacki2016-05-301-0/+6
| | | | | | | | 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>
* Add script to install jom through powershellFrederik Gladhorn2016-04-281-0/+6
Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>