summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/conan.ps1
Commit message (Collapse)AuthorAgeFilesLines
* Install conan from pip instead of exeKonstantin Tokarev2016-11-161-50/+0
| | | | | | | | | This allows us to get it working on 32-bit Windows. Also renamed conan.ps1 and python.ps1 to get proper provisioning order. Change-Id: I2f21db7dd0edbacb4e44024d1c70b315fba55801 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Added MinGW support to conan.ps1, and conanfile for MinGW on Win 7Konstantin Tokarev2016-11-161-3/+8
| | | | | Change-Id: I0442437b33afd0195745a03301440e5eea6d4897 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Verify conan manifests when installing packagesKonstantin Tokarev2016-11-161-1/+2
| | | | | | | | | | | | | This check allows us to ensure authenticity of installed files. Manifests are sorted to minimize diffs in future updates. Manifests lack trailing newline, because adding it would break manifest parser of conan 0.15.0. Task-number: QTQAINFRA-998 Change-Id: I6db75a78ce552da29d63cc4ac03726df326b7be2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Upgraded conan to 0.15.0Konstantin Tokarev2016-11-091-3/+3
| | | | | Change-Id: I9219094dfffb4edd90fcab00fb28c8b7658cfb42 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Log arguments passed to Start-Process in Run-Conan-InstallKonstantin Tokarev2016-10-051-1/+7
| | | | | | Task-number: QTQAINFRA-998 Change-Id: Ic27762a0403132cb8c2dcdb9f5a83ae9292e2d2a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* 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>
* 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>
* 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>