From 73834c7166870bd4eb04bf58c4f8d6ec1b135ede Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 4 Sep 2017 17:38:58 +0200 Subject: Adjust submodule branches --- .gitmodules | 68 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9e391985..2acc9bf2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.6 + branch = 5.6.3 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.6 + branch = 5.6.3 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.6 + branch = 5.6.3 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.6 + branch = 5.6.3 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.6 + branch = 5.6.3 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.6 + branch = 5.6.3 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.6 + branch = 5.6.3 status = essential priority = 40 [submodule "qtrepotools"] @@ -75,7 +75,7 @@ serialize = qtwebengine path = qtwebkit url = ../qtwebkit.git - branch = 5.6 + branch = 5.6.3 status = obsolete project = WebKit.pro priority = 20 @@ -83,7 +83,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.6 + branch = 5.6.3 status = obsolete [submodule "qtqa"] depends = qtbase @@ -97,14 +97,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtsystems"] depends = qtbase @@ -137,130 +137,130 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git - branch = 5.6 + branch = 5.6.3 status = preview [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.6 + branch = 5.6.3 status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.6 + branch = 5.6.3 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.6 + branch = 5.6.3 status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 5.6 + branch = 5.6.3 status = deprecated [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.6 + branch = 5.6.3 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtquickcontrols2"] depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.6 + branch = 5.6.3 status = preview [submodule "qtpurchasing"] depends = qtbase qtandroidextras -- cgit v1.2.3 From 88d718d38163504086c643abf66ad19bff8e0d67 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 6 Sep 2017 19:10:15 +0300 Subject: Update submodules on '5.6.3' in qt5 Change-Id: Ic62656a48bcee76ff38849671ca3fbad7e58fc73 Reviewed-by: Jani Heikkinen --- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index dfb9f2cf..61631013 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit dfb9f2cfd658860f69dd55363122a7c2c56b88fb +Subproject commit 6163101324d9bd7cef59c98efd584f7fd6b6230c diff --git a/qtbase b/qtbase index 40ca27e0..e6f8b072 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 40ca27e0d2107fd97b01bfb201cff408f7c5a0c3 +Subproject commit e6f8b072d2bf15f8b82bede48ff29ce8ac8dbd9a diff --git a/qtcanvas3d b/qtcanvas3d index 61804e56..8bbd8329 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 61804e56b82330fac0f29beec0e56262233467bb +Subproject commit 8bbd832997841927e0d8a433f4ec20c82cdea203 diff --git a/qtconnectivity b/qtconnectivity index f7bfd2ad..12b5e352 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f7bfd2adb82e3a8797e168a37287510e4a004b2e +Subproject commit 12b5e352c312a88518d6db34673350a70cd53616 diff --git a/qtdeclarative b/qtdeclarative index f724b538..6eaaedc6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f724b5380c911fbc841ff8ed4831dccd37fff6e9 +Subproject commit 6eaaedc646bc6d7d4dc97274c776abab9b54008f diff --git a/qtdoc b/qtdoc index 27f88300..c46e1a02 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 27f883002b9fba6e5bbcbc84ad0d366fb8149808 +Subproject commit c46e1a02eefb6b4050ef0cbb4190d086813da315 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 4dc734d8..bf13dd5c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 4dc734d85f59e3a16a50a9d7ffebc7aa304f5243 +Subproject commit bf13dd5ca02d861c3a554743948c939a339d5061 diff --git a/qtimageformats b/qtimageformats index b6ffd71e..a7a998ee 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit b6ffd71e2315e699d4ad32859cf36c67635820e7 +Subproject commit a7a998ee6e328babaa0edfee0d156fb28cf1b385 diff --git a/qtlocation b/qtlocation index 0a389325..35348e80 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0a38932510ffaad5387b7e86c7ca70aed8af5c5b +Subproject commit 35348e80145305778a89923d3bfe50d7baba7690 diff --git a/qtmacextras b/qtmacextras index 9e98d9a6..5aea5928 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 9e98d9a6f56d1076ec9438b2b22f46ed0798273a +Subproject commit 5aea592832ad6380b3eab91790b147b22cfdb922 diff --git a/qtmultimedia b/qtmultimedia index 6d494812..4dd780a8 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6d4948122063b651948a5c4db2197d633d7e96c4 +Subproject commit 4dd780a81e886a8a5eb86d1a045716ac4194eba1 diff --git a/qtquickcontrols b/qtquickcontrols index 9fc3fcb5..b66f6b05 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 9fc3fcb5a827196dee8c7afbd70a4c2361c65107 +Subproject commit b66f6b05c5f8024ddd9f8c46f33ccb618323999e diff --git a/qtsensors b/qtsensors index 12b98b6f..099b3a74 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 12b98b6ff70a18c27f543dda029e75c197d8cbc5 +Subproject commit 099b3a7442a553aedf4d5bb8955dabcae4dae66c diff --git a/qtserialbus b/qtserialbus index f5b1c3a3..21616f7b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f5b1c3a32b2a7c9bc06b68c469981ae46fb7172e +Subproject commit 21616f7bc1e7325d2cb04403388b8fdaeea99e21 diff --git a/qtserialport b/qtserialport index 9e4b9d27..2f7b2533 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9e4b9d276f0de2d298da4ffdf6f15a9960402194 +Subproject commit 2f7b2533b323644289c60370f68492aea6b1a625 diff --git a/qttools b/qttools index 705d06c2..56dbabb7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 705d06c2841ef5d9ebda954c112fc8f1e32ec2cb +Subproject commit 56dbabb7a64a4d416e8cf7b61e068208fd032355 diff --git a/qtwayland b/qtwayland index d6f7bb39..70575643 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d6f7bb39e71777ce5568d462841caccc17f3a205 +Subproject commit 70575643cfece4f0aca4b40e77ac5d7c0e8042a2 diff --git a/qtwebchannel b/qtwebchannel index 64306392..065afc22 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 64306392ce3a7751bfb58e1352b212ad5cba8aec +Subproject commit 065afc22e9cc61364968aafc74ff2ca4524fab56 diff --git a/qtwebengine b/qtwebengine index 04fa812e..fad625e0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 04fa812ef5025aa991d9a79dd26e9ecfcb3182a1 +Subproject commit fad625e0ba39e855817bbf206ab9a846d07aeeec diff --git a/qtwebsockets b/qtwebsockets index d3032491..65e71304 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d3032491971e1cee8f1171f16b8e6d3d2fa42eed +Subproject commit 65e7130466963e0fd9cee8719d8b37c9fb15db35 diff --git a/qtwebview b/qtwebview index d3994169..6d9a88e3 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d39941695dbc10b06188580b675f2b7c337ca505 +Subproject commit 6d9a88e3048e230a3ee516c39bf55f714117869c diff --git a/qtx11extras b/qtx11extras index 25e20a72..e33fc10f 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 25e20a724f411f6e07cd3dc9f4870298a308c2c3 +Subproject commit e33fc10fa49da17b297c53e44d109dc4d24c974a diff --git a/qtxmlpatterns b/qtxmlpatterns index 0533f8ba..50582280 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0533f8ba47f57da5d7363c2c00cf0b239ce72888 +Subproject commit 50582280b10fb1962b3bdfdd06a72ae1e0325049 -- cgit v1.2.3 From fba2c6f4dd96d590248827df9c9ca7b844c814a3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Sep 2017 12:38:34 +0300 Subject: Update submodules on '5.6.3' in qt5 Change-Id: Idc2fc0d0cc1df4929c783116169f95210baa4b70 Reviewed-by: Jani Heikkinen --- qtdeclarative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtdeclarative b/qtdeclarative index 6eaaedc6..cf3b1bbd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6eaaedc646bc6d7d4dc97274c776abab9b54008f +Subproject commit cf3b1bbd9ee048a28b58a55d76504b1c01e34811 -- cgit v1.2.3 From b38e4732af6a0a880d5ba73bce218ed07a58d823 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 12 Sep 2017 13:08:04 +0300 Subject: Update submodules on '5.6.3' in qt5 Change-Id: I44fb9a11d14313805600ffa2f55a8f465f2307bc Reviewed-by: Jani Heikkinen --- qtdeclarative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtdeclarative b/qtdeclarative index cf3b1bbd..bb01612a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cf3b1bbd9ee048a28b58a55d76504b1c01e34811 +Subproject commit bb01612a8809efd268903e41b9e3a17cff48f1c0 -- cgit v1.2.3 From a9cf936a6304550b923bd325d05bdb209ca82371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 12 Sep 2017 10:20:38 +0300 Subject: Provision: Move Python3 scripts from win8 to win8.1 folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: I739e18a7fcb1abc72092f91662e506cfffcecb0c Reviewed-by: Dominik Holland Reviewed-by: Simo Fält --- coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 | 1 - coin/provisioning/qtci-windows-8-x86/python3.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/python3.ps1 | 1 - coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/python3.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 | 1 + 8 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/python3.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 diff --git a/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 deleted file mode 100644 index ad3d5950..00000000 --- a/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86/python3.ps1 b/coin/provisioning/qtci-windows-8-x86/python3.ps1 deleted file mode 100644 index 164fbe43..00000000 --- a/coin/provisioning/qtci-windows-8-x86/python3.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 deleted file mode 100644 index 6070c80b..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 deleted file mode 100644 index b0c21996..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 new file mode 100644 index 00000000..ad3d5950 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 new file mode 100644 index 00000000..6070c80b --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 new file mode 100644 index 00000000..b0c21996 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 64 -- cgit v1.2.3 From 892833cda910143a8cfd73062c90c8ac080dd8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 4 Sep 2017 12:49:20 +0300 Subject: Provisioning: Invoke installer with Start-Process MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By launching an installer with Start-Process and -Wait, we make sure no handles are left holding on to the installer when we try to delete it at cleanup. Change-Id: Ic9b700ea1ce9e70089ba4cb7e91d9765ca976333 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/vc_redist.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/vc_redist.ps1 index 95567669..4213dde9 100644 --- a/coin/provisioning/common/vc_redist.ps1 +++ b/coin/provisioning/common/vc_redist.ps1 @@ -59,6 +59,6 @@ echo "Fetching from URL..." Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 echo "Installing $package..." -cmd /c "$package /q" +Start-Process -FilePath $package -ArgumentList "/q" -Wait echo "Remove $package..." del $package -- cgit v1.2.3 From 2a5f54d07e9e935a0c86a0d3fdcf223dd0863f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 29 Aug 2017 09:31:43 +0300 Subject: provisioning: install MinGW 530 and 630 for Win10 x64 MinGW is an alternative option for Visual Studio. It's used to create desktop builds and for cross compiling Android and QNX. At this point it is still unclear which version is going to be used for what, but as both are supported, let's think ahead and provide them both. This also allows us to debug with the other, if the other is causing problems. Task-number: QTQAINFRA-1289 Change-Id: I2a922669c07d49370e608c093be80481c8613dc7 Reviewed-by: Jani Heikkinen --- coin/provisioning/common/install-mingw.ps1 | 26 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/09-install-mingw530.ps1 | 10 +++++++++ .../qtci-windows-10-x86_64/09-install-mingw630.ps1 | 8 +++++++ 3 files changed, 44 insertions(+) create mode 100644 coin/provisioning/common/install-mingw.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/install-mingw.ps1 new file mode 100644 index 00000000..fc02631d --- /dev/null +++ b/coin/provisioning/common/install-mingw.ps1 @@ -0,0 +1,26 @@ +function InstallMinGW +{ + Param ( + [string] $version = $(BadParam("the version being printed to versions.txt")), + [string] $release = $(BadParam("release part of the file name")) + ) + + $envvar = "MINGW$version" + $envvar = $envvar -replace '["."]' + $targetdir = "C:\$envvar" + $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\i686-" + $version + "-" + $release + ".7z" + + $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip" + Copy-Item $url_cache $mingwPackage + + Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} + + echo "Adding MinGW environment variable." + [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine) + + echo "Cleaning $mingwPackage.." + Remove-Item -Recurse -Force "$mingwPackage" + + echo "MinGW = $version $release" >> ~\versions.txt + +} diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 new file mode 100644 index 00000000..ded894a5 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\..\common\install-mingw.ps1" + +# This script will install MinGW 5.3.0 + +$version = "5.3.0" +$release = "release-posix-dwarf-rt_v4-rev0" + +InstallMinGW $version $release + + diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 new file mode 100644 index 00000000..a2710760 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 @@ -0,0 +1,8 @@ +. "$PSScriptRoot\..\common\install-mingw.ps1" + +# This script will install MinGW 6.3.0 + +$version = "6.3.0" +$release = "release-posix-dwarf-rt_v5-rev2" + +InstallMinGW $version $release -- cgit v1.2.3 From b0a9259c6ee24673fc5579ba33063e9a7619a3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 25 Aug 2017 11:32:34 +0300 Subject: Provision and build QNX660 on Win 10 x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes the mingw from 4.9 to 5.3. Task-number: QTQAINFRA-1208 Change-Id: I360b9806c35e597a4b9fd0d57c10eebfb8643905 Reviewed-by: Sami Nurmenniemi Reviewed-by: Simo Fält --- coin/platform_configs/qt5.txt | 2 + coin/provisioning/common/install-qnx660.ps1 | 46 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/030-qnx660.ps1 | 1 + 3 files changed, 49 insertions(+) create mode 100644 coin/provisioning/common/install-qnx660.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index b9565ebe..92d55b1f 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -9,6 +9,8 @@ qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packagin qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-7 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-7 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 # target arch is used here only for documentation the value is ignored qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe diff --git a/coin/provisioning/common/install-qnx660.ps1 b/coin/provisioning/common/install-qnx660.ps1 new file mode 100644 index 00000000..bf9c9d09 --- /dev/null +++ b/coin/provisioning/common/install-qnx660.ps1 @@ -0,0 +1,46 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts 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 will install QNX 6.6.0 + +$version = "6.6.0" +$nondottedversion = $version -replace '[.]','' +$targetFolder = "c:" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip" + +Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"} + +[Environment]::SetEnvironmentVariable("QNX_660", "$targetFolder", "Machine") +echo "QNX = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 new file mode 100644 index 00000000..39627626 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-qnx660.ps1" -- cgit v1.2.3 From 12fd0d5b9b486eaf80712d390265402a3bb06f0e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 15 Sep 2017 10:26:29 +0300 Subject: Ensure 'clean' android Installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove old android installation and make sure new 'clean' android folder is created. Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb Reviewed-by: Simo Fält --- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh index 7c3220ee..c278a2ce 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh @@ -87,7 +87,13 @@ function InstallAndroidPackage { sudo rm -fr "$targetFolder"/"$version" } -sudo mkdir "$targetFolder" +if [ -d "$targetFolder" ]; then + echo "Removing old Android installation" + sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; ) +fi + +sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; ) + # Install Android SDK echo "Installing Android SDK version $sdkPackage..." InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName -- cgit v1.2.3