Commit Graph

227 Commits

Author SHA1 Message Date
Konstantin Tokarev
25160f24b6 Upgrade CMake to 3.6.2
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>
(cherry picked from commit 77eeee64a4)
2017-02-07 19:25:07 +00:00
Simon Hausmann
0f4fdb9490 Merge remote-tracking branch 'origin/5.6' into 5.7
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
5.7 branch.

This is done within the same change as the merge to preserve atomicity.

Task-number: QTQAINFRA-1074
Change-Id: Ie7bde30bd64d439cd17ea789102550ab9fb44194
2017-01-11 16:29:06 +01:00
Simon Hausmann
5f40fd649e Improve build performance on Windows
Disable the windows search indexing service, which has a tendency to start
indexing source code archives that we've just extracted. We are not interested
in this service.

Change-Id: I1d3f5178a035bc951499d993641a9315db9712ca
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-01-09 13:37:16 +00:00
Simon Hausmann
15e1dc2054 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9def17eb03e1c08d1e44c8f90841b1bf5160d638
2017-01-06 20:35:52 +01:00
Simo Fält
167e4fc36f Provisioning: Disable Windows Defender
This will reduct the timeouts coin has had recently with win machines.

Change-Id: I32118f226194a3ea5e3c85d24103ec8341925d3c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-06 12:15:36 +00:00
Konstantin Tokarev
678fcb4e66 Updated conan manifests after modification of packages
Change-Id: I60eee501254d41b438085b7b687af6aa2c085dba
Reviewed-by: Vitaliy Slobodin <vitaliy.slobodin@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-24 07:32:20 +00:00
Konstantin Tokarev
7dc66c9528 Updated conan to 0.16.0
* 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>
2016-11-30 15:31:52 +00:00
Konstantin Tokarev
1bf242603c Rename conan.ps1 and python.ps1 file in configuration dirs too
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>
2016-11-18 22:19:14 +00:00
Konstantin Tokarev
f8e075a679 Install conan from pip instead of exe
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>
2016-11-16 21:25:32 +00:00
Konstantin Tokarev
19c10b941c Verify conan manifests when installing packages
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>
2016-11-16 21:25:21 +00:00
Konstantin Tokarev
93240adad1 Fixed conanfile options after packages were renamed
Change-Id: I4dbd3ec43bb6edfff7b9f98ac697cc7b70b09cda
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-16 21:25:15 +00:00
Konstantin Tokarev
05f4779eae Update package names and options in qtwebkit conanfiles
Task-number: QTQAINFRA-997
Change-Id: I19634c06041286fe44c787efe038d5ab24888b1f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-07 11:59:03 +00:00
Konstantin Tokarev
cf257c2869 Pass compiler.runtime setting to conan
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>
2016-10-05 21:25:35 +00:00
Liang Qi
eb78767825 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	coin/provisioning/common/helpers.ps1

Change-Id: I9bf6180f7d2ee1ff1c7722eed3c21d416ba7410e
2016-10-04 11:10:59 +02:00
Heikki Halmet
c9d71e9eeb Python to provisioning for Windows
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>
2016-09-30 08:31:18 +00:00
Konstantin Tokarev
77eeee64a4 Upgrade CMake to 3.6.2
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>
2016-09-30 07:20:41 +00:00
Konstantin Tokarev
23d1112839 Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows
Change-Id: I841783122edf82739826cc0a7672d8c809870e97
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-18 05:57:54 +00:00
Konstantin Tokarev
e1bfa77391 Do not use qmake and cmake generator automatically for each conanfile
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>
2016-09-17 11:06:44 +00:00
Konstantin Tokarev
fd6fe04cad Added cmake_installer, imports and explicit library types to conanfiles
Task-number: QTQAINFRA-997
Change-Id: I70b51a47c12928944d9f48be13332fce12296af1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-17 11:06:40 +00:00
Konstantin Tokarev
0958cc4cca Changed BuildinfoDir of conan to use Coin-compatible compiler name
Task-number: QTQAINFRA-998
Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-17 11:06:35 +00:00
Konstantin Tokarev
78a764ee65 Install conan dependencies if there is conanfile.txt for module
Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-14 22:31:17 +00:00
Konstantin Tokarev
b6414f7d08 Added conanfiles for qtwebkit
Task-number: QTQAINFRA-997
Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-14 22:31:11 +00:00
Konstantin Tokarev
99ff42545f Install Conan on Win10
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>
2016-09-14 22:31:01 +00:00
Konstantin Tokarev
90f5a25c66 Update Ruby on Win10
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>
2016-09-14 22:30:52 +00:00
Frederik Gladhorn
0536b1e9e4 Clean up Windows provisioning scripts
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>
2016-06-16 10:15:18 +00:00
Jędrzej Nowacki
a97874523f Export CI_ICU_PATH variables on all windows templates
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>
2016-05-30 14:08:22 +00:00
Frederik Gladhorn
54f1bfd10c Add script to install jom through powershell
Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-04-28 07:54:48 +00:00