aboutsummaryrefslogtreecommitdiffstats
path: root/coin
Commit message (Collapse)AuthorAgeFilesLines
* 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 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>
* 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>
* Install conan from pip instead of exeKonstantin Tokarev2016-11-1610-14/+10
| | | | | | | | | 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-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>
* 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>
* 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>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-0413-0/+144
|\ | | | | | | | | | | | | Conflicts: coin/provisioning/common/helpers.ps1 Change-Id: I9bf6180f7d2ee1ff1c7722eed3c21d416ba7410e
| * 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>
* | 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>
* | 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-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>
* | Install Conan on Win10Konstantin Tokarev2016-09-143-0/+9
| | | | | | | | | | | | | | | | 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-144-0/+29
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-121-0/+101
|\| | | | | | | | | | | | | Conflicts: coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh Change-Id: Ib972234bb644353db6920b2dcbe1fd4775ef1779
| * Android sdk and ndk to provisioning for qt5.6Heikki Halmet2016-09-121-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | Install latest Android sdk and ndk. It also runs update for SDK API level 18, latest SDK- and platform- tools and build-tools version 23.0.3. Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. Change-Id: Iddc353674a65e0af7a9036d9296b9c2933fa114f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-052-0/+6
|\| | | | | | | Change-Id: I1a08537bcd4748ebbb3e5a670e3a099779f33945
| * Fix Coin provisioning in RHEL 6 regarding sslclientkey valuesTony Sarajärvi2016-08-032-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug in RHELs subscription manager that caused yum not to work by fetching incorrect data into the sslclientkey repository parameter value. This provisioning script fetches new data for the repository and thus fixes yum. Naturally by not having a template where a bad repository exists, this script would be obsolete. Also, as this needs to be run before any other scripts using yum, prefixes were added to the scripts. Change-Id: I5c6ed1d43451d2918f9b6dad22b0106339f36aea Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-2011-50/+2
|\| | | | | | | Change-Id: I2e0204f745b482e4faa210ec7f8b95463267b3ca
| * Clean up Windows provisioning scriptsFrederik Gladhorn2016-06-1611-50/+2
| | | | | | | | | | | | | | | | 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>
* | Add script to patch QNX SDK headers for Qt atomicsFrederik Gladhorn2016-06-163-0/+116
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-1412-1/+50
|\| | | | | | | Change-Id: I4a97d7f5b12f9f5e082c44dea279e39417ccf1c4
| * OSX: Switch crash reporting to server mode.Erik Verbruggen2016-06-024-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Meaning: to unattended use, so no crash dialogs will pop up. In a later change we can suppress QTest from generating stack traces when this setting is *not* in server mode (meaning: the OS will take care of the stack traces). Change-Id: Idee9311f866228cd35ecb07889f1c19424981221 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * 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-306-0/+39
| | | | | | | | | | | | | | | | 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 freeopcua on Ubuntu 14.04Frederik Gladhorn2016-05-061-0/+49
|/ | | | | Change-Id: Ia13362cf9aa17fbc0e85ac61b1f2897101903aaf Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Add script that install icu on RHEL 6.6Jędrzej Nowacki2016-04-281-0/+70
| | | | | | | That is translation from coin-setup golang code to sh script Change-Id: Ic26d3877e56feb8b7f8e3ccd3405a044fb6afd8e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Add script to install jom through powershellFrederik Gladhorn2016-04-287-0/+68
| | | | | Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Add coin provisioning directoryFrederik Gladhorn2016-04-262-0/+13
Change-Id: I76c5c5b7a1ca41758964923d3eb5c9e644f468be Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 11:27:36 +0000