aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 submodules on '5.7' in qt5Liang Qi2016-11-262-0/+0
| | | | | Change-Id: I81e9785dce8bbbe6bada7d90732cda708c98d0a4 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.7' in qt5Liang Qi2016-11-2533-0/+0
| | | | | Change-Id: I5bc3cdd755a3e29c936c1db7c51d0e1418be3a97 Reviewed-by: Liang Qi <liang.qi@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>
* Update submodules on '5.7' in qt5Liang Qi2016-11-222-0/+0
| | | | | Change-Id: I96e1ca64b6c2f6d4abb318d8e55f865eb24d4465 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on '5.7' in qt5Liang Qi2016-11-201-0/+0
| | | | | Change-Id: Ibd8707fd3c3219d7777bb4a82cfbbbf31837e960 Reviewed-by: Liang Qi <liang.qi@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>
* Update submodules on '5.7' in qt5Liang Qi2016-11-185-0/+0
| | | | | Change-Id: I158e1550ffa19117258088b718dfaaa9d3f110df Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-172-10/+23
|\ | | | | | | Change-Id: I1c5420f9d0a192f55623b2d46aec7a15b7877609
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-165-0/+0
| | | | | | | | | | Change-Id: Ieda66165e735256fa25f335804f54d3574bdcd25 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * produce less ugly paths to the commit template in submodulesOswald Buddenhagen2016-11-141-1/+1
| | | | | | | | | | | | Change-Id: I7ebf3c46088e193c8f4605532c1f4a1b6d62d230 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * add --no-fetch optionOswald Buddenhagen2016-11-141-4/+12
| | | | | | | | | | | | | | | | | | there is no point in re-fetching all repositories just because an update failed due to local modifications. Change-Id: Ie9883586d77f3310058353844f0bbcfb0b775ebb Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-1133-0/+0
| | | | | | | | | | Change-Id: Ib475bf7c1fcab721cc884313a6c9dd1426a46ad6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * fix cloning of tagged versionsOswald Buddenhagen2016-11-041-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the .gitmodules of tagged commits typically refers to a release branch which was deleted shortly after the release. consequently, git clone --branch is bound to fail. of course, cloning a fixed sha1/tag requires no branch in the first place, so revert back to using git clone --no-checkout in that case. amends ac6168c0c. Task-number: QTBUG-49133 Change-Id: Ica032f1d07a70ad89f16b23bdf5cdab785612fdc Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-044-0/+0
| | | | | | | | | | Change-Id: Ic9d3ad8264dfc543f8bac4bda81b82c7f92fe176 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-11-039-0/+0
| | | | | | | | | | Change-Id: I3f4f3b15e3528c319c1479759282571759477faf Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Clean up usage of qtsvg as dependencyFrederik Gladhorn2016-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | There is no build dependency on QtSvg in qtdeclarative or qtquick1, so don't recommend it for builds. QtSensors on the other hand has an example that does need svg. This does not change anything in the big picture, the svg module will be built as always and svg files will be displayed. The change is the ordering of builds (leave more room for parallelization). Change-Id: I50e527e03a75742036d5f914611d0b34437a8e3a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-312-0/+0
| | | | | | | | | | Change-Id: Ib4bc5819e056a5571967aa9919d5a092834c28a7 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-296-0/+0
| | | | | | | | | | Change-Id: I4ef33095de23bbf2878f796e036ad6fd5e7d69df Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-279-0/+0
| | | | | | | | | | Change-Id: I4ecaec417836737c4d428dbfe69261666d1330eb Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-2212-0/+0
| | | | | | | | | | Change-Id: Iefe7bd1ea3f99dee7503a8ae2bc62ce965121029 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-144-0/+0
| | | | | | | | | | Change-Id: Id6ff55fb87154f79a136784c5fe4f63711183fa4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-114-0/+0
| | | | | | | | | | Change-Id: I62cae7b521df5e7c9073c3361017a74d3355a1e0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-091-0/+0
| | | | | | | | | | Change-Id: Iefa745df986d2794dfdcb7454733122334d5192c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2016-10-0815-0/+0
| | | | | | | | | | Change-Id: I186da5a92032e37abcfbaa96e393f2dd2304d181 Reviewed-by: Liang Qi <liang.qi@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>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 10:00:12 +0000