From 9584900b5ce8d103a58a6a8355c657998dbe053b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 24 Aug 2016 11:52:19 +0200 Subject: Adjust submodule branches Change-Id: Ibc4de8e8a06cf2391ae33be2d02fc21f4e3ab70f --- .gitmodules | 68 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.gitmodules b/.gitmodules index 743e2e8e..9db3a307 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.6 + branch = 5.6.2 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.6 + branch = 5.6.2 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.6 + branch = 5.6.2 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.6 + branch = 5.6.2 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.6 + branch = 5.6.2 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.6 + branch = 5.6.2 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.6 + branch = 5.6.2 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.6 + branch = 5.6.2 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.6 + branch = 5.6.2 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtsystems"] depends = qtbase @@ -136,130 +136,130 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git - branch = 5.6 + branch = 5.6.2 status = preview [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.6 + branch = 5.6.2 status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.6 + branch = 5.6.2 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.6 + branch = 5.6.2 status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 5.6 + branch = 5.6.2 status = deprecated [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.6 + branch = 5.6.2 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.6 + branch = 5.6.2 status = addon [submodule "qtquickcontrols2"] depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.6 + branch = 5.6.2 status = preview [submodule "qtpurchasing"] depends = qtbase -- cgit v1.2.3 From 4faee2071331d068a2c2b0ac62acc3d32b2fbc88 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 5 Sep 2016 13:08:22 +0300 Subject: Update submodules on '5.6.2' in qt5 Change-Id: Ie03202844e195a89cb536fde6b3c357929737cf8 Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 1de9d68b..c3dda3b4 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 1de9d68b2631de9432ab9929bb4b917604cc7be7 +Subproject commit c3dda3b45ca718c47b26a46f745a53c167e1eda4 diff --git a/qtbase b/qtbase index 881bda9e..c8a6b427 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 881bda9e6ecdd8729edf7df68f94f72f5d7c9042 +Subproject commit c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4 diff --git a/qtconnectivity b/qtconnectivity index 95513185..21e7cb1b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 95513185fd90cb9372a8cb8b541de7a3f41b12d4 +Subproject commit 21e7cb1bafdfc06c263e10067d02f9b103ff660f diff --git a/qtdeclarative b/qtdeclarative index 01a9c006..dcede8bb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 01a9c006b0cb3f9ec7c140d25e6bfa3ca6250a4c +Subproject commit dcede8bbe1a4e1401679d42bf7179305771d0c5a diff --git a/qtlocation b/qtlocation index fafc1584..7504b2ce 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit fafc158427e9d54298ce5c3419c1d4b6ec3b946e +Subproject commit 7504b2ce36a90261ba2409e4160570b58d8b38e0 diff --git a/qtmultimedia b/qtmultimedia index a52aa624..6d95682d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a52aa624e69fa618aa0d29c2a147a7d472751de1 +Subproject commit 6d95682d7ff282180655f2f384d8aba69c4f67af diff --git a/qtqa b/qtqa index 241894af..1c973844 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 241894afcef4469fa9d678da44c475b20fedc10b +Subproject commit 1c973844b78ef5ddf8ab2964bb57c95ff2c9ee87 diff --git a/qtquickcontrols b/qtquickcontrols index 5bd57528..846d04ce 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5bd57528b5cf7b22a81b1195d90b0a364c0428aa +Subproject commit 846d04cec8d946c28ddbeecc79c63553e0891736 diff --git a/qtsensors b/qtsensors index 8b79fc4e..46d9a630 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf +Subproject commit 46d9a630a88fc5388dec7fd99289d0e9e0e1f680 diff --git a/qtserialbus b/qtserialbus index b6be80ed..c8305c87 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b6be80ed75231b0ac3b853e4729837ab994301f9 +Subproject commit c8305c87f805dbeb6cb5b09ac086a7651ef8c857 diff --git a/qttools b/qttools index f067e5d7..a9e5e09f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f067e5d7e510842825be883dade904a9a4d3ec05 +Subproject commit a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e diff --git a/qttranslations b/qttranslations index 4925f90e..225e1740 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 4925f90e9ceb0b4081649d1fc1eec10beb65f722 +Subproject commit 225e1740fec4559bf8d66d915ddd06b9d4f48119 diff --git a/qtwayland b/qtwayland index 2cc75804..f2124674 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2cc758045e322873ad58f675a70c8d8366b5c318 +Subproject commit f21246748ce20cd86346e192fe0c4c76a9b08a7c diff --git a/qtwebengine b/qtwebengine index e9b510bb..2209add7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e9b510bbf2b1311761c2a2f98d4410ab9b17f9e5 +Subproject commit 2209add7a5b019afef7830d8bbf416fbb2a2ecf5 diff --git a/qtwebview b/qtwebview index 20c00be8..aad32ba9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 20c00be872220f547211b87a2d3d34e12bd0f3d8 +Subproject commit aad32ba922b900642e6e3db994d1aa55b24dc8c2 diff --git a/qtwinextras b/qtwinextras index 75385854..d80f8bcf 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 75385854e5973b28d13055d8896cb00380951466 +Subproject commit d80f8bcf503e607a3612343eacf8002c003b6588 -- cgit v1.2.3 From efc461a174b03cf3b5dea8c9768b3141e5130f50 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 16 Sep 2016 09:53:09 +0300 Subject: Update submodules on '5.6.2' in qt5 Change-Id: I623adf43a36ff5cd8de844ae533063523efe2b02 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebview | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qtbase b/qtbase index c8a6b427..f242b911 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4 +Subproject commit f242b91189e3bd0cc96dd1a2695eef0521099aea diff --git a/qtcanvas3d b/qtcanvas3d index 2778071f..85fe2daa 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 2778071f6c80b5397a183db37114aef881ade855 +Subproject commit 85fe2daab5ed14655b456df8821c9f5f606fdc12 diff --git a/qtconnectivity b/qtconnectivity index 21e7cb1b..bd764955 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 21e7cb1bafdfc06c263e10067d02f9b103ff660f +Subproject commit bd7649557e99be543b78492d96bb2982e0a3e4c4 diff --git a/qtdeclarative b/qtdeclarative index dcede8bb..c1d726fe 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dcede8bbe1a4e1401679d42bf7179305771d0c5a +Subproject commit c1d726fe19c83cf081042e55ace9d9d7b31c40e6 diff --git a/qtdoc b/qtdoc index aebe202e..2a3a8c9e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit aebe202ec85d3a8a04772713786ffab838101934 +Subproject commit 2a3a8c9e86c8b66ee4109e66a3c38835504a97b6 diff --git a/qtlocation b/qtlocation index 7504b2ce..7d01112c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7504b2ce36a90261ba2409e4160570b58d8b38e0 +Subproject commit 7d01112c36a98912706e9d33ce2e36126de0ccec diff --git a/qtmultimedia b/qtmultimedia index 6d95682d..20686cb5 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6d95682d7ff282180655f2f384d8aba69c4f67af +Subproject commit 20686cb51fb2dfa5973d636875e9fc20c2bde4f5 diff --git a/qtqa b/qtqa index 1c973844..e49c7d6f 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1c973844b78ef5ddf8ab2964bb57c95ff2c9ee87 +Subproject commit e49c7d6f19d1ac76137534ec696ce1a9f4a7dbdc diff --git a/qtquickcontrols b/qtquickcontrols index 846d04ce..59c6c0e0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 846d04cec8d946c28ddbeecc79c63553e0891736 +Subproject commit 59c6c0e0b1b5b46747595a58e11311b7393d7e70 diff --git a/qtsensors b/qtsensors index 46d9a630..922c2bb6 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 46d9a630a88fc5388dec7fd99289d0e9e0e1f680 +Subproject commit 922c2bb671c113b7e481fb86f823188b4bce1d3e diff --git a/qtserialbus b/qtserialbus index c8305c87..0a4a5f7e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c8305c87f805dbeb6cb5b09ac086a7651ef8c857 +Subproject commit 0a4a5f7e1cbca7bd8b797603025534368de02cb7 diff --git a/qtserialport b/qtserialport index b0e3e746..46ef9fdc 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b0e3e7469cf5249bb395d044c5344bbe88884553 +Subproject commit 46ef9fdc130a06bd80c5c004f0dc95c473f704c8 diff --git a/qtwayland b/qtwayland index f2124674..82e11583 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f21246748ce20cd86346e192fe0c4c76a9b08a7c +Subproject commit 82e11583928d47576c160d35c9df05c0eec34df8 diff --git a/qtwebengine b/qtwebengine index 2209add7..2f24e3c3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2209add7a5b019afef7830d8bbf416fbb2a2ecf5 +Subproject commit 2f24e3c307aecb657736310948c7cdaad5176678 diff --git a/qtwebkit b/qtwebkit index bb43bca1..b35917bc 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit bb43bca1664721401c3a2c25b585913bb5e8cb4f +Subproject commit b35917bcb44d7f200af0f4ac68a126fa0aa8d93d diff --git a/qtwebview b/qtwebview index aad32ba9..6313ae2b 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit aad32ba922b900642e6e3db994d1aa55b24dc8c2 +Subproject commit 6313ae2b2a4593d14b716201bf6cbb79d4812091 -- cgit v1.2.3 From 0ad453a0fd6780234c63d1cf572ef1cc666bd304 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 23 Sep 2016 08:10:38 +0300 Subject: Update submodules on '5.6.2' in qt5 Change-Id: I47372eb19e0f038e1ec1999a183125ed1c5300c7 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index f242b911..f050f218 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f242b91189e3bd0cc96dd1a2695eef0521099aea +Subproject commit f050f2180ffb8298de802b33ad9f017312df1815 diff --git a/qtwebengine b/qtwebengine index 2f24e3c3..ec845078 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2f24e3c307aecb657736310948c7cdaad5176678 +Subproject commit ec84507898e58a167b185ba674acf300cc695380 -- cgit v1.2.3 From c5557d43eea3c65591e37e3c79b6fa0f590c915b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 25 Sep 2016 12:17:01 +0300 Subject: Update submodules on '5.6.2' in qt5 Change-Id: I337a9d4897efe57d3ac09d9981bb2b07f96a9d87 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtrepotools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index f050f218..b4ada3f0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f050f2180ffb8298de802b33ad9f017312df1815 +Subproject commit b4ada3f0d8feed7dbff22aa780d38ab126020ac6 diff --git a/qtrepotools b/qtrepotools index 471da8d4..7b543793 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 471da8d402b5d7b5cf3a1d95b29e06edfd141699 +Subproject commit 7b5437939280b0788b4caa4a83f9193cfe8f97e7 -- cgit v1.2.3 From 77eeee64a43c5c448321b8f5ac7b64c872e14489 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 28 Sep 2016 13:07:43 +0300 Subject: 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 --- coin/provisioning/common/cmake.ps1 | 10 ++++++++++ coin/provisioning/qtci-windows-10-x86/cmake.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 | 1 + 3 files changed, 12 insertions(+) create mode 100644 coin/provisioning/common/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 new file mode 100644 index 00000000..6870f3a7 --- /dev/null +++ b/coin/provisioning/common/cmake.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\helpers.ps1" + +$zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip" + +Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-win32-x86.zip $zip +Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" + +Extract-Zip $zip C: +Remove-Item C:\CMake -Force -Recurse +Rename-Item C:\cmake-3.6.2-win32-x86 C:\CMake diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" -- cgit v1.2.3 From c9d71e9eeb925ee4236acefeb88b14d80d04ba5e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 9 Sep 2016 13:12:51 +0300 Subject: 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 --- .../common/01-windows_removethemall.ps1 | 61 +++++++++++++++++++++ coin/provisioning/common/helpers.ps1 | 29 ++++++++++ coin/provisioning/common/python.ps1 | 64 ++++++++++++++++++++++ .../01-windows_removethemall.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/python.ps1 | 1 + .../01-windows_removethemall.ps1 | 1 + .../provisioning/qtci-windows-10-x86_64/python.ps1 | 1 + .../01-windows_removethemall.ps1 | 1 + coin/provisioning/qtci-windows-7-x86/python.ps1 | 1 + .../01-windows_removethemall.ps1 | 1 + coin/provisioning/qtci-windows-8-x86/python.ps1 | 1 + .../01-windows_removethemall.ps1 | 1 + coin/provisioning/qtci-windows-8-x86_64/python.ps1 | 1 + 13 files changed, 164 insertions(+) create mode 100644 coin/provisioning/common/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/common/python.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/python.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/python.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/python.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/python.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/python.ps1 diff --git a/coin/provisioning/common/01-windows_removethemall.ps1 b/coin/provisioning/common/01-windows_removethemall.ps1 new file mode 100644 index 00000000..8285ddae --- /dev/null +++ b/coin/provisioning/common/01-windows_removethemall.ps1 @@ -0,0 +1,61 @@ +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +Function Remove { +Param ( + [string]$1 + ) + If (Test-Path $1){ + echo "Remove $1" + Remove-Item -Recurse -Force $1 + }Else{ + echo "'$1' does not exists or already removed !!" + } + +} + +Function Remove-Path { + Param ( + [string]$Path + ) + echo "Remove $path from Path" + $name = "Path" + $value = ([System.Environment]::GetEnvironmentVariable("Path").Split(";") | ? {$_ -ne "$path"}) -join ";" + $type = "Machine" + [System.Environment]::SetEnvironmentVariable($name,$value,$type) +} + +# Remove Python +Remove C:\Python27 +Remove-Path C:\python27\scripts +Remove-Path C:\python27 diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index d7b957f3..0e684452 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -29,3 +29,32 @@ function Extract-Zip $destinationFolder = $shell.Namespace($Destination) $destinationFolder.CopyHere($zipfile.Items(), 16) } + +function BadParam +{ + Param ([string]$Description) + throw("You must specify $Description") +} + +function Download +{ + Param ( + [string] $OfficialUrl = $(BadParam("the official download URL")), + [string] $CachedUrl = $(BadParam("the locally cached URL")), + [string] $Destination = $(BadParam("a download target location")) + ) + try { + Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination + } catch { + Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination + } +} + +function Add-Path +{ + Param ( + [string]$Path + ) + echo "Adding $Path to Path" + [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine) +} diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 new file mode 100644 index 00000000..39d8146d --- /dev/null +++ b/coin/provisioning/common/python.ps1 @@ -0,0 +1,64 @@ +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script installs Python $version. +# Python is required for building Qt 5 from source. + +$version = "2.7.10" +$package = "C:\Windows\temp\python-$version.msi" + +# check bit version +if ([System.Environment]::Is64BitProcess -eq $TRUE) { + $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.amd64.msi" + $sha1 = "f3a474f6ab191f9b43034c0fb5c98301553775d4" +} +else { + $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.msi" + $sha1 = "9e62f37407e6964ee0374b32869b7b4ab050d12a" +} + +echo "Fetching from URL..." +Download $externalUrl $internalUrl $package +Verify-Checksum $package $sha1 +echo "Installing $package..." +cmd /c "$package /q" +# We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB +echo "Chancing allowZip64 value to 'True'..." +(Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py +echo "Remove $package..." +del $package +Add-Path $path diff --git a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 new file mode 100644 index 00000000..3bb0af0e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/python.ps1 b/coin/provisioning/qtci-windows-10-x86/python.ps1 new file mode 100644 index 00000000..5f8aa2f8 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 new file mode 100644 index 00000000..3bb0af0e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/python.ps1 b/coin/provisioning/qtci-windows-10-x86_64/python.ps1 new file mode 100644 index 00000000..5f8aa2f8 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 new file mode 100644 index 00000000..3bb0af0e --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/python.ps1 b/coin/provisioning/qtci-windows-7-x86/python.ps1 new file mode 100644 index 00000000..5f8aa2f8 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 new file mode 100644 index 00000000..3bb0af0e --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/python.ps1 b/coin/provisioning/qtci-windows-8-x86/python.ps1 new file mode 100644 index 00000000..5f8aa2f8 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 new file mode 100644 index 00000000..3bb0af0e --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/python.ps1 b/coin/provisioning/qtci-windows-8-x86_64/python.ps1 new file mode 100644 index 00000000..5f8aa2f8 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" -- cgit v1.2.3 From 680c596ca0507d7f8c024679a3cb619bb8ebc5f6 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 30 Sep 2016 14:08:36 +0000 Subject: Revert "Changed slash direction in CI_CONAN_BUILDINFO_DIR" This actually breaks conan integration in Coin instead of fixing it. This reverts commit b0b0c9c471359393697389c870aaaad51dbb022f. Change-Id: Ifbdc9dbfd89d5b670221463e6d303691ad45936d Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 70962a41..6d7cf07b 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -6,7 +6,7 @@ Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-w Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" & $installer /DIR=C:\Utils\Conan /VERYSILENT -[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:/Utils/conanbuildinfos", "Machine") +[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") function Run-Conan-Install { -- cgit v1.2.3 From 6ddf18df95b69b59c1c437f5ebc3920ddbcbcb6e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 30 Sep 2016 17:10:26 +0300 Subject: Update submodules on '5.8' in qt5 Change-Id: I3edb8eeb7f599148ba577aea3c6677e8e6423d69 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index cd78457c..116e7a26 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cd78457c6d33bdd7c01fbcd78e50bc99e9c9acce +Subproject commit 116e7a267e2de116f7245e8f1c06d9a4ab174e26 diff --git a/qtdeclarative b/qtdeclarative index 765f3afc..c2e28350 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 765f3afccb34b16c249c609d788374320cfbd25d +Subproject commit c2e28350a6ea866b9e68059f232aaeccd47f743b diff --git a/qtlocation b/qtlocation index 408df361..9a07542b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 408df3618681e668d6e330cbce1ebe5243107602 +Subproject commit 9a07542b0fe43892af9aa5559ec57b0c5e7500b8 diff --git a/qtqa b/qtqa index e49c7d6f..66911ea5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e49c7d6f19d1ac76137534ec696ce1a9f4a7dbdc +Subproject commit 66911ea5ba5fe6c5e44d40760008dd65efe2e705 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0e3636a4..8aaa72c1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0e3636a4692c9cf89d994f3fe5c1c110b4c6ee61 +Subproject commit 8aaa72c1035940eb290de9ba16513b2dafe5248c diff --git a/qtrepotools b/qtrepotools index eb645e91..ef0773a1 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit eb645e912dca963645caed932b9adaf184df5f57 +Subproject commit ef0773a19a9697e2c3a6a2046bd1be670f7e58e4 diff --git a/qtserialbus b/qtserialbus index 0ce9c85d..5652f215 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0ce9c85d404f824e8df284f5f57345b2f9038836 +Subproject commit 5652f215309f968895351e9ba6a67fe06236337d diff --git a/qtwayland b/qtwayland index 8d437e79..863bf669 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8d437e79cdd41ede195ed1829d59b2b012b4d40d +Subproject commit 863bf669ed0b8fce782c177dfcfa1702fc28196a diff --git a/qtwebengine b/qtwebengine index 65c264f5..18f386ea 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 65c264f58969281392d4a4b42b35be9a352c7f7e +Subproject commit 18f386eaf30708580875a7841f138bcc197cc700 -- cgit v1.2.3 From bc65857c5872eee34de5a238f66c781570cb4f3d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 2 Oct 2016 02:30:54 +0300 Subject: Update submodules on '5.7' in qt5 Change-Id: Icb268cea1648c3219be1bb2ac8d9819971e9a033 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwebchannel | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index eb0a7293..cf00f2a1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit eb0a7293838234dba401fe96731f1fb5908fb7ac +Subproject commit cf00f2a1d967e8413d138ffe010e6928b469cb30 diff --git a/qtactiveqt b/qtactiveqt index 829abebf..fab7808e 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 829abebf3334218182d6b334855e4ae4658575f4 +Subproject commit fab7808e45c6742d7529b7df55f0d5e3fe9c7b50 diff --git a/qtbase b/qtbase index 8cd28ea8..4518345b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8cd28ea8850c5365c47dd65de16f528e2e223835 +Subproject commit 4518345b80b0ee1101ecb0e7349728abd237aa6e diff --git a/qtconnectivity b/qtconnectivity index aabce3a0..c4b8dee6 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit aabce3a08d1a65f8abc4872bd91a6dfd45cf7fd6 +Subproject commit c4b8dee6b4cfdc6728094d237d7984791e2cecea diff --git a/qtdeclarative b/qtdeclarative index 0aea0094..e4134cfd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0aea009425242417bffdb171c8eca02ff52f4a7b +Subproject commit e4134cfd8086a78c61a46fdfb908ade27c8d9840 diff --git a/qtdoc b/qtdoc index dab8e210..822ed893 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit dab8e210a5ed80e42499658fe662873e888d37b4 +Subproject commit 822ed893ecb973f0f42cb431b42a811a2bdcaa29 diff --git a/qtlocation b/qtlocation index 42372ce4..3f813d1c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 42372ce4c4114f7e38fc5ac681e9199869b4619f +Subproject commit 3f813d1c8c24e5da67d3f096eb3f5c73e760e641 diff --git a/qtqa b/qtqa index e49c7d6f..66911ea5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e49c7d6f19d1ac76137534ec696ce1a9f4a7dbdc +Subproject commit 66911ea5ba5fe6c5e44d40760008dd65efe2e705 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 966c0348..e95dc3b4 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 966c0348c7a19a17c5be53f87ef54d4fbab8d8c8 +Subproject commit e95dc3b4853c1736aef0ef2cc5248ec0aa46e3ff diff --git a/qtrepotools b/qtrepotools index 7b543793..ef0773a1 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7b5437939280b0788b4caa4a83f9193cfe8f97e7 +Subproject commit ef0773a19a9697e2c3a6a2046bd1be670f7e58e4 diff --git a/qtserialbus b/qtserialbus index b3d27c68..f0482d70 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b3d27c681ac216f82ea8b2de1e21858a6c2b7af0 +Subproject commit f0482d704e3834f2199889f997b421c0171bd94f diff --git a/qttools b/qttools index 181b320c..ae9472a3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 181b320c95e88be0a8e0843f14d134ae219181a3 +Subproject commit ae9472a39327ce5d5d6735308bd2aef272771391 diff --git a/qtwebchannel b/qtwebchannel index d342edcc..2d29a774 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d342edcc22d3c9c0299e86805d93e7031507345b +Subproject commit 2d29a774dd165ee2acd0b607b7e0d02a37c5fea5 diff --git a/qtwebkit b/qtwebkit index 4671ed5b..9b4236a6 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 4671ed5b9df8f8edd3856b24bab93d7246f700f5 +Subproject commit 9b4236a660dcf0b9883fbc6dd388dccbe71ee0b2 diff --git a/qtwebsockets b/qtwebsockets index 6bef834d..0ba923d6 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 6bef834d17ea9978b99e309eb396e10c8b9fba4c +Subproject commit 0ba923d6130cf35ecbfebfe38efd8e98017c573d -- cgit v1.2.3 From e5627e6de35402ec227c95d5beef3fa04234d0dd Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 5 Oct 2016 16:34:29 +0200 Subject: Update submodules on '5.7' in qt5 Change-Id: Ifb5d6145b2c4b4bf881cf6414d2b5c76382c8757 Reviewed-by: Allan Sandfeld Jensen --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 91679cda..f8c132ff 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 91679cda526857bd915c646d171f018ba86469f4 +Subproject commit f8c132ffb7cd32d52bbfe09caa811665a3cb1069 -- cgit v1.2.3 From 433f6dddb56d757827643bd1fa7b101a7e179f16 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 3 Oct 2016 18:34:14 +0300 Subject: Execute Conan installer synchronously 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 --- coin/provisioning/common/conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 6d7cf07b..a4c7ebe4 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -4,7 +4,7 @@ $installer = "c:\users\qt\downloads\conan-win_0_12_0.exe" Download https://s3-eu-west-1.amazonaws.com/conanio-production/downloads/conan-win_0_12_0.exe http://ci-files01-hki.ci.local/input/conan/conan-win_0_12_0.exe $installer Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" -& $installer /DIR=C:\Utils\Conan /VERYSILENT +& $installer /DIR=C:\Utils\Conan /VERYSILENT | Out-Null [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") -- cgit v1.2.3 From cf257c28694500251f5e193b469d9fd0c2414832 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 3 Oct 2016 22:32:40 +0300 Subject: 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 --- coin/provisioning/common/conan.ps1 | 11 ++++++++--- coin/provisioning/qtci-windows-10-x86/conan.ps1 | 3 ++- coin/provisioning/qtci-windows-10-x86_64/conan.ps1 | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index a4c7ebe4..481aa5f8 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -15,9 +15,14 @@ function Run-Conan-Install [string]$BuildinfoDir, [string]$Arch, [string]$Compiler, - [string]$CompilerVersion + [string]$CompilerVersion, + [string]$CompilerRuntime ) + if ($CompilerRuntime) { + $runtimeArg = "-s compiler.runtime=$($CompilerRuntime)" + } + Get-ChildItem -Path "$ConanfilesDir\*.txt" | ForEach-Object { $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" @@ -27,7 +32,7 @@ function Run-Conan-Install -WorkingDirectory $outpwd ` -ArgumentList "install -i -f $($_.FullName)", ` '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` - -NoNewWindow -Wait + "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion) $($runtimeArg)" ` + -NoNewWindow -Wait -Verbose } } diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 index 718d25de..d5f5f9e2 100644 --- a/coin/provisioning/qtci-windows-10-x86/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -5,4 +5,5 @@ Run-Conan-Install ` -BuildinfoDir MSVC2015-x86 ` -Arch x86 ` -Compiler "Visual Studio" ` - -CompilerVersion 14 + -CompilerVersion 14 ` + -CompilerRuntime MD diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 index 04887712..9cf4fbf1 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -5,4 +5,5 @@ Run-Conan-Install ` -BuildinfoDir MSVC2015-x86_64 ` -Arch x86_64 ` -Compiler "Visual Studio" ` - -CompilerVersion 14 + -CompilerVersion 14 ` + -CompilerRuntime MD -- cgit v1.2.3 From 5b0a9d688b2e07c12b1d50f63d1a5ebd6b5ae117 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 3 Oct 2016 22:33:40 +0300 Subject: Log arguments passed to Start-Process in Run-Conan-Install Task-number: QTQAINFRA-998 Change-Id: Ic27762a0403132cb8c2dcdb9f5a83ae9292e2d2a Reviewed-by: Simon Hausmann --- coin/provisioning/common/conan.ps1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1 index 481aa5f8..2d3d50e4 100644 --- a/coin/provisioning/common/conan.ps1 +++ b/coin/provisioning/common/conan.ps1 @@ -8,6 +8,12 @@ Verify-Checksum $installer "719F30E6EED03149D75CDB28F80A7B873B43FF51" [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") +function Start-Process-Logged +{ + Write-Host "Start-Process", $args + Start-Process @args +} + function Run-Conan-Install { Param ( @@ -27,7 +33,7 @@ function Run-Conan-Install ForEach-Object { $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)" New-Item $outpwd -Type directory -Force - Start-Process ` + Start-Process-Logged ` "C:\Utils\Conan\conan\conan.exe" ` -WorkingDirectory $outpwd ` -ArgumentList "install -i -f $($_.FullName)", ` -- cgit v1.2.3 From bf9ed6466ff5ed99c8071473d241689cfa068cd2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 6 Oct 2016 17:19:47 +0200 Subject: Update submodules on '5.8' in qt5 Change-Id: I423324fe84f2bb434fad8a717d05eae680a94e69 Reviewed-by: Simon Hausmann --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 18f386ea..7439343d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 18f386eaf30708580875a7841f138bcc197cc700 +Subproject commit 7439343d169095a510d122ad7c69646a5946cdce -- cgit v1.2.3