aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added MinGW support to conan.ps1, and conanfile for MinGW on Win 7Konstantin Tokarev2016-11-166-633/+666
| | | | | Change-Id: I0442437b33afd0195745a03301440e5eea6d4897 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Verify conan manifests when installing packagesKonstantin Tokarev2016-11-1619-1/+1273
| | | | | | | | | | | | | 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>
* Fixed conanfile options after packages were renamedKonstantin Tokarev2016-11-162-4/+4
| | | | | Change-Id: I4dbd3ec43bb6edfff7b9f98ac697cc7b70b09cda Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-11-167-0/+0
| | | | | Change-Id: Ia039f19c48f0e6140da7113288cd4c3b5e71ffd9 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-11-1213-0/+0
| | | | | Change-Id: I78258b727f35536b5ec7852a175922f0852653cf Reviewed-by: Liang Qi <liang.qi@qt.io>
* Upgraded conan to 0.15.0Konstantin Tokarev2016-11-091-3/+3
| | | | | Change-Id: I9219094dfffb4edd90fcab00fb28c8b7658cfb42 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Upgrade CMake to 3.6.2 on Windows 7 builderKonstantin Tokarev2016-11-071-0/+1
| | | | | | Task-number: QTQAINFRA-996 Change-Id: I84867a5b630c4cf1e712047c58c6cad9e5e43800 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update package names and options in qtwebkit conanfilesKonstantin Tokarev2016-11-072-16/+14
| | | | | | Task-number: QTQAINFRA-997 Change-Id: I19634c06041286fe44c787efe038d5ab24888b1f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-11-057-0/+0
| | | | | Change-Id: I8c0dd734d7e74a7ccd6419211de705be4bf5dd25 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-11-035-0/+0
| | | | | Change-Id: I7b50d64a16e3dfbfdfc153cc06c2dd0af73734f5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-2910-0/+0
| | | | | Change-Id: Ib7052a661f2b881e5dd45e7e0660ac3b9f2be0b0 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-236-0/+0
| | | | | Change-Id: I346c0d758f888c917e57c5e784063d26fc87ccb4 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-156-0/+0
| | | | | Change-Id: I37d33578ba4b2e48403226c8a41ff289f77ebf1a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-148-0/+0
| | | | | Change-Id: If8ce107ce65ebde81732c1ccbc1b2212eb2ac89b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-101-0/+0
| | | | | Change-Id: Ib91dfec2ce8b7e794a26367f658581672d5cc2e2 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-0712-0/+0
| | | | | Change-Id: I0fcbfa1705b1c2a93f5ced9a07d300e18ae9b7b3 Reviewed-by: Liang Qi <liang.qi@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-053-5/+12
| | | | | | | | | | 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>
* Update submodules on '5.7' in qt5Liang Qi2016-10-051-0/+0
| | | | | Change-Id: Ifb5d6145b2c4b4bf881cf6414d2b5c76382c8757 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-0413-0/+144
|\ | | | | | | | | | | | | Conflicts: coin/provisioning/common/helpers.ps1 Change-Id: I9bf6180f7d2ee1ff1c7722eed3c21d416ba7410e
| * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-300-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ifffec3df90687a6ad84547bb0f603b0446bf0e9d
| | * Update submodules on '5.6.2' in qt5v5.6.2Qt Submodule Update Bot2016-09-252-0/+0
| | | | | | | | | | | | | | | Change-Id: I337a9d4897efe57d3ac09d9981bb2b07f96a9d87 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Update submodules on '5.6.2' in qt5Qt Submodule Update Bot2016-09-232-0/+0
| | | | | | | | | | | | | | | Change-Id: I47372eb19e0f038e1ec1999a183125ed1c5300c7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Update submodules on '5.6.2' in qt5Qt Submodule Update Bot2016-09-1616-0/+0
| | | | | | | | | | | | | | | Change-Id: I623adf43a36ff5cd8de844ae533063523efe2b02 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Update submodules on '5.6.2' in qt5Qt Submodule Update Bot2016-09-0516-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie03202844e195a89cb536fde6b3c357929737cf8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Adjust submodule branchesOswald Buddenhagen2016-08-241-34/+34
| | | | | | | | | | | | Change-Id: Ibc4de8e8a06cf2391ae33be2d02fc21f4e3ab70f
| * | Python to provisioning for WindowsHeikki Halmet2016-09-3013-0/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-10-0215-0/+0
| | | | | | | | | | | | | | | Change-Id: Icb268cea1648c3219be1bb2ac8d9819971e9a033 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | 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-303-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-09-281-1/+1
|\| | | | | | | | | | | Change-Id: Ibf285f0d67fc5125c1c7da6dfc5b62b834d34867
| * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-273-0/+0
| | | | | | | | | | | | | | | Change-Id: I76cd6f71dd61e2478b73d39163e7fbe4b8f6afe6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-241-0/+0
| | | | | | | | | | | | | | | Change-Id: Ifa9a8c1e59cf8e286c4a52b6936720da76f92073 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-249-0/+0
| | | | | | | | | | | | | | | Change-Id: I66d3689ab56b1b8b1c754ced12456ff7e86052f7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-1819-0/+0
| | | | | | | | | | | | | | | Change-Id: Id7fba5c79f44c2081ed49ce8f7050b8eacfb76ef Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-09-136-0/+0
| | | | | | | | | | | | | | | Change-Id: Id80b5734e19aa6f15d90b11abef9f9c183290292 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | Add Qt Android Extras as dependency for Qt PurchasingEskil Abrahamsen Blomfeldt2016-09-131-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-284-0/+0
| | | | | | | | | | | | | | | Change-Id: Id084a6f6a3ce4109beb1f36088afe2914ffa7735 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Changed slash direction in CI_CONAN_BUILDINFO_DIRKonstantin Tokarev2016-09-261-1/+1
| | | | | | | | | | | | | | | Change-Id: I13bea231301f12a3992abc11119fc34543e75ab2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-251-0/+0
| | | | | | | | | | | | | | | Change-Id: I10f0169fa184c4f0c297af4b8f8795a711d88e58 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-2510-0/+0
| | | | | | | | | | | | | | | Change-Id: I2a5733b235e381990aa51c87af3d69fa2582541f Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update submodules on '5.7' in qt5Qt Submodule Update Bot2016-09-237-0/+0
| | | | | | | | | | | | | | | Change-Id: I0471e3be4be3b6109fe2afab79ba26915eede933 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update submodules on '5.7' in qt5Liang Qi2016-09-2029-0/+0
| | | | | | | | | | | | | | | Change-Id: Ibdccfa62d894d5e2b3a72bf09d72b4c9c7ff1981 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning WindowsKonstantin Tokarev2016-09-183-4/+4
| | | | | | | | | | | | | | | Change-Id: I841783122edf82739826cc0a7672d8c809870e97 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Do not use qmake and cmake generator automatically for each conanfileKonstantin Tokarev2016-09-173-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-172-0/+30
| | | | | | | | | | | | | | | | | | 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-172-2/+2
| | | | | | | | | | | | | | | | | | 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-143-0/+40
| | | | | | | | | | | | | | | Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Added conanfiles for qtwebkitKonstantin Tokarev2016-09-142-0/+8
| | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-997 Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 23:59:35 +0000