From d06d1081c0553fbfd304b69dd5f9c591194f522a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 1 Dec 2017 09:34:56 +0200 Subject: [PATCH 01/59] Provisioning: Install Devtoolset-4 to Rhel 7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used instead of Devtoolset-6. Task-number: QTBUG-64820 Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825 Reviewed-by: Konstantin Tokarev (cherry picked from commit adcdf7b49f52e745009ff7e37e07c2d831ad82dc) Reviewed-by: Tony Sarajärvi --- .../{003-install-devtoolset6.sh => 003-install-devtoolset.sh} | 4 ++-- .../010-openssl_for_android_linux.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{003-install-devtoolset6.sh => 003-install-devtoolset.sh} (94%) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh similarity index 94% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh index ef65b881..439e2db5 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh @@ -34,7 +34,7 @@ ############################################################################# sudo yum-config-manager --enable rhel-server-rhscl7-rpms -sudo yum -y install devtoolset-6 +sudo yum -y install devtoolset-4 -echo "source /opt/rh/devtoolset-6/enable" >> ~/.bashrc +echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh index 05b73729..b69295fc 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh @@ -33,5 +33,5 @@ ## ############################################################################# -source /opt/rh/devtoolset-6/enable +source /opt/rh/devtoolset-4/enable source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" From 0565e759c593472ffb1b213a2ca549540dfe71b6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 13 Dec 2017 10:26:12 +0200 Subject: [PATCH 02/59] Update submodules on '5.9' in qt5 Change-Id: I0a5c2de981acb71511041c19f5ff966b87932367 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/qt3d b/qt3d index 1129ff73..37d78994 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1129ff731fca6aff5849cafe1f434f1882342cd7 +Subproject commit 37d78994de56cd11a06ccd1a777cf0ac8ec8e801 diff --git a/qtactiveqt b/qtactiveqt index 2ba06b5c..451ca492 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2ba06b5ce1f5203999039d044009d04a5e8dc484 +Subproject commit 451ca492ea5f71045597f26db54c840addb6d6ae diff --git a/qtandroidextras b/qtandroidextras index 458d2358..cb2fa645 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 458d2358e0e67cfcc267bb428a866503b559bd38 +Subproject commit cb2fa645bef1a0c05065fe43a038e5bf962e095b diff --git a/qtbase b/qtbase index d2d6c6f7..782eb1a1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d2d6c6f7813fa38ced6b80ead763ed6e6daaa951 +Subproject commit 782eb1a114c0aaa729925899b2061d47f494435f diff --git a/qtcanvas3d b/qtcanvas3d index f4d7923a..25f6b209 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit f4d7923aaaaee0c8fe131040de4dc3cf92fd7195 +Subproject commit 25f6b209a64a3c7e16e1c4655a970aaf5f4341cc diff --git a/qtcharts b/qtcharts index 6cde98b2..ad9d59e8 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 6cde98b2254e6197a285a83617c952fd1d14cb3d +Subproject commit ad9d59e871b6f1a7b3f0b0ae1248ffa205647993 diff --git a/qtconnectivity b/qtconnectivity index a910c618..e46cde93 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a910c6185826977d5eabbb15ab2363761d6b75a3 +Subproject commit e46cde935ee76eaa00e78af968121502e2406347 diff --git a/qtdatavis3d b/qtdatavis3d index c3a97327..de346171 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit c3a973273e3c7ac61b8dd9aec282847d30fd4ac1 +Subproject commit de346171018b353d2abcfb589e644480c2aa6fd5 diff --git a/qtdeclarative b/qtdeclarative index 41293196..ae01e0db 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 41293196b4db1aa7a0c616af312875c484639644 +Subproject commit ae01e0dbf50cb6da1967e10eb95d63313dc5aa7a diff --git a/qtdoc b/qtdoc index d21d0d92..b8556f01 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d21d0d92e799d045a30091a3079d8e8b3cc77c66 +Subproject commit b8556f01d711389d94cc1ccb864324b24c0e7def diff --git a/qtgamepad b/qtgamepad index c1e52bd4..7eaac052 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit c1e52bd4a3f1fc996bd6b885b4e98ad5b216cbee +Subproject commit 7eaac052282038dc9a05afe7b48fa4676f6876b5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7d385752..9b6d754d 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7d38575239d10598cb65b9f0ffabca0e018d07a5 +Subproject commit 9b6d754d192ae53306b8fe6277b0bbe84bde53d6 diff --git a/qtimageformats b/qtimageformats index e807afe5..4a5d500d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit e807afe5e218a1db802d2af1ba6c83a7ccf429f0 +Subproject commit 4a5d500d6da8c7af2d3abfcf759586d5756efa77 diff --git a/qtlocation b/qtlocation index 8552cf9d..730b2bd9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8552cf9d96d96dc500743dfbc117f0634cab0590 +Subproject commit 730b2bd96e88fe63364c9f81e299555f0b1f0daa diff --git a/qtmacextras b/qtmacextras index 508db880..26ce599c 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 508db880f0e3506679c65ee24ff0935351daa484 +Subproject commit 26ce599c8ffdae9b001ec9dc7d5639ff0b528066 diff --git a/qtmultimedia b/qtmultimedia index c60d87c3..10998733 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c60d87c314d467997701729104ce02c9ed5c6501 +Subproject commit 10998733af8a3d54b795ee57a8df9a1b3e776aae diff --git a/qtnetworkauth b/qtnetworkauth index da3963e3..eee494c1 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit da3963e3d406b445223081cbdfe10858ba2036ae +Subproject commit eee494c12a70fa0aa6fce427f47f44ff60281dca diff --git a/qtpurchasing b/qtpurchasing index d5b1a88c..acdce943 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit d5b1a88c7a51bb4a192c20dd494dac580e238110 +Subproject commit acdce9431b5ead5754e149853839569ffbd9e200 diff --git a/qtquickcontrols b/qtquickcontrols index 00bfab66..37592ad9 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 00bfab6671fda57cc34aa84335a6c47ffb0df98e +Subproject commit 37592ad9c6df35bdd37609569963fe7361cdad85 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bd617ed6..d9e740d2 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bd617ed62ba35ee11da75b7e92db3fd190751b0f +Subproject commit d9e740d2ccf8c1d3caacfcd95537718048e3a7ba diff --git a/qtremoteobjects b/qtremoteobjects index c10eaf91..170aa77f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c10eaf9148ec111c3fb752cc15e854e5c7fd3ea7 +Subproject commit 170aa77ff7a38ba2ddbc68f75c1ac38a47af87ea diff --git a/qtscript b/qtscript index c5b7db2e..c904f06f 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit c5b7db2e5cbc4477da75691602af1cc5fad10af0 +Subproject commit c904f06f716585edd94dbd1b4271dcbf305c268a diff --git a/qtscxml b/qtscxml index 3aa7c73a..866816d5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 3aa7c73a97af0d44666fc70570853182612c0c9a +Subproject commit 866816d57204dc60bb9d0a8b5157c4cf7addd214 diff --git a/qtsensors b/qtsensors index 90e56c11..e2a5bf08 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 90e56c11caa0251ed3f6f5620869512e1a8e6cf1 +Subproject commit e2a5bf08c4d9239ff1da88b4d35e9bb89133a940 diff --git a/qtserialbus b/qtserialbus index 0ace2c05..50aea4ad 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0ace2c053464ac08cc93a8319e38df50e1c3acbf +Subproject commit 50aea4ada4521f009ea8524b91daea1fac283c41 diff --git a/qtserialport b/qtserialport index 8fd986ec..5fdcd2f6 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 8fd986ec9aec0503985fbd0704f0671d58a1e3a5 +Subproject commit 5fdcd2f60021771d301743f51852db05ea45cdf2 diff --git a/qtspeech b/qtspeech index 8278f9f5..53afd080 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 8278f9f5d2c9f47233f59ff8af757e0591045895 +Subproject commit 53afd0808aeae53bf1ad94647be936cce00ef9a1 diff --git a/qtsvg b/qtsvg index 18a2adad..808ae358 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 18a2adad907523ea31251ff0b62e3321241a40fa +Subproject commit 808ae3589a031413e25d7b6e66f2e966cefacb96 diff --git a/qttools b/qttools index f8bb798a..796a5e00 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f8bb798ade81f152bc8ff2028e4974150171fa08 +Subproject commit 796a5e005fa1ae2bfe6f9278fc482723eb89f429 diff --git a/qttranslations b/qttranslations index 069f791e..6987cf96 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 069f791e56e2421c0e29c0358732aba4e275ad4c +Subproject commit 6987cf9681dfb6c212a3225a8669499d3dfe1871 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 78873735..6ecb881b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 78873735b041f6eeb4bbd22d3284457ce40e9d06 +Subproject commit 6ecb881bdc73a4ab1f4485e14bb87c18aac771ca diff --git a/qtwayland b/qtwayland index e74ff73d..6bd70687 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e74ff73d2b2acef0b97530a2c7dd52e20ada6239 +Subproject commit 6bd70687aa32d1ad6fedc7cfad499fdaf037193e diff --git a/qtwebchannel b/qtwebchannel index 9196ca1b..44a2c000 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 9196ca1b09ba5cc6b6910c775906fcff4c4d6eac +Subproject commit 44a2c0006546ba39a4a523904f75a9cb01cfe5fc diff --git a/qtwebengine b/qtwebengine index 9f798b78..260e9dd9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9f798b787a2542688c30503d3f62fe2d7c4d5a72 +Subproject commit 260e9dd9b98c2bc90229f7d2f7aba8cc0029d24d diff --git a/qtwebsockets b/qtwebsockets index 1b9a3c75..bd08a6ba 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1b9a3c75259ceaa5e475b47e396a548c475df401 +Subproject commit bd08a6ba75ed04089fb2fa3e763ade8ebc1ef9da diff --git a/qtwebview b/qtwebview index 68423dce..17e076b5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 68423dce756f1df7f282b8cdbe0c7fead91d1ff2 +Subproject commit 17e076b56e40e25248f156830b293fee6421ecfc diff --git a/qtwinextras b/qtwinextras index 494bde3b..13042633 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 494bde3bd59465b1c953fb4449db1ae45b714e16 +Subproject commit 130426337da1703ed3c0d9d84f4ccbd96c561336 diff --git a/qtx11extras b/qtx11extras index d1a3ecdc..aee4dc63 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit d1a3ecdc4dc385f6f24791bf2e9ba8dc5041216f +Subproject commit aee4dc63f6d43cf775c063b76d789ac6d4a8f517 diff --git a/qtxmlpatterns b/qtxmlpatterns index 431a23f2..f5f2b1f5 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 431a23f274f6bae1dc9e8cdd13b4ac993f5a0991 +Subproject commit f5f2b1f5fc29968b13b464cc9a6b2df6eebe75c7 From 1dee4e9fcaba0cce26a1054530b3ab5958cf2434 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Thu, 7 Dec 2017 12:52:19 +0200 Subject: [PATCH 03/59] Fix broken and duplicate Ruby provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ruby is being installed twice on certain Windows platforms and the 32 bit versions of these don't have a working PATH addition. Task-number: QTQAINFRA-1632 Change-Id: Id7fd269854d17c32df7d0b82ac9e750e645af564 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/install-ruby.ps1 | 14 ++++++-------- coin/provisioning/common/ruby.ps1 | 7 ------- .../qtci-windows-10-x86/09-install-ruby.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/ruby.ps1 | 1 - coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 | 1 - coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 | 1 - coin/provisioning/qtci-windows-7-x86/ruby.ps1 | 1 - .../provisioning/qtci-windows-7-x86_64/26-ruby.ps1 | 1 - 8 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 coin/provisioning/common/ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/ruby.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/ruby.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index 57cf227f..94e32b74 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -35,26 +35,24 @@ # This script will install Ruby -$version = "2.2.6" +$version = "2.4.2-2" if( (is64bitWinHost) -eq 1 ) { $arch = "-x64" - $sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A" + $sha1 = "c961c2752a183487bc42ed24beb7e931230fa7d5" } else { - $arch = "" - $sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df" + $arch = "-x86" + $sha1 = "2639a481c3b5ad11f57d5523cc41ca884286089e" } $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe" -$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe" +$url_official = "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-" + $version + "/rubyinstaller-" + $version + $arch + ".exe" $rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe" Download $url_official $url_cache $rubyPackage Verify-Checksum $rubyPackage $sha1 -cmd /c "$rubyPackage /silent" +Start-Process -FilePath $rubyPackage -ArgumentList "/dir=C:\Ruby-$version$arch /tasks=modpath /verysilent" -Wait echo "Cleaning $rubyPackage.." Remove-Item -Recurse -Force "$rubyPackage" -Add-Path "C:\Ruby22-x64\bin" - echo "Ruby = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/ruby.ps1 b/coin/provisioning/common/ruby.ps1 deleted file mode 100644 index f7813c20..00000000 --- a/coin/provisioning/common/ruby.ps1 +++ /dev/null @@ -1,7 +0,0 @@ -. "$PSScriptRoot\helpers.ps1" - -$installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe" - -Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.intra.qt.io/input/ruby/rubyinstaller-2.3.1.exe $installer -Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36" -& $installer /DIR=C:\ruby /VERYSILENT diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 new file mode 100644 index 00000000..0d28ea1e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-7-x86/ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 deleted file mode 100644 index 587a4c10..00000000 --- a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\ruby.ps1" From b0b6b05b34f7d24c3a762e9b383c1b5bd1153a04 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 11 Dec 2017 12:06:05 +0200 Subject: [PATCH 04/59] Add 'ForceDebugInfo' -flag to linux desktop binaries Add 'ForceDebugInfo' for RHEL 7.4 as well Task-number: QTBUG-3934 Change-Id: I121c109f755c1b65bc0a59fc4edcb0a03f870d54 Reviewed-by: Akseli Salovaara --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 39f0373d..4f6920c9 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,7 +12,7 @@ qtci-linux-Ubuntu-16.04-x86_64-1 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo -qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests From b16eac13e6f65f338ec9e78ce4a926edadde8efb Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 13 Dec 2017 13:22:26 +0200 Subject: [PATCH 05/59] Provisioning: Remove Android script from Red Hat 6.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Android linux builds are run by Red Hat 7.4 Change-Id: I8661b90494c1d43cc87e50136ed185fac93e4916 Reviewed-by: Tony Sarajärvi --- .../android_linux.sh | 120 ------------------ 1 file changed, 120 deletions(-) delete mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh 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 deleted file mode 100644 index 69b3c10e..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -# This script install Android sdk and ndk. - -# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version 23.0.3 - -# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. - -# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. -# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device. -# That's why we need to use Andoid-21 API version in Qt 5.9. - -set -ex -targetFolder="/opt/android" -baseUrl="http://ci-files01-hki.intra.qt.io/input/android" - -# SDK -sdkPackage="android-sdk_r24.4.1-linux.tgz" -sdkBuildToolsVersion="23.0.3" -sdkApiLevel="android-21" -sdkUrl="$baseUrl/$sdkPackage" -sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d" -sdkTargetFile="$targetFolder/$sdkPackage" -sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile" -sdkFolderName="android-sdk-linux" -sdkName="sdk" - -# NDK -ndkVersion="r10e" -ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip" -ndkUrl="$baseUrl/$ndkPackage" -ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" -ndkTargetFile="$targetFolder/$ndkPackage" -ndkExtract="unzip $ndkTargetFile -d $targetFolder" -ndkFolderName="android-ndk-$ndkVersion" -ndkName="ndk" - -function InstallAndroidPackage { - targetFolder=$1 - version=$2 - url=$3 - sha1=$4 - targetFile=$5 - extract=$6 - folderName=$7 - name=$8 - - sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" - echo "$sha1 $targetFile" | sha1sum --check - sudo chmod 755 "$targetFile" - sudo $extract || echo "Failed to extract $url" - sudo chown -R qt:users "$targetFolder"/"$folderName" - sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name" - sudo rm -fr "$targetFolder"/"$version" -} - -if [ -d "$targetFolder" ]; then - echo "Removing old Android installation" - sudo rm -fr "$targetFolder" -fi - -sudo mkdir "$targetFolder" - -# Install Android SDK -echo "Installing Android SDK version $sdkPackage..." -InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName - -# Install Android NDK -echo "Installing Android NDK version $ndkPackage..." -InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName - -# run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools -echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." -echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion - -echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc - -# Storage version information to ~/versions.txt, which is used to print version information to provision log. -echo "***** Android SDK *****" >> ~/versions.txt -echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt -echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt -platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)" -echo "Android Platform Tools = $platformTools" >> ~/versions.txt -sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)" -echo "Android SDK Tools = $sdkTools" >> ~/versions.txt -echo "***** Android NDK *****" >> ~/versions.txt -echo "Android NDK Version = $ndkVersion" >> ~/versions.txt From 3bcc9a918166c5d28a0d4fb04d279d3a47d4cdd3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 13 Dec 2017 23:31:54 +0200 Subject: [PATCH 06/59] Update submodules on '5.10' in qt5 Change-Id: I6c96508c89b6acab297d4f486b3b8966e28e4eee Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index 8470becd..d69e2c2b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8470becd886d299c1be892d8113dfff216035611 +Subproject commit d69e2c2b42719e6839f32e8ab796cf22d9f29bfa diff --git a/qtbase b/qtbase index 812bb236..ae55e75b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 812bb236dd1622896b6a0ca9bbe1334a69855aa2 +Subproject commit ae55e75b1b6c2c07f4ef084ee27448fc0262c7c0 diff --git a/qtconnectivity b/qtconnectivity index cf0df8be..0ef47033 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit cf0df8be7f4cc809672f98507c1723015a0741bc +Subproject commit 0ef470335d541b6be7b941081ed248a68e2fbf8c diff --git a/qtdeclarative b/qtdeclarative index 8283bc83..735b588e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8283bc83857ed8c7d85b61d2dc3b35fa4e96a037 +Subproject commit 735b588e64d29c5336402c8e1d43f77e8b2cbe31 diff --git a/qtlocation b/qtlocation index b2e0a242..936d9ab1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b2e0a242a8c77d8cff186ef25b8360927c955941 +Subproject commit 936d9ab1761dec5f345eb32793b655e4620d3ac2 diff --git a/qtmultimedia b/qtmultimedia index 10304528..68abdc5b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 10304528c20fb9a385c617a38b6be35d1b18598a +Subproject commit 68abdc5bb2042a0f896e822eecd5ed49350c0c43 diff --git a/qtquickcontrols b/qtquickcontrols index 5bc43105..b9c95d63 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5bc4310529a8ae5cfc18afda1a1b788691448d6e +Subproject commit b9c95d63efde5d0ee9d332074285d5a4800391b5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index eb7551d5..2940d8bf 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit eb7551d5d5e5155606e21158ead1541546bc2149 +Subproject commit 2940d8bfd16bc1883a6b9a6dde40ba583e6f24e3 diff --git a/qtserialbus b/qtserialbus index e13737e5..ab34a242 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e13737e5de8d3a2653e97de365412c28bd6c6124 +Subproject commit ab34a242b51193972389d909ff30eaf194d61b42 diff --git a/qtserialport b/qtserialport index 98454fbc..c38dcc11 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 98454fbc2a687a6440ae5e61070ebd6073e8016d +Subproject commit c38dcc1118746a0a16405764a707ffc19dda362a diff --git a/qtwebengine b/qtwebengine index 6921ebd6..c4bc2f83 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6921ebd6d8bc8bb62d9118c7a1a750f2fd787897 +Subproject commit c4bc2f830d62ead99ca1d681992f1efafa7f70d6 From df7255ce44df62218567ba368fa04f1968e452dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 1 Dec 2017 13:24:13 +0200 Subject: [PATCH 07/59] Swap ICC builds to use system's SQLite library Task-number: QTBUG-64650 Change-Id: I2c692ae04f0cc02a5fecb12e3a7b905ee89b1af9 Reviewed-by: Frederik Gladhorn --- coin/platform_configs/default.txt | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 4f6920c9..465543cb 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -10,7 +10,7 @@ qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch -qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests +qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh index fb2b81dd..5006fec8 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh @@ -16,6 +16,7 @@ sudo zypper -nq install glib2-devel sudo zypper -nq install libopenssl-devel sudo zypper -nq install freetype2-devel sudo zypper -nq install fontconfig-devel +sudo zypper -nq install sqlite3-devel # EGL support sudo zypper -nq install Mesa-libEGL-devel From 547a0ded908e656e12ff56cc008cd625ab456108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 14 Nov 2017 10:28:16 +0200 Subject: [PATCH 08/59] Provisioning: Update default compiler to GCC-7 in openSUSE 42.3 Task-number: QTQAINFRA-1258 Change-Id: Ia2683a23ecc55aae4e82f901f446d1cf46895269 Reviewed-by: Heikki Halmet --- .../002-zypperpackages.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh index 5006fec8..007a08b0 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh @@ -2,9 +2,12 @@ set -e sudo zypper -nq install git -# default compiler, gcc 4.8.5 -sudo zypper -nq install gcc -sudo zypper -nq install gcc-c++ +sudo zypper -nq install gcc7 +sudo zypper -nq install gcc7-c++ +sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-7 \ + --slave /usr/bin/cc cc /usr/bin/gcc-7 \ + --slave /usr/bin/c++ c++ /usr/bin/g++-7 sudo zypper -nq install bison sudo zypper -nq install flex From f5dfdedb2d01cd3594b8154878851e98ecf7a508 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 15 Dec 2017 10:49:22 +0300 Subject: [PATCH 09/59] Add libxml2 and libxslt to openSUSE for QtWebKit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iafb89bf9c12cf1d38c2fe1944d55965319b85ea3 Reviewed-by: Tony Sarajärvi --- .../qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh index 007a08b0..9d93e90b 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh @@ -50,3 +50,7 @@ sudo zypper -nq install libXrandr-devel sudo zypper -nq install libXtst-devel sudo zypper -nq install mozilla-nspr-devel sudo zypper -nq install mozilla-nss-devel + +# qtwebkit +sudo zypper -nq install libxml2-devel +sudo zypper -nq install libxslt-devel From ae6ea5349f913330c7f058929b0e2639374c2907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 14 Dec 2017 14:02:02 +0200 Subject: [PATCH 10/59] Remove Windows 8 provisioning scripts They are replaced by 8.1 scripts. Change-Id: Ib04c183b75cec2c6e529945f382c53fdeb23f213 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 | 1 - 2 files changed, 2 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 diff --git a/coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 deleted file mode 100644 index df466d52..00000000 --- a/coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 deleted file mode 100644 index df466d52..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\mqtt_broker.ps1" From 9236cd01a2a98b327d85ddcb94fc0691c605af20 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 16 Dec 2017 03:01:45 +0200 Subject: [PATCH 11/59] Update submodules on '5.10' in qt5 Change-Id: I8514e3e83b62ae4ddc527eb73bcfdcd138ac1875 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qtbase b/qtbase index ae55e75b..e739e984 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ae55e75b1b6c2c07f4ef084ee27448fc0262c7c0 +Subproject commit e739e984c3006ed2e88ef8f087455116cf9c4ebb diff --git a/qtconnectivity b/qtconnectivity index 0ef47033..1d8ba361 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0ef470335d541b6be7b941081ed248a68e2fbf8c +Subproject commit 1d8ba3610ae36dd62fda88dcf7c81baa5fe1fc51 diff --git a/qtdeclarative b/qtdeclarative index 735b588e..61fd2b3d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 735b588e64d29c5336402c8e1d43f77e8b2cbe31 +Subproject commit 61fd2b3d2a8b838e55d6560050ddf5ba7de3cee5 diff --git a/qtlocation b/qtlocation index 936d9ab1..337aea7b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 936d9ab1761dec5f345eb32793b655e4620d3ac2 +Subproject commit 337aea7bc386d5e97825d27335d860fc88b2bee3 diff --git a/qtmultimedia b/qtmultimedia index 68abdc5b..5629823b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 68abdc5bb2042a0f896e822eecd5ed49350c0c43 +Subproject commit 5629823b05ca7d24924ac879b5a0469a3cb03e78 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2940d8bf..6767d789 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2940d8bfd16bc1883a6b9a6dde40ba583e6f24e3 +Subproject commit 6767d789b3544c6ff7717250e1c0dee02ad91fd4 diff --git a/qtscript b/qtscript index 0bb3f301..34784015 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 0bb3f3017f72cbf8d6866b8baa1820ab3dd89316 +Subproject commit 34784015a96c204633bad5ed86056eee2d32c22f diff --git a/qtserialbus b/qtserialbus index ab34a242..557a7cb8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ab34a242b51193972389d909ff30eaf194d61b42 +Subproject commit 557a7cb8c2b053a67d8dc55f7433f2db2286852b diff --git a/qtsvg b/qtsvg index 984ba697..b3ce1912 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 984ba6977201f8fbd94d44a2b67519e1faf458cc +Subproject commit b3ce191284221a384d04fd8a3d6eb152f84fd192 diff --git a/qttools b/qttools index 84e40c5f..e6a65cdb 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 84e40c5f4d78a6d4a0ae1d87323a20ed96f319d6 +Subproject commit e6a65cdb85edc4710017c33d4966425d852f0e47 diff --git a/qtwayland b/qtwayland index 61f92b67..98f38b01 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 61f92b6742c96f4974e23893ba6926e4d012cd09 +Subproject commit 98f38b01997ec59aa5040f839deb6f062f01be17 diff --git a/qtwebengine b/qtwebengine index c4bc2f83..6f9ecd0a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c4bc2f830d62ead99ca1d681992f1efafa7f70d6 +Subproject commit 6f9ecd0a4675b0e1a7ef6851cbda7e43c05e9536 diff --git a/qtx11extras b/qtx11extras index 8e4810cf..5a42fb1b 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 8e4810cf73a4294eacafede22f93f4bda8dab1bf +Subproject commit 5a42fb1b13a9ac91a6a078dc6d63dbbd5d87836e diff --git a/qtxmlpatterns b/qtxmlpatterns index 3cd6679d..bc5129b8 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 3cd6679d8702fef3f0d3614724375577945fcf05 +Subproject commit bc5129b8868891742356114ab05c6ac254fc07cd From 0ae61f0f4d13eaa952e2bb81a5b485ed7784ab26 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 Dec 2017 23:16:51 +0100 Subject: [PATCH 12/59] Update submodules on '5.9' in qt5 Change-Id: Ibdf2e0ca968b4fa5c0a5be8c6bfc1d05aa90d17d Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 37d78994..c9edc164 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 37d78994de56cd11a06ccd1a777cf0ac8ec8e801 +Subproject commit c9edc164ab165ddd31ef2411be19deb130614e8b diff --git a/qtbase b/qtbase index 782eb1a1..dc0bb57f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 782eb1a114c0aaa729925899b2061d47f494435f +Subproject commit dc0bb57f8600374b7279d5c14456a33a9d0c0476 diff --git a/qtdeclarative b/qtdeclarative index ae01e0db..243b819f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ae01e0dbf50cb6da1967e10eb95d63313dc5aa7a +Subproject commit 243b819ff73f6aaa9dc068d43b8b918a98f53663 diff --git a/qtimageformats b/qtimageformats index 4a5d500d..1225d9e4 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 4a5d500d6da8c7af2d3abfcf759586d5756efa77 +Subproject commit 1225d9e4aac319cb92ef88ebf7de305033ef30ba diff --git a/qtmultimedia b/qtmultimedia index 10998733..9caee039 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 10998733af8a3d54b795ee57a8df9a1b3e776aae +Subproject commit 9caee039533168fbb546b563859770414e54fc94 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d9e740d2..4a077f71 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d9e740d2ccf8c1d3caacfcd95537718048e3a7ba +Subproject commit 4a077f719dff799a89b5f370dfc71a7bd14b0930 diff --git a/qttools b/qttools index 796a5e00..2f3dc790 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 796a5e005fa1ae2bfe6f9278fc482723eb89f429 +Subproject commit 2f3dc790aefadc74debfa25efe958078def34146 diff --git a/qtwebengine b/qtwebengine index 260e9dd9..d4b3d945 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 260e9dd9b98c2bc90229f7d2f7aba8cc0029d24d +Subproject commit d4b3d9457bbe090c4ecc0d5a7d70e7bb08b22b90 diff --git a/qtwebview b/qtwebview index 17e076b5..4d4b118c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 17e076b56e40e25248f156830b293fee6421ecfc +Subproject commit 4d4b118c1294d96741d71a775ac1c57b5acb96bb From 04f8860d8c5b1a3a55bac82b98304c428ddce745 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 15 Dec 2017 14:35:53 +0100 Subject: [PATCH 13/59] Install cups-devel in OpenSuse This way we have one build that compiles the "with cups" branch and others (the ubuntu ones) that compile the "without cups" code branch Change-Id: I45ab3d72c34367789e0f344c917a88269883cffe Reviewed-by: Frederik Gladhorn --- .../qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh index fb2b81dd..132b3361 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh @@ -46,3 +46,6 @@ sudo zypper -nq install libXrandr-devel sudo zypper -nq install libXtst-devel sudo zypper -nq install mozilla-nspr-devel sudo zypper -nq install mozilla-nss-devel + +# cups +sudo zypper -nq install cups-devel From 2ee0364139f91e0a5a63ef427f3db83943eb7579 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 15 Dec 2017 20:25:44 +0300 Subject: [PATCH 14/59] Add GStreamer libraries to openSUSE for QtWebKit and QtMultimedia Change-Id: Ia40bb35687bbe1ecb429c042d4acfa22599b69b8 Reviewed-by: Konstantin Tokarev --- .../qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh index 9d93e90b..de71a0ff 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh @@ -54,3 +54,7 @@ sudo zypper -nq install mozilla-nss-devel # qtwebkit sudo zypper -nq install libxml2-devel sudo zypper -nq install libxslt-devel + +# GStreamer (qtwebkit and qtmultimedia) +sudo zypper -nq install gstreamer-devel +sudo zypper -nq install gstreamer-plugins-base-devel From 2e75f02a3f3ce4b5a857ff1db4ab2c84769b7e02 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 19 Dec 2017 03:01:05 +0200 Subject: [PATCH 15/59] Update submodules on '5.10' in qt5 Change-Id: I7d7808d588470cbb2712cbda34a0c1bcc5730d11 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index d69e2c2b..24e8db22 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d69e2c2b42719e6839f32e8ab796cf22d9f29bfa +Subproject commit 24e8db22e50449b30fac6619d074b98f08ff0315 diff --git a/qtbase b/qtbase index e739e984..e557a3c1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e739e984c3006ed2e88ef8f087455116cf9c4ebb +Subproject commit e557a3c1d3bc0f77ea669e670029569fd0228598 diff --git a/qtdeclarative b/qtdeclarative index 61fd2b3d..4fff2bb1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 61fd2b3d2a8b838e55d6560050ddf5ba7de3cee5 +Subproject commit 4fff2bb14e55484eacec0a1b49a2b02958f75eca diff --git a/qtdoc b/qtdoc index 21c0ac79..9682ba54 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 21c0ac79d94bbf9c999de45cff8086ca94de6d08 +Subproject commit 9682ba54bb30c148c058cfae44b07c2522765df5 diff --git a/qtquickcontrols b/qtquickcontrols index b9c95d63..65976402 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b9c95d63efde5d0ee9d332074285d5a4800391b5 +Subproject commit 65976402344a2642d6d6dc5bfbf71b3b511f6d12 diff --git a/qtwebengine b/qtwebengine index 6f9ecd0a..f7121794 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6f9ecd0a4675b0e1a7ef6851cbda7e43c05e9536 +Subproject commit f71217948ba690de6943ac09380260ff5e1c11fb From b3d3adc541ed9ca2ebe2620799f4d0add2376171 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 18 Dec 2017 22:08:47 +0300 Subject: [PATCH 16/59] Add libxml2 and libxslt to RHEL 7 for QtWebKit Change-Id: I5c50ee482aa20f0d9959915c81d2c44cccce6dca Reviewed-by: Frederik Gladhorn --- .../qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh index a8e812bd..a958adb6 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh @@ -83,6 +83,9 @@ installPackages+=(perl-Digest-SHA) installPackages+=(glibc.i686) # Enable Qt Bluetooth installPackages+=(bluez-libs-devel) +# QtWebKit +installPackages+=(libxml2-devel) +installPackages+=(libxslt-devel) sudo yum -y update sudo yum -y install "${installPackages[@]}" From a4adb7f7d66fed4b633bac15df8f9651503288ef Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 20 Dec 2017 03:01:18 +0200 Subject: [PATCH 17/59] Update submodules on '5.10' in qt5 Change-Id: I84aaff41d77d31eb5c4c9aae973aaccd879ede3e Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtmultimedia | 2 +- qtsensors | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index e557a3c1..ca181d37 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e557a3c1d3bc0f77ea669e670029569fd0228598 +Subproject commit ca181d3740c4251ef945625cbb6e235479b56bcd diff --git a/qtmultimedia b/qtmultimedia index 5629823b..1083ed94 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5629823b05ca7d24924ac879b5a0469a3cb03e78 +Subproject commit 1083ed94683c3356f9ee19210cfe9b0dd53e4815 diff --git a/qtsensors b/qtsensors index af1372a4..bfe35b4e 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit af1372a4e69d5a7664142df06b0b96d7cd197340 +Subproject commit bfe35b4ebc4ac46fd181b36d35e6535064f4e056 diff --git a/qtwebengine b/qtwebengine index f7121794..78cc35d0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f71217948ba690de6943ac09380260ff5e1c11fb +Subproject commit 78cc35d0705ef9f7b3e7785f031f77595ed71217 From 41edaa5fb94efb30f06f00713fe020350d20d712 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 18 Dec 2017 21:08:17 +0100 Subject: [PATCH 18/59] Update submodules on '5.9' in qt5 Change-Id: I85ef0fa0ae59f600ab53e9b566a08b2f22184f33 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index dc0bb57f..b0938cb6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dc0bb57f8600374b7279d5c14456a33a9d0c0476 +Subproject commit b0938cb6c1fa29ec2d2a4fb9273e515cd0d6c08e diff --git a/qtdeclarative b/qtdeclarative index 243b819f..e8570bd1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 243b819ff73f6aaa9dc068d43b8b918a98f53663 +Subproject commit e8570bd1af74724b6fae1ac8a2d8bbdfee7a6504 diff --git a/qtquickcontrols b/qtquickcontrols index 37592ad9..8a0f0553 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 37592ad9c6df35bdd37609569963fe7361cdad85 +Subproject commit 8a0f0553e4eb8468513bbb8ba45a9ec2bcd6ce68 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4a077f71..6b89293b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4a077f719dff799a89b5f370dfc71a7bd14b0930 +Subproject commit 6b89293b99e763589181fd1f75470712f52cee3c diff --git a/qttranslations b/qttranslations index 6987cf96..b3684346 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 6987cf9681dfb6c212a3225a8669499d3dfe1871 +Subproject commit b3684346bd60983cecf2524f9f8081df514b5cb0 diff --git a/qtwebengine b/qtwebengine index d4b3d945..5b160be9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d4b3d9457bbe090c4ecc0d5a7d70e7bb08b22b90 +Subproject commit 5b160be90599d13707610f253f541ff0c97c08e3 From d55baf5baf60e1deb0fa656652f617dac01b1236 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 13 Dec 2017 15:47:15 +0100 Subject: [PATCH 19/59] Simplify apt package installation and disable daily package maintenance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of using aptdcon, we can continue to use apt-get to install the software. We just need to make sure that the automatic update and package upgrade services are disabled. This is generally desirable as we do not want these kind of activities to occur in the background while building or running tests. This also fixes the broken package installation via regex, which apt-get supports but aptdcon does not. Revert "Fix Ubuntu 16.04 random provisioning fail" This reverts commit 537ea17d14526bc6564765e2dd4652e11a3ed235. Conflicts: coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh Change-Id: I920e5132bb0a248d3794e1efcf01ce78d28e6ee3 Reviewed-by: Joni Jäntti Reviewed-by: Frederik Gladhorn Reviewed-by: Jędrzej Nowacki --- .../qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index 9b71f935..980da2ca 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -45,47 +45,51 @@ try ( echo "Disabling auto update" sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic || throw $ExceptionSED + for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do + sudo systemctl stop $service + sudo systemctl disable $service + done echo "Running update for apt" sudo apt-get update echo "Installing packages" # Git is not needed by builds themselves, but is nice to have # immediately as one starts debugging - yes | sudo aptdcon --hide-terminal --install git || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install git || throw $ExceptionAPT # 7zip is a needed decompressing tool - yes | sudo aptdcon --hide-terminal --install p7zip || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install p7zip || throw $ExceptionAPT # libssl-dev provides headers for OpenSSL - yes | sudo aptdcon --hide-terminal --install libssl-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libssl-dev || throw $ExceptionAPT # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git - yes | sudo aptdcon --hide-terminal --install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT # Enable linking to system dbus - yes | sudo aptdcon --hide-terminal --install libdbus-1-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libdbus-1-dev || throw $ExceptionAPT # Needed libraries for WebEngine - yes | sudo aptdcon --hide-terminal --install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT # Common event loop handling - yes | sudo aptdcon --hide-terminal --install libglib2.0-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libglib2.0-dev || throw $ExceptionAPT # MySQL support - yes | sudo aptdcon --hide-terminal --install libmysqlclient-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libmysqlclient-dev || throw $ExceptionAPT # PostgreSQL support - yes | sudo aptdcon --hide-terminal --install libpq-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libpq-dev || throw $ExceptionAPT # SQLite support - yes | sudo aptdcon --hide-terminal --install libsqlite3-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libsqlite3-dev || throw $ExceptionAPT # ODBC support - yes | sudo aptdcon --hide-terminal --install unixodbc-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install unixodbc-dev || throw $ExceptionAPT # Support for FreeType font engine - yes | sudo aptdcon --hide-terminal --install libfreetype6-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libfreetype6-dev || throw $ExceptionAPT # Enable the usage of system jpeg libraries - yes | sudo aptdcon --hide-terminal --install libjpeg-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libjpeg-dev || throw $ExceptionAPT # Enable support for printer driver - yes | sudo aptdcon --hide-terminal --install libcups2-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libcups2-dev || throw $ExceptionAPT # Install libraries needed for QtMultimedia to be able to support all plugins - yes | sudo aptdcon --hide-terminal --install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT - yes | sudo aptdcon --hide-terminal --install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT # Support for cross-building to x86 (needed by WebEngine boot2qt builds) - yes | sudo aptdcon --hide-terminal --install g++-multilib || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT # python3 development package - yes | sudo aptdcon --hide-terminal --install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT # Automates interactive applications (Needed by RTA to automate configure testing) - yes | sudo aptdcon --hide-terminal --install expect || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install expect || throw $ExceptionAPT ) catch || { case $ex_code in From dd7f4112fd424c368906e99559ed0de7b9f227d6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Dec 2017 21:44:16 +0100 Subject: [PATCH 20/59] Update submodules on '5.9' in qt5 Change-Id: Ice93ecfe5e5c093c7bf455c05b87383cf157ed2e Reviewed-by: Liang Qi --- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtspeech | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtbase b/qtbase index b0938cb6..ffc8409a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b0938cb6c1fa29ec2d2a4fb9273e515cd0d6c08e +Subproject commit ffc8409aa58c04c1dd140001976b55925ac959f6 diff --git a/qtdatavis3d b/qtdatavis3d index de346171..4cd89b61 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit de346171018b353d2abcfb589e644480c2aa6fd5 +Subproject commit 4cd89b61be205fc52ce1b227fe55e4de04196db7 diff --git a/qtdeclarative b/qtdeclarative index e8570bd1..52bc4fbf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e8570bd1af74724b6fae1ac8a2d8bbdfee7a6504 +Subproject commit 52bc4fbfbae6aa1569dc134dd103e966f04bc2e6 diff --git a/qtdoc b/qtdoc index b8556f01..0703849b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b8556f01d711389d94cc1ccb864324b24c0e7def +Subproject commit 0703849b6d6a63873fc9334d573b7ee85256c655 diff --git a/qtlocation b/qtlocation index 730b2bd9..7508f021 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 730b2bd96e88fe63364c9f81e299555f0b1f0daa +Subproject commit 7508f02176f317db50f20985205bf64af8134ab6 diff --git a/qtmultimedia b/qtmultimedia index 9caee039..c8bf0cd3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9caee039533168fbb546b563859770414e54fc94 +Subproject commit c8bf0cd37c5f526e3687dfeff9e23d15104328b5 diff --git a/qtqa b/qtqa index 1110bd07..956200a1 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1110bd076dba536dc6e6304fe8d6ee80f2d5718f +Subproject commit 956200a160b0a1a9a15bbcd24c6c82e4dc01c2b6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6b89293b..c40486ac 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6b89293b99e763589181fd1f75470712f52cee3c +Subproject commit c40486acc352d49398186fa32d1ccabdd5fc83c6 diff --git a/qtremoteobjects b/qtremoteobjects index 170aa77f..286f3c62 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 170aa77ff7a38ba2ddbc68f75c1ac38a47af87ea +Subproject commit 286f3c626087635cb24708b8e42b1d8af0401640 diff --git a/qtscript b/qtscript index c904f06f..ef6c88d3 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit c904f06f716585edd94dbd1b4271dcbf305c268a +Subproject commit ef6c88d329386ece5b4a92d6a0865d7b90e036c0 diff --git a/qtspeech b/qtspeech index 53afd080..16ab9c26 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 53afd0808aeae53bf1ad94647be936cce00ef9a1 +Subproject commit 16ab9c262b1d53222913da96f7a14485e3ef0836 diff --git a/qtwayland b/qtwayland index 6bd70687..154bdf45 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6bd70687aa32d1ad6fedc7cfad499fdaf037193e +Subproject commit 154bdf45dd51a521058c820e7b871008ce8508ae diff --git a/qtwebengine b/qtwebengine index 5b160be9..17ecc4e7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5b160be90599d13707610f253f541ff0c97c08e3 +Subproject commit 17ecc4e7e0c88d891e1b18d5810a7ac2fd0b83ba From 21cbacf4b40cd261a3dca6fbf52e2ed6c379fe94 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 19 Dec 2017 10:31:03 +0200 Subject: [PATCH 21/59] Remove 'Packaging' flag from builds we don't need it We don't offer binaries for INTEGRITY, MSVC2013 32 bit or MSVC2017 32bit so we don't need 'packaging' flag there either Task-number: QTBUG-65324 Change-Id: If9e8fdebab44fcafde9b4da893be6f79f6287aac Reviewed-by: Iikka Eklund --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qt5.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 4f6920c9..5cb2bff5 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -22,4 +22,4 @@ qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 5282634a..558a756b 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,9 +1,9 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-8.1-x86_64 x86 MSVC2013 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86-6 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests From 88a1c161e5e61a369518833a1283c9fb7a76b1d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 14 Dec 2017 14:08:38 +0200 Subject: [PATCH 22/59] Remove unneeded OS X provisioning scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icf03c93adee31baac383d1394857df8c2df4fe59 Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh | 4 ---- coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh | 1 - coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh | 4 ---- coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh | 1 - coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh | 5 ----- 5 files changed, 15 deletions(-) delete mode 100755 coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh delete mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh delete mode 100755 coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh delete mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh delete mode 100755 coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh deleted file mode 100755 index b05dcf1c..00000000 --- a/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh deleted file mode 100644 index cd4e3fd9..00000000 --- a/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh +++ /dev/null @@ -1 +0,0 @@ -source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh deleted file mode 100755 index b05dcf1c..00000000 --- a/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh deleted file mode 100644 index cd4e3fd9..00000000 --- a/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh +++ /dev/null @@ -1 +0,0 @@ -source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh deleted file mode 100755 index d257ffa1..00000000 --- a/coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -# There is only one mac package and common script uses it as a default -$BASEDIR/../common/libclang.sh From a0bf828433b375c752713d6935ddb9134b2c68d3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 22 Dec 2017 12:57:22 +0100 Subject: [PATCH 23/59] Adjust submodule branches Change-Id: I3d6535fee48d27c87aab32847f5486a331402df1 --- .gitmodules | 78 ++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/.gitmodules b/.gitmodules index b4988927..b71cddd3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.9 + branch = 5.9.4 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.9 + branch = 5.9.4 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.9 + branch = 5.9.4 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.9 + branch = 5.9.4 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.9 + branch = 5.9.4 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.9 + branch = 5.9.4 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.9 + branch = 5.9.4 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.9 + branch = 5.9.4 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,101 +211,101 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.9 + branch = 5.9.4 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.9 + branch = 5.9.4 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.9 + branch = 5.9.4 status = preview [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.9 + branch = 5.9.4 status = preview From de0d7005ccff69ef1ea4c3ad42a2bf4033e26429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 20 Dec 2017 08:08:01 +0200 Subject: [PATCH 24/59] Fix Android provisioning script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have to accept extra license to enable installing all required packages. Task-number: QTQAINFRA-1660 Change-Id: I9d014991be96ff0723688b317a645e281b3e92d0 Reviewed-by: Tony Sarajärvi (cherry picked from commit 5df4ec2ec999440ba291f2bf2f9fa6b72810660d) --- coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh index e041027d..bc8a95e6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh @@ -77,7 +77,7 @@ try sudo chown -R qt:wheel "$targetFolder" echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager + (echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc From 2d71b84893af65823d6ab18afffebfffdc032333 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 23 Dec 2017 18:34:36 +0100 Subject: [PATCH 25/59] Update submodules on '5.9' in qt5 Change-Id: I88561b7971943d494f81fe309d849f5c0d94d2e3 Reviewed-by: Liang Qi --- qtbase | 2 +- qtquickcontrols2 | 2 +- qtvirtualkeyboard | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index ffc8409a..44ef95a8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ffc8409aa58c04c1dd140001976b55925ac959f6 +Subproject commit 44ef95a885f440a33e79ff3f9a79d4bb6d408dda diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c40486ac..31a65540 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c40486acc352d49398186fa32d1ccabdd5fc83c6 +Subproject commit 31a655402ff194e556853e6877f1a464a8e51243 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6ecb881b..cb5fab80 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6ecb881bdc73a4ab1f4485e14bb87c18aac771ca +Subproject commit cb5fab803f3227f4c678a6a694d907fc385c7b05 From 1399d6e130596443f98fdb3f3d52d3aa30facb69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 19 Dec 2017 22:46:45 +0200 Subject: [PATCH 26/59] Add set -ex to provisioning scripts for RHEL 7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1659 Change-Id: I9e3c1ec559eab29ccb693956201fc2b63f999882 Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- .../001-refresh-subscription-manager.sh | 2 ++ .../001-systemsetup.sh | 2 +- .../002-enable-repos.sh | 36 +++++++++++++++++++ .../003-install-devtoolset.sh | 2 ++ .../004-install-packages.sh | 2 +- .../005-libclang.sh | 1 + .../qtci-linux-RHEL-7.4-x86_64/006-cmake.sh | 2 ++ .../qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh | 2 ++ .../008-integrity.sh | 2 ++ .../009-disable_selinux.sh | 2 ++ .../010-openssl_for_android_linux.sh | 3 ++ .../040-android_linux.sh | 2 ++ .../08-pythondev.sh | 4 +-- 13 files changed, 58 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh index a76a8638..2f7adf54 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh @@ -33,6 +33,8 @@ ## ############################################################################# +set -ex + # refresh local certificates sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh index 22bf19a3..f2caf274 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh @@ -33,7 +33,7 @@ ## ############################################################################# -set -e +set -ex BASEDIR=$(dirname "$0") source $BASEDIR/../common/network_test_server_ip.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh index 2697de04..08c4371a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh @@ -1,2 +1,38 @@ #!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +set -ex + sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh index 439e2db5..5667058f 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh @@ -33,6 +33,8 @@ ## ############################################################################# +set -ex + sudo yum-config-manager --enable rhel-server-rhscl7-rpms sudo yum -y install devtoolset-4 diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh index a8e812bd..4565a843 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh @@ -33,7 +33,7 @@ ## ############################################################################# -set -e +set -ex installPackages=() installPackages+=(git) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh index abbda212..bf2e1ce9 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -ex BASEDIR=$(dirname "$0") . $BASEDIR/../common/sw_versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh index 46976e9a..bd94aba9 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh @@ -35,6 +35,8 @@ # This script installs CMake 3.6.2 +set -ex + # CMake is needed for autotests that verify that Qt can be built with CMake source "${BASH_SOURCE%/*}/../common/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh index 4a4031cc..73591496 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh @@ -33,4 +33,6 @@ ## ############################################################################# +set -ex + source "${BASH_SOURCE%/*}/../common/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh index 56b1556d..b8c88dee 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh @@ -33,4 +33,6 @@ ## ############################################################################# +set -ex + source "${BASH_SOURCE%/*}/../common/integrity.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh index 3eced1a4..e91cee9f 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh @@ -33,4 +33,6 @@ ## ############################################################################# +set -ex + source "${BASH_SOURCE%/*}/../common/disable_selinux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh index b69295fc..af7d7c13 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh @@ -34,4 +34,7 @@ ############################################################################# source /opt/rh/devtoolset-4/enable + +set -ex + source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh index 637c4224..5808a45c 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh @@ -33,4 +33,6 @@ ## ############################################################################# +set -ex + source "${BASH_SOURCE%/*}/../common/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh index 6ae0f820..40cb276a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh @@ -33,10 +33,10 @@ ## ############################################################################# -source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" - set -ex +source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" + packageEpel="epel-release-latest-7.noarch.rpm" OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel" CachedUrl="http://ci-files01-hki.intra.qt.io/input/redhat/$packageEpel" From fb282b2e58e126dd5fb65ccc3cfd2bdc22db6509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 21 Dec 2017 09:30:02 +0200 Subject: [PATCH 27/59] Provision fbx to RHEL 7.4 for 3DStudio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2aaad4abc2e3d42bdd1f5204d20ee4fea3c0388f Reviewed-by: Simo Fält --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh new file mode 100755 index 00000000..bf9b64af --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/fbx_linux.sh From 70d3800aab5c3edd9e4551a9c9f23fa2e9b53b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 21 Dec 2017 08:39:04 +0200 Subject: [PATCH 28/59] Remove provisioning of ICU for VS2012 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Visual Studio 2012 isn't used in our builds. Change-Id: I7f2480a1811efd1c1f164f468407ab55d5c4102d Reviewed-by: Simo Fält --- coin/provisioning/common/icu.ps1 | 36 -------------------------------- 1 file changed, 36 deletions(-) diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1 index 16dd8a6f..c08748d8 100644 --- a/coin/provisioning/common/icu.ps1 +++ b/coin/provisioning/common/icu.ps1 @@ -39,29 +39,12 @@ $version = "53_1" if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { - $url_official_2012 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_64_devel.7z" - $url_cache_2012 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_64_devel.7z" - $sha1_2012 = "8A8C371F3ED58E81BBCF58CF5F8388CEF51FA9AC" - $url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z" $url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z" $sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F" - $icuPackage_msvc2012_64 = "C:\Windows\Temp\icu-$version-msvc2012_64.7z" $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z" - if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_64_devel\)) { - echo "Fetching from URL ..." - Download $url_official_2012 $url_cache_2012 $icuPackage_msvc2012_64 - Verify-Checksum $icuPackage_msvc2012_64 $sha1_2012 - Get-ChildItem $icuPackage_msvc2012_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_64_devel\""} - - echo "Cleaning $icuPackage_msvc2012_64..." - Remove-Item -Recurse -Force $icuPackage_msvc2012_64 - - echo "ICU MSVC2012 = $version" >> ~\versions.txt - } - if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) { echo "Fetching from URL ..." Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64 @@ -75,7 +58,6 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e } # FIXME: do we really want to have it per MSVC version? What about MSVC2015? -[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine") [Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine") # FIXME: do we really want to use the 4.8.2 ICU build? @@ -83,29 +65,12 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e } else { - $url_official_2012_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_32_devel.7z" - $url_cache_2012_32 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_32_devel.7z" - $sha1_2012_32 = "F2FF287EEB0163B015D37AE08871165FBA87BCF0" - $url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z" $url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z" $sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800" - $icuPackage_msvc2012_32 = "C:\Windows\Temp\icu-$version-msvc2012_32.7z" $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z" - if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_32_devel\)) { - echo "Fetching from URL ..." - Download $url_official_2012_32 $url_cache_2012_32 $icuPackage_msvc2012_32 - Verify-Checksum $icuPackage_msvc2012_32 $sha1_2012_32 - Get-ChildItem $icuPackage_msvc2012_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_32_devel\""} - - echo "Cleaning $icuPackage_msvc2012_32..." - Remove-Item -Recurse -Force $icuPackage_msvc2012_32 - - echo "ICU MSVC2012 = $version" >> ~\versions.txt - } - if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) { echo "Fetching from URL ..." Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32 @@ -119,7 +84,6 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e } # FIXME: do we really want to have it per MSVC version? What about MSVC2015? -[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_32_devel\\icu53_1", "Machine") [Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine") } From b23faee265630632a0fa057d226d0fe3f3f25140 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 12:39:38 +0200 Subject: [PATCH 29/59] Add set -ex to provisioning scripts for osx-10.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I56ecd39a553b8b777eac0f8822cfd3263e972ef5 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh | 3 +++ coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh | 3 +++ coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh | 2 +- .../qtci-osx-10.11-x86_64/021-install-commandlinetools.sh | 3 +++ coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh | 3 +++ coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh | 2 ++ 15 files changed, 33 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh index ba8dbdd3..77c41533 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh @@ -1,2 +1,5 @@ #!/bin/sh + +set -ex + defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh index b05dcf1c..a1ab3a92 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh index 0fbe7628..a59e3e63 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -ex + # Read .bashrc if exist printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh index 4a07bbbe..3e495a63 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh @@ -35,6 +35,8 @@ # This script modified system settings for automated use +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh index 61406203..2cdedcf5 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh @@ -1,3 +1,6 @@ #!/bin/sh + +set -ex + # Enables the usage of temporary keychains for SSL autotests echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh index 8a3999b9..61c7fc6d 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh @@ -37,6 +37,8 @@ # XZ-Utils are needed for uncompressing xz-compressed files +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh index 37acc2ee..8ca4a3ac 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh @@ -42,7 +42,7 @@ # This will give you a file called "Content.part00.cpio.xz" that # can be renamed to Xcode_8.xz for this script. - +set -ex # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh index 9145c12a..2f46c41d 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh @@ -32,6 +32,9 @@ ## $QT_END_LICENSE$ ## ############################################################################# + +set -ex + source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" version="8.2" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh index ddb01d64..3cdbd463 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh index 63ec9b69..9fb5d672 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/homebrew.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh index 1e4de16a..3e545d9e 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh @@ -37,6 +37,8 @@ # MySQL is needed for Qt to be able to support MySQL +set -ex + # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh index a990829e..b7393895 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh @@ -37,6 +37,8 @@ # PostgreSQL is needed for Qt to be able to support PostgreSQL +set -ex + # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh index cd4e3fd9..86bee612 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh @@ -1 +1,3 @@ +set -ex + source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh b/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh index 4fb9ddbc..15511332 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash # Install 7z to be used from command line + +set -ex + brew update brew install p7zip diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh index d257ffa1..2a8a90c3 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default $BASEDIR/../common/libclang.sh From cec7c072838359522ad2743e765d0c6315de907c Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 12:35:25 +0200 Subject: [PATCH 30/59] Add set -ex to provisioning scripts for osx-10.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I732df317aa0016b1d970e0d37167a3fc9276a645 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh | 3 +++ coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh | 2 ++ .../qtci-osx-10.10-x86_64/002-disable-screensaver.sh | 2 ++ coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh | 2 ++ coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh | 2 ++ coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh | 2 ++ coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh | 2 ++ 7 files changed, 15 insertions(+) diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh index ba8dbdd3..77c41533 100644 --- a/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh @@ -1,2 +1,5 @@ #!/bin/sh + +set -ex + defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh index b05dcf1c..a1ab3a92 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh index 44df94e7..d5b2101e 100644 --- a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -ex + mkdir -p $HOME/Library/LaunchAgents cat >$HOME/Library/LaunchAgents/no-screensaver.plist < diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh index 0fbe7628..a59e3e63 100644 --- a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -ex + # Read .bashrc if exist printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh index ddb01d64..3cdbd463 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh index cd4e3fd9..86bee612 100644 --- a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh @@ -1 +1,3 @@ +set -ex + source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh index d257ffa1..2a8a90c3 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default $BASEDIR/../common/libclang.sh From 28bf922739591ea47800fae36a77e17f4f3ec7ae Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 12:32:35 +0200 Subject: [PATCH 31/59] Add set -ex to provisioning scripts for macos-10.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ieea4f84909c552728614a4d3c23d4c8ab9134fb2 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh | 3 +++ coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh | 3 +++ coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh | 3 +++ coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh | 2 ++ .../qtci-macos-10.12-x86_64/021-install-commandlinetools.sh | 3 +++ coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh | 3 +++ coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh | 2 ++ 20 files changed, 45 insertions(+) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh index 0fbe7628..a59e3e63 100644 --- a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -ex + # Read .bashrc if exist printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh index 5819e9de..7b1b967c 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh @@ -33,6 +33,8 @@ ## ############################################################################# +set -ex + # This script modified system settings for automated use # shellcheck source=../common/try_catch.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh b/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh index ba8dbdd3..77c41533 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh @@ -1,2 +1,5 @@ #!/bin/sh + +set -ex + defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh index 61406203..2cdedcf5 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh @@ -1,3 +1,6 @@ #!/bin/sh + +set -ex + # Enables the usage of temporary keychains for SSL autotests echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh index ef676ab3..5171156c 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh @@ -37,6 +37,8 @@ # XZ-Utils are needed for uncompressing xz-compressed files +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh index 743cc9da..4c76f16a 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh @@ -34,6 +34,9 @@ ############################################################################# # This script installs JDK + +set -ex + echo "Installing Java Development Kit" # shellcheck source=../common/try_catch.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh index 6d57bfaa..72e521c5 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh @@ -42,6 +42,8 @@ # This will give you a file called "Content.part00.cpio.xz" that # can be renamed to Xcode_8.xz for this script. +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh index b460cc02..352c8342 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh @@ -32,6 +32,9 @@ ## $QT_END_LICENSE$ ## ############################################################################# + +set -ex + source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" version="8.3.2" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh index ddb01d64..3cdbd463 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/cmake.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh index 63ec9b69..9fb5d672 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/homebrew.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh index ca21f481..0ccd34f9 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh @@ -37,6 +37,8 @@ # MySQL is needed for Qt to be able to support MySQL +set -ex + # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh index 07c9a617..9e1df19a 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/pip.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh index cb5c1852..3de6cc89 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh @@ -37,6 +37,8 @@ # PostgreSQL is needed for Qt to be able to support PostgreSQL +set -ex + # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh index cd4e3fd9..86bee612 100644 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh @@ -1 +1,3 @@ +set -ex + source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh index 4fb9ddbc..15511332 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash # Install 7z to be used from command line + +set -ex + brew update brew install p7zip diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh index 9e4f1d3e..8cdb7108 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/virtualenv.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh index d257ffa1..2a8a90c3 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default $BASEDIR/../common/libclang.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh index bc8a95e6..0b15d557 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh @@ -37,6 +37,8 @@ # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh index 50c6796b..acefd8b7 100644 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/fbx_macos.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh index d109051d..9dd79862 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh @@ -35,6 +35,8 @@ # This script install OpenSSL +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" # shellcheck source=../common/InstallFromCompressedFileFromURL.sh From 66595488f0abfd0e078e93f61a5e209c848129c4 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 12:25:50 +0200 Subject: [PATCH 32/59] Add set -ex to provisioning scripts for Ubuntu-16.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icc4b58080875255d8c2efe3e5db2c05e18127606 Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 2 ++ coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh index 2498e441..c9484698 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh @@ -36,6 +36,9 @@ # This script modifies system settings for automated use # shellcheck source=../common/try_catch.sh + +set -ex + source "${BASH_SOURCE%/*}/../common/try_catch.sh" NTS_IP=10.212.2.216 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index 980da2ca..7c332aed 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -35,6 +35,8 @@ # Install required packages with APT +set -ex + source "${BASH_SOURCE%/*}/../common/try_catch.sh" ExceptionAPTUpdate=100 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh index 050f4aba..1382b279 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh @@ -35,7 +35,7 @@ # This script installs the Yocto toolchain -set -e +set -ex source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh index 7c5fadcb..b121d604 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh @@ -1,4 +1,6 @@ #!/bin/bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/fbx_linux.sh From ca89bec297612752a7f9c6015f236631e1401e92 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 12:22:57 +0200 Subject: [PATCH 33/59] Add set -ex to provisioning scripts for RHEL 6.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6e6e66cffcbd84af1e093176d65751063492122b Reviewed-by: Tony Sarajärvi --- .../05-subscription-manager-tooling.sh | 3 +++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh | 3 +++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 2 ++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh | 3 +++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 2 ++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh | 3 +++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh | 3 +++ 7 files changed, 19 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh index 852c1100..59fd541f 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh @@ -2,5 +2,8 @@ # version: provided by RedHat # needed for yum to work properly in case there is incorrect data in # the sslclientkey repository parameter value + +set -ex + sudo rm -f /etc/pki/entitlement/* sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh index f6c90a75..4e4fb462 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh @@ -1,4 +1,7 @@ # provides: odbc devel packages on RHEL # version: provided by default Linux distribution repository # needed for configure -plugin-sql-odbc in qtbase + +set -ex + sudo yum install -y unixODBC-devel diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh index aa64a892..5248f86f 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") . $BASEDIR/../common/sw_versions.txt VERSION=$libclang_version diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh index 0003127a..43ba9ecd 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -1,6 +1,9 @@ # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside + +set -ex + sudo yum install -y python-devel python-virtualenv # install the EPEL repository which provides python3 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh index d7abd285..5c88e498 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -1 +1,3 @@ +set -ex + $(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh index 229e259f..1831ea52 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh @@ -1,3 +1,6 @@ #!/bin/env bash # Required for tqtc-boot2qt/qdb + +set -ex + sudo yum install -y libusb1-devel diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh index 5ef5f0e9..836f6ec4 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh @@ -36,6 +36,9 @@ # This script needs to be called last during provisioning so that the software information will show up last in provision log. # Storage installed RPM packages information + +set -ex + echo "*********************************************" >> ~/versions.txt echo "***** All installed RPM packages *****" >> ~/versions.txt rpm -q -a | sort >> ~/versions.txt From d29192ad3f499bd09da0e811d03f60d6a7aa6476 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 12:17:55 +0200 Subject: [PATCH 34/59] Add set -ex to provisioning scripts for openSUSE-42.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I71fb0074bc07ce3085401ac23be77ea32e52dcfa Reviewed-by: Tony Sarajärvi --- .../qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh | 2 ++ coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh | 3 +++ coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh | 2 ++ .../qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 3 +++ 7 files changed, 13 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh index 4b2f2546..d01ed9e9 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -ex BASEDIR=$(dirname "$0") source $BASEDIR/../common/network_test_server_ip.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh index 132b3361..b8495402 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -ex sudo zypper -nq install git # default compiler, gcc 4.8.5 diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh index d8874561..1105d303 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh @@ -2,6 +2,8 @@ # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside +set -ex + sudo zypper -nq install python-devel python-virtualenv # install python3 diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh index d10bc06d..f1f2d5bd 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh @@ -1,2 +1,5 @@ #!/usr/bin/env bash + +set -ex + $(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh index 15b46aef..01e1291c 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh @@ -37,7 +37,7 @@ source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" -set -e +set -ex mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" localMount="/mnt/storage/" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh index abbda212..f0e0f19c 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") . $BASEDIR/../common/sw_versions.txt VERSION=$libclang_version diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh index ce0badc0..51516380 100644 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -1,6 +1,9 @@ # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside + +set -ex + sudo pkcon -y refresh sudo pkcon -y install python-devel python-virtualenv From fcc0feaacb91ab5aefb212d351dcea7c728eefa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Thu, 23 Nov 2017 13:44:19 +0200 Subject: [PATCH 35/59] Add clean Ubuntu 16.04 provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently Ubuntu 16.04 template has stuff installed on its tier 1. We want to have a clean installed tier 1 and install everything on it during provisioning. This will save some disk space on our hosts. Task-number: QTQAINFRA-1574 Change-Id: Ia7e6df62835a8e31943c00996f12ac70c6c71aed Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 10 +- coin/platform_configs/qtdeclarative.txt | 4 +- coin/provisioning/common/android_linux.sh | 7 +- .../{001-systemsetup.sh => 01-systemsetup.sh} | 0 .../{002-apt.sh => 02-apt.sh} | 129 ++++++++++++------ .../{003-qemu.sh => 03-qemu.sh} | 0 .../{004-yocto.sh => 04-yocto.sh} | 0 .../10-openssl_for_android_linux.sh | 40 ++++++ .../{030-fbx.sh => 30-fbx.sh} | 0 .../40-android_linux.sh | 38 ++++++ 10 files changed, 181 insertions(+), 47 deletions(-) rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{001-systemsetup.sh => 01-systemsetup.sh} (100%) rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{002-apt.sh => 02-apt.sh} (56%) rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{003-qemu.sh => 03-qemu.sh} (100%) rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{004-yocto.sh => 04-yocto.sh} (100%) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{030-fbx.sh => 30-fbx.sh} (100%) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 5cb2bff5..805b32e9 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -7,8 +7,8 @@ qtci-windows-10-x86_64-10 x86 MSVC2015 qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation +qtci-linux-Ubuntu-16.04-x86_64-2 GCC NoWidgets ForceDebugInfo +qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo @@ -18,8 +18,8 @@ qtci-osx-10.11-x86_64-3 Clang qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC Release -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release -qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck +qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release +qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release +qtci-linux-Ubuntu-16.04-x86_64-2 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index 3139af8b..9d321d40 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC DeveloperBuild diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/android_linux.sh index ee3008c1..232326b7 100644 --- a/coin/provisioning/common/android_linux.sh +++ b/coin/provisioning/common/android_linux.sh @@ -79,8 +79,11 @@ try rm "$toolsTargetFile" || throw $ExceptionRmTools echo "Changing ownership of Android files." - sudo chown -R qt:wheel "$targetFolder" - + if uname -a |grep -q "el6\|el7"; then + sudo chown -R qt:wheel "$targetFolder" + else + sudo chown -R qt:users "$targetFolder" + fi echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh similarity index 56% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index 7c332aed..d6e53954 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -51,47 +51,100 @@ try sudo systemctl stop $service sudo systemctl disable $service done + # Git is not needed by builds themselves, but is nice to have + # immediately as one starts debugging + installPackages+=(git) + # 7zip is a needed decompressing tool + installPackages+=(p7zip) + # libssl-dev provides headers for OpenSSL + installPackages+=(libssl-dev) + # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git + installPackages+=("^libxcb.*") + installPackages+=(libxkbcommon-dev) + installPackages+=(libxkbcommon-x11-dev) + installPackages+=(libx11-xcb-dev) + installPackages+=(libglu1-mesa-dev) + installPackages+=(libxrender-dev) + installPackages+=(libxi-dev) + # Enable linking to system dbus + installPackages+=(libdbus-1-dev) + # Needed libraries for WebEngine + installPackages+=(libudev-dev) + installPackages+=(libegl1-mesa-dev) + installPackages+=(libfontconfig1-dev) + installPackages+=(libxss-dev) + # Common event loop handling + installPackages+=(libglib2.0-dev) + # MySQL support + installPackages+=(libmysqlclient-dev) + # PostgreSQL support + installPackages+=(libpq-dev) + # SQLite support + installPackages+=(libsqlite3-dev) + # ODBC support + installPackages+=(unixodbc-dev) + # Support for FreeType font engine + installPackages+=(libfreetype6-dev) + # Enable the usage of system jpeg libraries + installPackages+=(libjpeg-dev) + # Enable support for printer driver + installPackages+=(libcups2-dev) + # Install libraries needed for QtMultimedia to be able to support all plugins + installPackages+=(libasound2-dev) + installPackages+=(libgstreamer1.0-dev) + installPackages+=(libgstreamer-plugins-base1.0-dev) + installPackages+=(libgstreamer-plugins-good1.0-dev) + installPackages+=(libgstreamer-plugins-bad1.0-dev) + # Support for cross-building to x86 (needed by WebEngine boot2qt builds) + installPackages+=(g++-multilib) + # python3 development package + installPackages+=(python3-dev) + installPackages+=(python3-pip) + installPackages+=(python3-virtualenv) + # Automates interactive applications (Needed by RTA to automate configure testing) + installPackages+=(expect) + installPackages+=(mesa-common-dev) + installPackages+=(libgl1-mesa-glx) + installPackages+=(libgl1-mesa-dev) + installPackages+=(libegl1-mesa-dev) + installPackages+=(curl) + installPackages+=(libicu-dev) + installPackages+=(zlib1g-dev) + installPackages+=(zlib1g) + installPackages+=(openjdk-8-jdk) + installPackages+=(libgtk-3-dev) + installPackages+=(ninja-build) + installPackages+=(libssl-dev) + installPackages+=(libxcursor-dev) + installPackages+=(libxcomposite-dev) + installPackages+=(libxdamage-dev) + installPackages+=(libxrandr-dev) + installPackages+=(libfontconfig1-dev) + installPackages+=(libxss-dev) + installPackages+=(libsrtp0-dev) + installPackages+=(libwebp-dev) + installPackages+=(libjsoncpp-dev) + installPackages+=(libopus-dev) + installPackages+=(libminizip-dev) + installPackages+=(libavutil-dev) + installPackages+=(libavformat-dev) + installPackages+=(libavcodec-dev) + installPackages+=(libevent-dev) + installPackages+=(bison) + installPackages+=(flex) + installPackages+=(gperf) + installPackages+=(libasound2-dev) + installPackages+=(libpulse-dev) + installPackages+=(libxtst-dev) + installPackages+=(libnspr4-dev) + installPackages+=(libnss3-dev) + installPackages+=(libopenal-dev) + installPackages+=(libbluetooth-dev) + echo "Running update for apt" sudo apt-get update echo "Installing packages" - # Git is not needed by builds themselves, but is nice to have - # immediately as one starts debugging - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install git || throw $ExceptionAPT - # 7zip is a needed decompressing tool - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install p7zip || throw $ExceptionAPT - # libssl-dev provides headers for OpenSSL - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libssl-dev || throw $ExceptionAPT - # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT - # Enable linking to system dbus - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libdbus-1-dev || throw $ExceptionAPT - # Needed libraries for WebEngine - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT - # Common event loop handling - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libglib2.0-dev || throw $ExceptionAPT - # MySQL support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libmysqlclient-dev || throw $ExceptionAPT - # PostgreSQL support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libpq-dev || throw $ExceptionAPT - # SQLite support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libsqlite3-dev || throw $ExceptionAPT - # ODBC support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install unixodbc-dev || throw $ExceptionAPT - # Support for FreeType font engine - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libfreetype6-dev || throw $ExceptionAPT - # Enable the usage of system jpeg libraries - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libjpeg-dev || throw $ExceptionAPT - # Enable support for printer driver - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libcups2-dev || throw $ExceptionAPT - # Install libraries needed for QtMultimedia to be able to support all plugins - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT - # Support for cross-building to x86 (needed by WebEngine boot2qt builds) - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT - # python3 development package - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT - # Automates interactive applications (Needed by RTA to automate configure testing) - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install expect || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" || throw $ExceptionAPT ) catch || { case $ex_code in diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh new file mode 100755 index 00000000..af7d7c13 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +source /opt/rh/devtoolset-4/enable + +set -ex + +source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh new file mode 100755 index 00000000..5808a45c --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +set -ex + +source "${BASH_SOURCE%/*}/../common/android_linux.sh" From d6f7d6ed8bb530ca22d1a9250d79adfd960151bb Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 20 Dec 2017 13:25:40 +0200 Subject: [PATCH 36/59] Provisioning: VirtualBox for RTA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RTA needs VirtualBox for running GammaRayPlugin RTA tests. Task-number: QTQAINFRA-1661 Change-Id: If66d6a63355ed5cc8c8525408c2dfc8c4f3d1bac Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 3 ++ .../90-install-virtualbox.ps1 | 51 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index d6e53954..7cc16024 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -140,6 +140,9 @@ try installPackages+=(libnss3-dev) installPackages+=(libopenal-dev) installPackages+=(libbluetooth-dev) + #VirtualBox for RTA + installPackages+=(virtualbox) + installPackages+=(dkms) echo "Running update for apt" sudo apt-get update diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 new file mode 100644 index 00000000..4d09becf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 @@ -0,0 +1,51 @@ +############################################################################ +## +## 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\..\common\helpers.ps1" + +# This script will install VirtualBox + +$version = "5.2.4" +$sha1 = "71df4474a5e94918728b62d1f6bc036674ef0e96" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VirtualBox-" + $version + "-119785-Win.exe" +$url_official = "http://download.virtualbox.org/virtualbox/" + $version + "/VirtualBox-" + $version + "-119785-Win.exe" +$virtualboxPackage = "C:\Windows\Temp\virtualbox-$version.exe" + +Download $url_official $url_cache $virtualboxPackage +Verify-Checksum $virtualboxPackage $sha1 +Start-Process $virtualboxPackage -ArgumentList "--silent" -Wait + +echo "Cleaning $virtualboxPackage.." +Remove-Item -Recurse -Force "$virtualboxPackage" + +echo "VirtualBox = $version" >> ~\versions.txt From 19f8a741f3556271dc4ef598bbf725f89b733b6a Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 11:12:09 +0200 Subject: [PATCH 37/59] Make provisioning script prefix style match across platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we are using different styles and amount of digits for the provisioning script prefixes. This change will unify them across the platforms. Also removes a couple of duplicate files. Task-number: QTQAINFRA-1668 Change-Id: I039777e7616bccc29c6a4ac55db13326ae8dc87c Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- .../{libusb.sh => 20-libusb.sh} | 0 .../{install_icu.sh => 30-install_icu.sh} | 0 .../{patch_qnx.sh => 50-patch_qnx.sh} | 0 .../{version.sh => 99-version.sh} | 0 ...n-manager.sh => 01-refresh-subscription-manager.sh} | 0 .../{001-systemsetup.sh => 01-systemsetup.sh} | 0 .../{002-enable-repos.sh => 02-enable-repos.sh} | 0 ...-install-devtoolset.sh => 03-install-devtoolset.sh} | 0 ...{004-install-packages.sh => 04-install-packages.sh} | 0 .../{004-p7zip.sh => 04-p7zip.sh} | 0 .../{005-libclang.sh => 05-libclang.sh} | 0 .../{006-cmake.sh => 06-cmake.sh} | 0 .../{007-qnx_700.sh => 07-qnx_700.sh} | 0 .../{008-integrity.sh => 08-integrity.sh} | 0 .../{009-disable_selinux.sh => 09-disable_selinux.sh} | 0 ...ndroid_linux.sh => 10-openssl_for_android_linux.sh} | 0 .../{030-fbx.sh => 30-fbx.sh} | 0 .../{009-install_icu.sh => 30-install_icu.sh} | 0 .../{040-android_linux.sh => 40-android_linux.sh} | 0 .../qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh | 10 ---------- .../{001-systemsetup.sh => 01-systemsetup.sh} | 0 .../{002-zypperpackages.sh => 02-zypperpackages.sh} | 0 .../{009-cmake.sh => 09-cmake.sh} | 0 .../{018-icc.sh => 18-icc.sh} | 0 .../{003-bashprofile.sh => 03-bashprofile.sh} | 0 .../{005-systemsetup.sh => 05-systemsetup.sh} | 0 .../{006-crashreporter.sh => 06-crashreporter.sh} | 0 .../{007-SSL_keychain.sh => 07-SSL_keychain.sh} | 0 .../qtci-macos-10.12-x86_64/{015-xz.sh => 15-xz.sh} | 0 .../{020-java.sh => 20-java.sh} | 0 .../{020-xcode.sh => 20-xcode.sh} | 0 ...mandlinetools.sh => 21-install-commandlinetools.sh} | 0 .../{025-cmake.sh => 25-cmake.sh} | 0 .../{025-homebrew.sh => 25-homebrew.sh} | 0 .../{025-mysql.sh => 25-mysql.sh} | 0 .../qtci-macos-10.12-x86_64/{025-pip.sh => 25-pip.sh} | 0 .../{025-postgresql.sh => 25-postgresql.sh} | 0 .../{025-python3.sh => 25-python3.sh} | 0 .../{026-p7zip.sh => 26-p7zip.sh} | 0 .../{026-virtualenv.sh => 26-virtualenv.sh} | 0 .../{027-libclang.sh => 27-libclang.sh} | 0 .../{030-android.sh => 30-android.sh} | 0 .../qtci-macos-10.12-x86_64/{030-fbx.sh => 30-fbx.sh} | 0 .../{035-openssl.sh => 35-openssl.sh} | 0 .../{555-signtools.sh => 55-signtools.sh} | 0 .../{001-crashreporter.sh => 01-crashreporter.sh} | 0 .../{001-system_updates.sh => 01-system_updates.sh} | 0 ...isable-screensaver.sh => 02-disable-screensaver.sh} | 0 .../{003-bashprofile.sh => 03-bashprofile.sh} | 0 .../{004-cmake.sh => 04-cmake.sh} | 0 .../{025-python3.sh => 25-python3.sh} | 0 .../{001-crashreporter.sh => 01-crashreporter.sh} | 0 .../{001-system_updates.sh => 01-system_updates.sh} | 0 .../{003-bashprofile.sh => 03-bashprofile.sh} | 0 .../{005-systemsetup.sh => 05-systemsetup.sh} | 0 .../{007-SSL_keychain.sh => 07-SSL_keychain.sh} | 0 .../qtci-osx-10.11-x86_64/{015-xz.sh => 15-xz.sh} | 0 .../{020-xcode.sh => 20-xcode.sh} | 0 ...mandlinetools.sh => 21-install-commandlinetools.sh} | 0 .../{025-cmake.sh => 25-cmake.sh} | 0 .../{025-homebrew.sh => 25-homebrew.sh} | 0 .../{025-mysql.sh => 25-mysql.sh} | 0 .../{025-postgresql.sh => 25-postgresql.sh} | 0 .../{025-python3.sh => 25-python3.sh} | 0 .../{026-p7zip.sh => 26-p7zip.sh} | 0 .../{08-libclang.sh => 27-libclang.sh} | 0 ...able-windefender.ps1 => 04-disable-windefender.ps1} | 0 .../qtci-windows-10-x86/{msvc.ps1 => 05-msvc.ps1} | 0 .../{005-wsearch-off.ps1 => 05-wsearch-off.ps1} | 0 .../{python3.ps1 => 08-python3.ps1} | 0 .../qtci-windows-10-x86/{icu.ps1 => 10-icu.ps1} | 0 ...pdate3_patch.ps1 => 10-msvc_2015_update3_patch.ps1} | 0 .../qtci-windows-10-x86/{jom.ps1 => 60-jom.ps1} | 0 .../qtci-windows-10-x86/{cmake.ps1 => 70-cmake.ps1} | 0 .../qtci-windows-10-x86/{libusb.ps1 => 90-libusb.ps1} | 0 ...able-windefender.ps1 => 01-disable-windefender.ps1} | 0 .../{002-disable-sleep.ps1 => 02-disable-sleep.ps1} | 0 ...dows-updates.ps1 => 04-disable-windows-updates.ps1} | 0 .../qtci-windows-10-x86_64/{msvc.ps1 => 05-msvc.ps1} | 0 .../{005-wsearch-off.ps1 => 05-wsearch-off.ps1} | 0 .../{python3.ps1 => 08-python3.ps1} | 0 .../{009-openssl.ps1 => 09-openssl.ps1} | 0 .../qtci-windows-10-x86_64/{icu.ps1 => 10-icu.ps1} | 0 ...pdate3_patch.ps1 => 10-msvc_2015_update3_patch.ps1} | 0 .../qtci-windows-10-x86_64/{030-fbx.ps1 => 30-fbx.ps1} | 0 .../{030-qnx660.ps1 => 30-qnx660.ps1} | 0 .../{patch_qnx.ps1 => 50-patch_qnx.ps1} | 0 .../qtci-windows-10-x86_64/{jom.ps1 => 60-jom.ps1} | 0 .../qtci-windows-10-x86_64/{cmake.ps1 => 70-cmake.ps1} | 0 ...{3dstudio_3rdparty.ps1 => 90-3dstudio_3rdparty.ps1} | 0 ...-install-notepad++.ps1 => 90-install-notepad++.ps1} | 0 .../{libusb.ps1 => 90-libusb.ps1} | 0 .../qtci-windows-10-x86_64/{mysql.ps1 => 90-mysql.ps1} | 0 .../{postgresql.ps1 => 90-postgresql.ps1} | 0 .../{signing-tools.ps1 => 90-signing-tools.ps1} | 0 .../{25-python3.ps1 => 08-python3.ps1} | 0 .../qtci-windows-7-x86/{12-icu.ps1 => 10-icu.ps1} | 0 coin/provisioning/qtci-windows-7-x86/25-python.ps1 | 1 - .../{32-patch_qnx.ps1 => 50-patch_qnx.ps1} | 0 ...-install-notepad++.ps1 => 90-install-notepad++.ps1} | 0 coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 | 1 - .../{001-disable-uac.ps1 => 01-disable-uac.ps1} | 0 .../{06-python.ps1 => 02-python.ps1} | 0 ...dows-updates.ps1 => 04-disable-windows-updates.ps1} | 0 .../{python3.ps1 => 08-python3.ps1} | 0 ...{msvc-2013-update5.ps1 => 09-msvc-2013-update5.ps1} | 0 .../{openssl.ps1 => 09-openssl.ps1} | 0 ...-test-server.ps1 => 09-set-network-test-server.ps1} | 0 .../qtci-windows-8.1-x86/{icu.ps1 => 10-icu.ps1} | 0 .../qtci-windows-8.1-x86/{cmake.ps1 => 60-cmake.ps1} | 0 .../qtci-windows-8.1-x86/{jom.ps1 => 70-jom.ps1} | 0 ...-install-notepad++.ps1 => 90-install-notepad++.ps1} | 0 .../{001-disable-uac.ps1 => 01-disable-uac.ps1} | 0 .../{06-python.ps1 => 02-python.ps1} | 0 ...dows-updates.ps1 => 04-disable-windows-updates.ps1} | 0 ...{msvc-2013-update5.ps1 => 08-msvc-2013-update5.ps1} | 0 .../{python3.ps1 => 08-python3.ps1} | 0 .../{openssl.ps1 => 09-openssl.ps1} | 0 ...-test-server.ps1 => 09-set-network-test-server.ps1} | 0 .../qtci-windows-8.1-x86_64/{icu.ps1 => 10-icu.ps1} | 0 .../{cmake.ps1 => 60-cmake.ps1} | 0 .../qtci-windows-8.1-x86_64/{jom.ps1 => 70-jom.ps1} | 0 ...-install-notepad++.ps1 => 90-install-notepad++.ps1} | 0 123 files changed, 12 deletions(-) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{libusb.sh => 20-libusb.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{install_icu.sh => 30-install_icu.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{patch_qnx.sh => 50-patch_qnx.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{version.sh => 99-version.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{001-refresh-subscription-manager.sh => 01-refresh-subscription-manager.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{001-systemsetup.sh => 01-systemsetup.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{002-enable-repos.sh => 02-enable-repos.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{003-install-devtoolset.sh => 03-install-devtoolset.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{004-install-packages.sh => 04-install-packages.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{004-p7zip.sh => 04-p7zip.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{005-libclang.sh => 05-libclang.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{006-cmake.sh => 06-cmake.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{007-qnx_700.sh => 07-qnx_700.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{008-integrity.sh => 08-integrity.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{009-disable_selinux.sh => 09-disable_selinux.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{010-openssl_for_android_linux.sh => 10-openssl_for_android_linux.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{030-fbx.sh => 30-fbx.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{009-install_icu.sh => 30-install_icu.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{040-android_linux.sh => 40-android_linux.sh} (100%) delete mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh rename coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/{001-systemsetup.sh => 01-systemsetup.sh} (100%) rename coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/{002-zypperpackages.sh => 02-zypperpackages.sh} (100%) rename coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/{009-cmake.sh => 09-cmake.sh} (100%) rename coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/{018-icc.sh => 18-icc.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{003-bashprofile.sh => 03-bashprofile.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{005-systemsetup.sh => 05-systemsetup.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{006-crashreporter.sh => 06-crashreporter.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{007-SSL_keychain.sh => 07-SSL_keychain.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{015-xz.sh => 15-xz.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{020-java.sh => 20-java.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{020-xcode.sh => 20-xcode.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{021-install-commandlinetools.sh => 21-install-commandlinetools.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{025-cmake.sh => 25-cmake.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{025-homebrew.sh => 25-homebrew.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{025-mysql.sh => 25-mysql.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{025-pip.sh => 25-pip.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{025-postgresql.sh => 25-postgresql.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{025-python3.sh => 25-python3.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{026-p7zip.sh => 26-p7zip.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{026-virtualenv.sh => 26-virtualenv.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{027-libclang.sh => 27-libclang.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{030-android.sh => 30-android.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{030-fbx.sh => 30-fbx.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{035-openssl.sh => 35-openssl.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{555-signtools.sh => 55-signtools.sh} (100%) rename coin/provisioning/qtci-osx-10.10-x86_64/{001-crashreporter.sh => 01-crashreporter.sh} (100%) rename coin/provisioning/qtci-osx-10.10-x86_64/{001-system_updates.sh => 01-system_updates.sh} (100%) rename coin/provisioning/qtci-osx-10.10-x86_64/{002-disable-screensaver.sh => 02-disable-screensaver.sh} (100%) rename coin/provisioning/qtci-osx-10.10-x86_64/{003-bashprofile.sh => 03-bashprofile.sh} (100%) rename coin/provisioning/qtci-osx-10.10-x86_64/{004-cmake.sh => 04-cmake.sh} (100%) rename coin/provisioning/qtci-osx-10.10-x86_64/{025-python3.sh => 25-python3.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{001-crashreporter.sh => 01-crashreporter.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{001-system_updates.sh => 01-system_updates.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{003-bashprofile.sh => 03-bashprofile.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{005-systemsetup.sh => 05-systemsetup.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{007-SSL_keychain.sh => 07-SSL_keychain.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{015-xz.sh => 15-xz.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{020-xcode.sh => 20-xcode.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{021-install-commandlinetools.sh => 21-install-commandlinetools.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{025-cmake.sh => 25-cmake.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{025-homebrew.sh => 25-homebrew.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{025-mysql.sh => 25-mysql.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{025-postgresql.sh => 25-postgresql.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{025-python3.sh => 25-python3.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{026-p7zip.sh => 26-p7zip.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{08-libclang.sh => 27-libclang.sh} (100%) rename coin/provisioning/qtci-windows-10-x86/{004-disable-windefender.ps1 => 04-disable-windefender.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{msvc.ps1 => 05-msvc.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{005-wsearch-off.ps1 => 05-wsearch-off.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{python3.ps1 => 08-python3.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{icu.ps1 => 10-icu.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{msvc_2015_update3_patch.ps1 => 10-msvc_2015_update3_patch.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{jom.ps1 => 60-jom.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{cmake.ps1 => 70-cmake.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{libusb.ps1 => 90-libusb.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{004-disable-windefender.ps1 => 01-disable-windefender.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{002-disable-sleep.ps1 => 02-disable-sleep.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{004-disable-windows-updates.ps1 => 04-disable-windows-updates.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{msvc.ps1 => 05-msvc.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{005-wsearch-off.ps1 => 05-wsearch-off.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{python3.ps1 => 08-python3.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{009-openssl.ps1 => 09-openssl.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{icu.ps1 => 10-icu.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{msvc_2015_update3_patch.ps1 => 10-msvc_2015_update3_patch.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{030-fbx.ps1 => 30-fbx.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{030-qnx660.ps1 => 30-qnx660.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{patch_qnx.ps1 => 50-patch_qnx.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{jom.ps1 => 60-jom.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{cmake.ps1 => 70-cmake.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{3dstudio_3rdparty.ps1 => 90-3dstudio_3rdparty.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{02-install-notepad++.ps1 => 90-install-notepad++.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{libusb.ps1 => 90-libusb.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{mysql.ps1 => 90-mysql.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{postgresql.ps1 => 90-postgresql.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{signing-tools.ps1 => 90-signing-tools.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86/{25-python3.ps1 => 08-python3.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86/{12-icu.ps1 => 10-icu.ps1} (100%) delete mode 100644 coin/provisioning/qtci-windows-7-x86/25-python.ps1 rename coin/provisioning/qtci-windows-7-x86/{32-patch_qnx.ps1 => 50-patch_qnx.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86/{02-install-notepad++.ps1 => 90-install-notepad++.ps1} (100%) delete mode 100644 coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 rename coin/provisioning/qtci-windows-8.1-x86/{001-disable-uac.ps1 => 01-disable-uac.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{06-python.ps1 => 02-python.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{004-disable-windows-updates.ps1 => 04-disable-windows-updates.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{python3.ps1 => 08-python3.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{msvc-2013-update5.ps1 => 09-msvc-2013-update5.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{openssl.ps1 => 09-openssl.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{009-set-network-test-server.ps1 => 09-set-network-test-server.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{icu.ps1 => 10-icu.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{cmake.ps1 => 60-cmake.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{jom.ps1 => 70-jom.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{02-install-notepad++.ps1 => 90-install-notepad++.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{001-disable-uac.ps1 => 01-disable-uac.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{06-python.ps1 => 02-python.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{004-disable-windows-updates.ps1 => 04-disable-windows-updates.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{msvc-2013-update5.ps1 => 08-msvc-2013-update5.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{python3.ps1 => 08-python3.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{openssl.ps1 => 09-openssl.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{009-set-network-test-server.ps1 => 09-set-network-test-server.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{icu.ps1 => 10-icu.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{cmake.ps1 => 60-cmake.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{jom.ps1 => 70-jom.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{02-install-notepad++.ps1 => 90-install-notepad++.ps1} (100%) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh deleted file mode 100755 index 1105d303..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# provides: python development libraries -# version: provided by default Linux distribution repository -# needed to build pyside -set -ex - -sudo zypper -nq install python-devel python-virtualenv - -# install python3 -sudo zypper -nq install python3 python3-pip python3-virtualenv diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh rename to coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh rename to coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh rename to coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh rename to coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh b/coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh diff --git a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 rename to coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/msvc.ps1 rename to coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 rename to coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/python3.ps1 rename to coin/provisioning/qtci-windows-10-x86/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/icu.ps1 rename to coin/provisioning/qtci-windows-10-x86/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 rename to coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/jom.ps1 rename to coin/provisioning/qtci-windows-10-x86/60-jom.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/cmake.ps1 rename to coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/libusb.ps1 rename to coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/python3.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/icu.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/jom.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/25-python3.ps1 b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/25-python3.ps1 rename to coin/provisioning/qtci-windows-7-x86/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/12-icu.ps1 b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/12-icu.ps1 rename to coin/provisioning/qtci-windows-7-x86/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/25-python.ps1 b/coin/provisioning/qtci-windows-7-x86/25-python.ps1 deleted file mode 100644 index 5f8aa2f8..00000000 --- a/coin/provisioning/qtci-windows-7-x86/25-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 rename to coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 rename to coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 deleted file mode 100644 index 41210dcb..00000000 --- a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/python3.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/icu.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/jom.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 From 497fc75f1afbb95c6f8230d1fea082b8ea13b9ee Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 29 Dec 2017 10:40:24 +0200 Subject: [PATCH 38/59] Update submodules on '5.9' in qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id3233e66cce60596a1523a8685ee593a8dec19f2 Reviewed-by: Tony Sarajärvi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 44ef95a8..44da5b86 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 44ef95a885f440a33e79ff3f9a79d4bb6d408dda +Subproject commit 44da5b863597e761df3545dc7ff02a9b53bbb13d diff --git a/qtdeclarative b/qtdeclarative index 52bc4fbf..78a5add7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 52bc4fbfbae6aa1569dc134dd103e966f04bc2e6 +Subproject commit 78a5add79497300802c2152b5bf561b6bef305f1 diff --git a/qtdoc b/qtdoc index 0703849b..a83a49af 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0703849b6d6a63873fc9334d573b7ee85256c655 +Subproject commit a83a49aff24964803ddee737bd3b172ce3003290 diff --git a/qtquickcontrols b/qtquickcontrols index 8a0f0553..a60d3e0d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 8a0f0553e4eb8468513bbb8ba45a9ec2bcd6ce68 +Subproject commit a60d3e0df7085d077aaed93d9243cf3d57b59464 From da3d21c0e6d33a2699417f907c1cf192634f6418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 2 Jan 2018 09:43:38 +0200 Subject: [PATCH 39/59] Fix the Tier1 image that qtbase builds qemu builds with Commit fcc0feaacb91ab5aefb212d351dcea7c728eefa5 forgot to update the Tier1 image in qtbase.txt. It only updated default.txt and qtdeclarative.txt. Most likely because qtbase.txt was added after initial changes were made and not caught in rebase. Task-number: QTQAINFRA-1574 Change-Id: If5da006172037c27dec5b3ae0b14330bc6f0149f Reviewed-by: Heikki Halmet --- coin/platform_configs/qtbase.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index 3292cc6e..ee4f4e66 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild DisableTests -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild DisableTests +qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC DeveloperBuild DisableTests +qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC DeveloperBuild DisableTests From 6eee3f6cffc287ac3fdc44a580cd1baf9190d751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 1 Jan 2018 15:00:45 +0200 Subject: [PATCH 40/59] Add set -ex to 7z provisioning in RHEL 7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If6323055999830954df6893d72ff2031b34f0276 Reviewed-by: Joni Jäntti Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh index 966f3045..ffd1d8a7 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh @@ -32,6 +32,9 @@ ## $QT_END_LICENSE$ ## ############################################################################# + +set -ex + source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" name="p7zip" From b9aae857f9e2dbcc444a099a8345dc8ac31ff47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 29 Dec 2017 10:14:10 +0200 Subject: [PATCH 41/59] Fix shebangs and give provisioning scripts +x rights MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib85721600b1e4461470a9ea4fd3b29fca0b35633 Reviewed-by: Simo Fält --- coin/provisioning/common/DownloadURL.sh | 2 +- .../provisioning/common/InstallAppFromCompressedFileFromURL.sh | 2 +- coin/provisioning/common/InstallFromCompressedFileFromURL.sh | 2 +- coin/provisioning/common/InstallPKGFromURL.sh | 2 +- coin/provisioning/common/android_linux.sh | 2 +- coin/provisioning/common/cmake.sh | 2 +- coin/provisioning/common/cmake_linux.sh | 2 +- coin/provisioning/common/disable_selinux.sh | 0 coin/provisioning/common/fbx_linux.sh | 2 +- coin/provisioning/common/fbx_macos.sh | 2 +- coin/provisioning/common/install-commandlinetools.sh | 2 +- coin/provisioning/common/install_xcode.sh | 2 +- coin/provisioning/common/integrity.sh | 2 +- coin/provisioning/common/openssl_for_android_linux.sh | 2 +- coin/provisioning/common/python3.sh | 2 +- coin/provisioning/common/qnx_700.sh | 2 +- coin/provisioning/common/system_updates.sh | 2 +- coin/provisioning/common/try_catch.sh | 2 +- coin/provisioning/common/version.sh | 2 +- .../05-subscription-manager-tooling.sh | 1 + coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh | 1 + coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh | 1 + coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 1 + coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh | 2 +- .../01-refresh-subscription-manager.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh | 2 +- .../provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh | 3 ++- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 3 ++- .../qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh | 3 ++- .../qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 1 + coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh | 2 +- .../qtci-macos-10.12-x86_64/21-install-commandlinetools.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh | 0 coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh | 2 +- coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh | 2 +- .../qtci-osx-10.10-x86_64/02-disable-screensaver.sh | 2 +- coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh | 2 +- coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh | 1 + coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh | 2 +- .../qtci-osx-10.11-x86_64/21-install-commandlinetools.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh | 1 + 79 files changed, 80 insertions(+), 69 deletions(-) mode change 100644 => 100755 coin/provisioning/common/DownloadURL.sh mode change 100644 => 100755 coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh mode change 100644 => 100755 coin/provisioning/common/InstallFromCompressedFileFromURL.sh mode change 100644 => 100755 coin/provisioning/common/InstallPKGFromURL.sh mode change 100644 => 100755 coin/provisioning/common/android_linux.sh mode change 100644 => 100755 coin/provisioning/common/disable_selinux.sh mode change 100644 => 100755 coin/provisioning/common/install-commandlinetools.sh mode change 100644 => 100755 coin/provisioning/common/openssl_for_android_linux.sh mode change 100644 => 100755 coin/provisioning/common/qnx_700.sh mode change 100644 => 100755 coin/provisioning/common/try_catch.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh mode change 100644 => 100755 coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh mode change 100644 => 100755 coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh mode change 100644 => 100755 coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh old mode 100644 new mode 100755 index c60fae21..cb890e8a --- a/coin/provisioning/common/DownloadURL.sh +++ b/coin/provisioning/common/DownloadURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh old mode 100644 new mode 100755 index 2af2db10..bb7f772f --- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh old mode 100644 new mode 100755 index df84431a..fb77b714 --- a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/InstallPKGFromURL.sh b/coin/provisioning/common/InstallPKGFromURL.sh old mode 100644 new mode 100755 index c00b646c..bf834e5d --- a/coin/provisioning/common/InstallPKGFromURL.sh +++ b/coin/provisioning/common/InstallPKGFromURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/android_linux.sh old mode 100644 new mode 100755 index 232326b7..3fa906e1 --- a/coin/provisioning/common/android_linux.sh +++ b/coin/provisioning/common/android_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/cmake.sh b/coin/provisioning/common/cmake.sh index e10dd41d..c727c8ff 100755 --- a/coin/provisioning/common/cmake.sh +++ b/coin/provisioning/common/cmake.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh index 701d9081..35313d3c 100755 --- a/coin/provisioning/common/cmake_linux.sh +++ b/coin/provisioning/common/cmake_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/disable_selinux.sh b/coin/provisioning/common/disable_selinux.sh old mode 100644 new mode 100755 diff --git a/coin/provisioning/common/fbx_linux.sh b/coin/provisioning/common/fbx_linux.sh index 66d4793b..9827f9ab 100755 --- a/coin/provisioning/common/fbx_linux.sh +++ b/coin/provisioning/common/fbx_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/fbx_macos.sh b/coin/provisioning/common/fbx_macos.sh index 66a2d998..0f5e16a3 100755 --- a/coin/provisioning/common/fbx_macos.sh +++ b/coin/provisioning/common/fbx_macos.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## ## Copyright (C) 2017 The Qt Company Ltd. diff --git a/coin/provisioning/common/install-commandlinetools.sh b/coin/provisioning/common/install-commandlinetools.sh old mode 100644 new mode 100755 index f224d31d..876d0b9c --- a/coin/provisioning/common/install-commandlinetools.sh +++ b/coin/provisioning/common/install-commandlinetools.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/install_xcode.sh b/coin/provisioning/common/install_xcode.sh index c6f00ee7..5d8009e3 100755 --- a/coin/provisioning/common/install_xcode.sh +++ b/coin/provisioning/common/install_xcode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/integrity.sh b/coin/provisioning/common/integrity.sh index 6998866a..6c96d9e0 100755 --- a/coin/provisioning/common/integrity.sh +++ b/coin/provisioning/common/integrity.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/openssl_for_android_linux.sh b/coin/provisioning/common/openssl_for_android_linux.sh old mode 100644 new mode 100755 index 70684eaf..2ca38db9 --- a/coin/provisioning/common/openssl_for_android_linux.sh +++ b/coin/provisioning/common/openssl_for_android_linux.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/python3.sh index 31591339..fc20aa2d 100755 --- a/coin/provisioning/common/python3.sh +++ b/coin/provisioning/common/python3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/qnx_700.sh b/coin/provisioning/common/qnx_700.sh old mode 100644 new mode 100755 index 1f1c0f3f..73783468 --- a/coin/provisioning/common/qnx_700.sh +++ b/coin/provisioning/common/qnx_700.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/system_updates.sh b/coin/provisioning/common/system_updates.sh index 2dee2708..0736d740 100755 --- a/coin/provisioning/common/system_updates.sh +++ b/coin/provisioning/common/system_updates.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/try_catch.sh b/coin/provisioning/common/try_catch.sh old mode 100644 new mode 100755 index b21861e3..560d040d --- a/coin/provisioning/common/try_catch.sh +++ b/coin/provisioning/common/try_catch.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/version.sh b/coin/provisioning/common/version.sh index e7662e1e..ed24d805 100755 --- a/coin/provisioning/common/version.sh +++ b/coin/provisioning/common/version.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh old mode 100644 new mode 100755 index 59fd541f..d3072b37 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # provides: fix for possible bug in the subscription manager # version: provided by RedHat # needed for yum to work properly in case there is incorrect data in diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh old mode 100644 new mode 100755 index 4e4fb462..c8edc2a2 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # provides: odbc devel packages on RHEL # version: provided by default Linux distribution repository # needed for configure -plugin-sql-odbc in qtbase diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh old mode 100644 new mode 100755 index 43ba9ecd..552e7586 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh old mode 100644 new mode 100755 index 5c88e498..00b57918 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash set -ex $(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh old mode 100644 new mode 100755 index 1831ea52..b156e8f9 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash # Required for tqtc-boot2qt/qdb set -ex diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh old mode 100644 new mode 100755 index 03a69edb..e4492eb0 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh old mode 100644 new mode 100755 index 27c7137b..6f998a60 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh old mode 100644 new mode 100755 index 836f6ec4..fb3e9642 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh index 2f7adf54..8b10ffd1 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh index f2caf274..1afe750b 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh index 08c4371a..8f080992 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh index 5667058f..f3b90756 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index 4565a843..60f5ad29 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh index ffd1d8a7..bb97d390 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh index bd94aba9..7ce3d514 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh index 73591496..c415db3a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh index b8c88dee..4f3f4205 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh index 40cb276a..d5fe88c7 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh index e91cee9f..b3cca8f9 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh index af7d7c13..7ecc470d 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh index bf9b64af..7e39935b 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + set -ex BASEDIR=$(dirname "$0") diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh index 9447c43f..ed9d6679 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh index 5808a45c..19e41d46 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index c9484698..e541d83b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index 7cc16024..acf92779 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh index 1382b279..b3fea7df 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh index b121d604..7e39935b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index d01ed9e9..e5da6fe7 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + set -ex BASEDIR=$(dirname "$0") diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh index b8495402..0661fdb0 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + set -ex sudo zypper -nq install git diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh old mode 100644 new mode 100755 index 51516380..92a8dd0b --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh index 01e1291c..b5f370ab 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh old mode 100644 new mode 100755 index a59e3e63..2c3e45f3 --- a/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh index 7b1b967c..dceb3bcc 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh index 77c41533..8461c656 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh index 2cdedcf5..b68d62f8 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh index 5171156c..6f5faee0 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh index 4c76f16a..39719bb8 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh index 72e521c5..f879d756 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index 352c8342..9801e99c 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh index 0ccd34f9..b37bb02d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh index 3de6cc89..c9e9c842 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh old mode 100644 new mode 100755 index 86bee612..b18e4923 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash set -ex source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh index 0b15d557..9c754dbf 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh old mode 100644 new mode 100755 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index 9dd79862..503a4c07 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh index 49e087a8..e1a41835 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh old mode 100644 new mode 100755 index 77c41533..8461c656 --- a/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh old mode 100644 new mode 100755 index d5b2101e..e799344a --- a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh old mode 100644 new mode 100755 index a59e3e63..2c3e45f3 --- a/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh old mode 100644 new mode 100755 index 86bee612..b18e4923 --- a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash set -ex source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh index 77c41533..8461c656 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh old mode 100644 new mode 100755 index a59e3e63..2c3e45f3 --- a/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh index 3e495a63..0e39a958 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh index 2cdedcf5..b68d62f8 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh index 61c7fc6d..314a0d24 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh index 8ca4a3ac..779a525e 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh index 2f46c41d..a8f7cca1 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh index 3e545d9e..17bb0df3 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh index b7393895..f71225f5 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh old mode 100644 new mode 100755 index 86bee612..b18e4923 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash set -ex source "${BASH_SOURCE%/*}/../common/python3.sh" From 4fb893fcf8ef55ff3ebbdf684c4d1cfab913cea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 29 Dec 2017 10:22:08 +0200 Subject: [PATCH 42/59] Set up proxy for provisioning scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1669 Change-Id: I582dc5037bd2b46dcd5c9c3b2cb13784e122d6a5 Reviewed-by: Simo Fält --- coin/provisioning/common/android_linux.sh | 10 +++- .../common/check_and_set_proxy.sh | 50 +++++++++++++++++++ coin/provisioning/common/http_proxy.txt | 2 + coin/provisioning/common/libclang.sh | 2 + .../01-systemsetup.sh | 42 ++++++++++++++++ .../01-systemsetup.sh | 5 ++ .../01-systemsetup.sh | 10 ++++ .../01-systemsetup.sh | 6 +++ .../99-unset-proxy.sh | 39 +++++++++++++++ 9 files changed, 165 insertions(+), 1 deletion(-) create mode 100755 coin/provisioning/common/check_and_set_proxy.sh create mode 100644 coin/provisioning/common/http_proxy.txt create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/android_linux.sh index 3fa906e1..c218ffe4 100755 --- a/coin/provisioning/common/android_linux.sh +++ b/coin/provisioning/common/android_linux.sh @@ -39,6 +39,7 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" targetFolder="/opt/android" sdkTargetFolder="$targetFolder/sdk" @@ -84,8 +85,15 @@ try else sudo chown -R qt:users "$targetFolder" fi + echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager + if [ "$proxy" != "" ]; then + proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1) + proxy_port=$(echo $proxy | cut -d':' -f3) + echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager + else + echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager + fi echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc diff --git a/coin/provisioning/common/check_and_set_proxy.sh b/coin/provisioning/common/check_and_set_proxy.sh new file mode 100755 index 00000000..8dad878c --- /dev/null +++ b/coin/provisioning/common/check_and_set_proxy.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/try_catch.sh" +source "${BASH_SOURCE%/*}/http_proxy.txt" + +try +( + wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io +) + +if [ $? -eq 0 ]; then + echo "Setting http_proxy to $proxy" + export http_proxy=$proxy + +else + echo "Proxy not detected at $proxy" +fi + diff --git a/coin/provisioning/common/http_proxy.txt b/coin/provisioning/common/http_proxy.txt new file mode 100644 index 00000000..3aa6ceba --- /dev/null +++ b/coin/provisioning/common/http_proxy.txt @@ -0,0 +1,2 @@ +proxy="http://proxy.intra.qt.io:3128" + diff --git a/coin/provisioning/common/libclang.sh b/coin/provisioning/common/libclang.sh index 381127b1..ea33d62d 100755 --- a/coin/provisioning/common/libclang.sh +++ b/coin/provisioning/common/libclang.sh @@ -40,6 +40,8 @@ # In case of Linux, we expect to get the values as args set -e +source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" + BASEDIR=$(dirname "$0") . $BASEDIR/sw_versions.txt url=$1 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..945d2e99 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +set -ex + +source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" + +if [ "$proxy" != "" ]; then + echo "proxy=$proxy" | sudo tee -a /etc/yum.conf +fi diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh index 1afe750b..52ac3d6c 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh @@ -37,6 +37,7 @@ set -ex BASEDIR=$(dirname "$0") source $BASEDIR/../common/network_test_server_ip.txt +source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts @@ -49,3 +50,7 @@ export DISPLAY=:0 gsettings set org.gnome.desktop.screensaver lock-enabled false # disable blank screen power saving gsettings set org.gnome.desktop.session idle-delay 0 + +if [ "$proxy" != "" ]; then + echo "proxy=$proxy" | sudo tee -a /etc/yum.conf +fi diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index e541d83b..b44c3014 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -40,6 +40,7 @@ set -ex source "${BASH_SOURCE%/*}/../common/try_catch.sh" +source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" NTS_IP=10.212.2.216 @@ -47,6 +48,7 @@ ExceptionGsettings1=100 ExceptionGsettings2=101 ExceptionGsettings3=102 ExceptionNTS=103 +ExceptionProxy=104 try ( @@ -59,6 +61,10 @@ try echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS + + if [ "$proxy" != "" ]; then + echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy + fi ) catch || { case $ex_code in @@ -78,6 +84,10 @@ catch || { echo "Failed to set network teset server address into /etc/hosts." exit 1; ;; + $ExceptionProxy) + echo "Failed to set proxy /etc/apt/apt.conf." + exit 1; + ;; esac } diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index e5da6fe7..eeb98b70 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -4,6 +4,7 @@ set -ex BASEDIR=$(dirname "$0") source $BASEDIR/../common/network_test_server_ip.txt +source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc @@ -12,3 +13,8 @@ echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | su echo "Set DISPLAY" echo 'export DISPLAY=":0"' >> ~/.bashrc +if [ "$proxy" != "" ]; then + sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy + sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy +fi + diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh new file mode 100755 index 00000000..5ff78055 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +############################################################################# +## +## 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$ +## +############################################################################# + +set -ex + +# Having proxy set while running autotests makes them fail +sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy + From d3c2de907d299481c942f96ab84c627761dbb446 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 1 Jan 2018 22:00:01 -0800 Subject: [PATCH 43/59] Add Apple tvOS and Apple watchOS configs for all modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...not just qt5. This will eliminate the semi-frequent integration failures in qt5 submodules updates. Change-Id: I99a4eb1cf41005adcfd12e385b663a5d8adbc628 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index e70e80ab..a6da2911 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -16,7 +16,9 @@ qtci-linux-RHEL-7.4-x86_64 GCC qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests -qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static +qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static +qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests +qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release From a742af96fb2b09870a02b0ef33bfed9949bc44ba Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 3 Jan 2018 15:03:19 +0200 Subject: [PATCH 44/59] Provisioning: Ubuntu16.04 - CMake CMake is missing from the clean installed Ubuntu 16.04. Change-Id: I965bc3e55eb9b0765f483a84e5584e61054bdd80 Reviewed-by: Heikki Halmet Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh new file mode 100755 index 00000000..ddfc88a6 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/cmake_linux.sh + From 82a6a9347f32388b41b3655194cb08afd7cdf359 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Fri, 5 Jan 2018 09:17:50 +0200 Subject: [PATCH 45/59] Provisioning: Ubuntu 16.04 - Set timezone to UTC Task-number: QTBUG-65435 Change-Id: I329926d0f83d47c9e69eee177c600ac629ee9415 Reviewed-by: Heikki Halmet --- .../qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index b44c3014..f245c90c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -52,6 +52,8 @@ ExceptionProxy=104 try ( + echo "Set timezone to UTC" || throw $ExceptionTimezone + sudo timedatectl set-timezone Etc/UTC echo "Timeout for blanking the screen (0 = never)" gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1 echo "Prevents screen lock when screesaver goes active." @@ -68,6 +70,10 @@ try ) catch || { case $ex_code in + $ExceptionTimezone) + echo "Failed to set timezone to UTC" + exit 1; + ;; $ExceptionGsettings1) echo "Failed to disable black screen." exit 1; From b9b259fd405be7f208851369d0be2f40f90662be Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 5 Jan 2018 12:35:14 +0100 Subject: [PATCH 46/59] Update submodules on '5.9' in qt5 Change-Id: I95a01ff67b3d16a9a989e3b714f82c94a92d6dc4 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtbase b/qtbase index 44da5b86..175d691f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 44da5b863597e761df3545dc7ff02a9b53bbb13d +Subproject commit 175d691fa377d43fbc18d52d116135e0bf76a5f4 diff --git a/qtconnectivity b/qtconnectivity index e46cde93..5a67821b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e46cde935ee76eaa00e78af968121502e2406347 +Subproject commit 5a67821b9615b5fc17cab405566a81cc7f554ad4 diff --git a/qtdeclarative b/qtdeclarative index 78a5add7..529b4484 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 78a5add79497300802c2152b5bf561b6bef305f1 +Subproject commit 529b4484e558376598b5bf12a3cfae6fd3969827 diff --git a/qtlocation b/qtlocation index 7508f021..844e0e4a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7508f02176f317db50f20985205bf64af8134ab6 +Subproject commit 844e0e4aec3285ec5cfde90422acd796bc4d7d39 diff --git a/qtmultimedia b/qtmultimedia index c8bf0cd3..13df2988 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c8bf0cd37c5f526e3687dfeff9e23d15104328b5 +Subproject commit 13df2988efbe9a82225ccbf4cad463391d94c8e8 diff --git a/qtquickcontrols b/qtquickcontrols index a60d3e0d..4397b10d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a60d3e0df7085d077aaed93d9243cf3d57b59464 +Subproject commit 4397b10d7fee0e1183141942fde8af2d0382794d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 31a65540..aa9308d1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 31a655402ff194e556853e6877f1a464a8e51243 +Subproject commit aa9308d1d172a51a3e4356b8831b9f28fc68086e diff --git a/qtserialbus b/qtserialbus index 50aea4ad..8ff62bd9 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 50aea4ada4521f009ea8524b91daea1fac283c41 +Subproject commit 8ff62bd9536b5539e1e6b393c4ec87b092e36621 diff --git a/qttools b/qttools index 2f3dc790..1a60dc75 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2f3dc790aefadc74debfa25efe958078def34146 +Subproject commit 1a60dc756f35b3b19a444c976dcb547f51c30d76 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index cb5fab80..a15a5af7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit cb5fab803f3227f4c678a6a694d907fc385c7b05 +Subproject commit a15a5af71c1ff0e92a51a856391b546ca9fc23b8 diff --git a/qtwayland b/qtwayland index 154bdf45..a25c1861 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 154bdf45dd51a521058c820e7b871008ce8508ae +Subproject commit a25c186126fe37a0e5e12e2d12865ed27eb1f4e8 diff --git a/qtwebengine b/qtwebengine index 17ecc4e7..6f242a93 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 17ecc4e7e0c88d891e1b18d5810a7ac2fd0b83ba +Subproject commit 6f242a9389369242b23a61dcb59fc610dc27bb05 diff --git a/qtwebview b/qtwebview index 4d4b118c..a14f37e7 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 4d4b118c1294d96741d71a775ac1c57b5acb96bb +Subproject commit a14f37e76b429876015ee96cc4adb97ed4c9fbed From f71d4a3b970f900d815c4a747160e17f183a5ce0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 Jan 2018 22:59:55 +0100 Subject: [PATCH 47/59] Update submodules on '5.9' in qt5 Change-Id: I54bae68afc005a9e5d8d29e0766504d83d983e13 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 451ca492..9647c0b5 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 451ca492ea5f71045597f26db54c840addb6d6ae +Subproject commit 9647c0b54f1aa0ffdf3a6d23a80a0802c6f3e343 diff --git a/qtbase b/qtbase index 175d691f..da81b01d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 175d691fa377d43fbc18d52d116135e0bf76a5f4 +Subproject commit da81b01df856e532a8cabb99949232de1b23327d diff --git a/qtdeclarative b/qtdeclarative index 529b4484..76da60b5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 529b4484e558376598b5bf12a3cfae6fd3969827 +Subproject commit 76da60b5ad388b6873f496b07b2c3ccabe9c9490 diff --git a/qtimageformats b/qtimageformats index 1225d9e4..3c607b32 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 1225d9e4aac319cb92ef88ebf7de305033ef30ba +Subproject commit 3c607b324ffbf84ce9803d80a04c7d663e847496 diff --git a/qtqa b/qtqa index 956200a1..eaf59453 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 956200a160b0a1a9a15bbcd24c6c82e4dc01c2b6 +Subproject commit eaf59453eb1ea44fca63263dc25da473e624df6c diff --git a/qtquickcontrols b/qtquickcontrols index 4397b10d..8da20dde 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4397b10d7fee0e1183141942fde8af2d0382794d +Subproject commit 8da20ddef88cb48b7bb09ff7dc1db6517add8e72 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index aa9308d1..55522df4 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit aa9308d1d172a51a3e4356b8831b9f28fc68086e +Subproject commit 55522df46edd295a65edd32e0ca7d32408ab6de4 diff --git a/qtscript b/qtscript index ef6c88d3..8399cdfb 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit ef6c88d329386ece5b4a92d6a0865d7b90e036c0 +Subproject commit 8399cdfbaf2aceab9c22fdcb10d2369ddb39b5df diff --git a/qtserialbus b/qtserialbus index 8ff62bd9..1b263f6a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8ff62bd9536b5539e1e6b393c4ec87b092e36621 +Subproject commit 1b263f6a56c14e04e92310998303d8f815dba8f8 diff --git a/qttools b/qttools index 1a60dc75..e44c9c4f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1a60dc756f35b3b19a444c976dcb547f51c30d76 +Subproject commit e44c9c4fc1f0fdb20aed13cc2adab3757b1d67f8 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a15a5af7..e078c5e2 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a15a5af71c1ff0e92a51a856391b546ca9fc23b8 +Subproject commit e078c5e237142270f5d85a22a1e8adc969668695 diff --git a/qtwayland b/qtwayland index a25c1861..ec029b1a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a25c186126fe37a0e5e12e2d12865ed27eb1f4e8 +Subproject commit ec029b1a4c104c2400da23d4f5f04d7f03731beb diff --git a/qtwebchannel b/qtwebchannel index 44a2c000..b90fbebb 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 44a2c0006546ba39a4a523904f75a9cb01cfe5fc +Subproject commit b90fbebbb5e257f771e96980109fb543647b1844 diff --git a/qtwebengine b/qtwebengine index 6f242a93..9ef3a826 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6f242a9389369242b23a61dcb59fc610dc27bb05 +Subproject commit 9ef3a8263098c6a32db8b824aabf85587d1f1140 diff --git a/qtx11extras b/qtx11extras index aee4dc63..922a92b5 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit aee4dc63f6d43cf775c063b76d789ac6d4a8f517 +Subproject commit 922a92b533edc9bbefee729a8d91b28fbe0e3945 From 65c714aaab8e088b7901c018d480cf48ecf2f1fa Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 6 Jan 2018 23:53:29 +0100 Subject: [PATCH 48/59] Update submodules on '5.9' in qt5 Change-Id: I4901819f1c7141d151b287e945c1e0afa0ca5b16 Reviewed-by: Liang Qi --- qtbase | 2 +- qtserialport | 2 +- qtxmlpatterns | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index da81b01d..1c822451 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit da81b01df856e532a8cabb99949232de1b23327d +Subproject commit 1c8224511dee2794553da9dc8ed484d49dc78b45 diff --git a/qtserialport b/qtserialport index 5fdcd2f6..7c5eb346 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 5fdcd2f60021771d301743f51852db05ea45cdf2 +Subproject commit 7c5eb346f1ee0241522babba053974a17e2250cd diff --git a/qtxmlpatterns b/qtxmlpatterns index f5f2b1f5..81dd1238 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit f5f2b1f5fc29968b13b464cc9a6b2df6eebe75c7 +Subproject commit 81dd12388d67f6b2be253ea831b876c8dec2dca5 From 7139f297495a78343531ceebc9dbac5ac6c1cf77 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 7 Jan 2018 10:33:46 +0100 Subject: [PATCH 49/59] Update submodules on '5.10' in qt5 Change-Id: I8d3a6f72435d9bd1cf23146656b5bcef958e993d Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/qt3d b/qt3d index 24e8db22..1d5f8b85 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 24e8db22e50449b30fac6619d074b98f08ff0315 +Subproject commit 1d5f8b8536c1b0165c2292529dc3814e96bb0a27 diff --git a/qtactiveqt b/qtactiveqt index 3f1310a3..851309bd 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 3f1310a3193a36315dcf0b093451103ad046e1e4 +Subproject commit 851309bd2987b451354780e36112c02d5473482d diff --git a/qtandroidextras b/qtandroidextras index be708914..3317428a 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit be7089148192ec8e80ea50665ec2df421cf0c4c6 +Subproject commit 3317428a98dee4caad6f8e170fb499e4083b2423 diff --git a/qtbase b/qtbase index ca181d37..0749ba2c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ca181d3740c4251ef945625cbb6e235479b56bcd +Subproject commit 0749ba2c5eacc4822cf9c7a31edf8d70c4ef6064 diff --git a/qtcanvas3d b/qtcanvas3d index f4d043c7..4cea1fdf 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit f4d043c71f1f14868b130e46a1a844ee7cdfe505 +Subproject commit 4cea1fdf84a7618d8d815189881368bb47926486 diff --git a/qtcharts b/qtcharts index a58dfcb2..2d962cff 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a58dfcb2460a2dd4db83a33bb5349e94303e6278 +Subproject commit 2d962cffd5d6d5b1c40bef8807a2a774cc6fb637 diff --git a/qtconnectivity b/qtconnectivity index 1d8ba361..e8d9bd63 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1d8ba3610ae36dd62fda88dcf7c81baa5fe1fc51 +Subproject commit e8d9bd63b05b33b22ff5d19fb31ad55b1e409256 diff --git a/qtdatavis3d b/qtdatavis3d index cf4bf696..7dd95d1d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit cf4bf696641dbcd142f2e0e7057d7cb70b6722e0 +Subproject commit 7dd95d1d4cb65662a9bbb739163b7e12f3d81a84 diff --git a/qtdeclarative b/qtdeclarative index 4fff2bb1..2eb2d638 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4fff2bb14e55484eacec0a1b49a2b02958f75eca +Subproject commit 2eb2d6386da304cd1164264ae0bff685c796d89c diff --git a/qtdoc b/qtdoc index 9682ba54..fb00c893 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9682ba54bb30c148c058cfae44b07c2522765df5 +Subproject commit fb00c8932a37e245591c78891b56200917d417ad diff --git a/qtgamepad b/qtgamepad index f2983c52..ad15ca27 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit f2983c524d1a3f350b48265a033fd9a3f69c0d73 +Subproject commit ad15ca27280e23dbb07e5622f40cdd85479715df diff --git a/qtgraphicaleffects b/qtgraphicaleffects index df1c9dba..eff27854 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit df1c9dbad75010fc967f4a236393fa1de36110f2 +Subproject commit eff278540f723f2db3b98caf7fa3af551c61da3a diff --git a/qtimageformats b/qtimageformats index 167e7d19..c34ab1c4 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 167e7d191b3751a061842e332036dd6989d68a2c +Subproject commit c34ab1c43a3cbbaad127eb8bc6fd9b5c90a1169f diff --git a/qtlocation b/qtlocation index 337aea7b..eca7ffd4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 337aea7bc386d5e97825d27335d860fc88b2bee3 +Subproject commit eca7ffd4f8539292aed40b81284e0cd81f80c998 diff --git a/qtmacextras b/qtmacextras index 2bc33d6e..6834dc0c 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 2bc33d6e70fcf16aedeead643ab1c39ca090615b +Subproject commit 6834dc0cfb2e27f53bdbca0e5b69b6f381874562 diff --git a/qtmultimedia b/qtmultimedia index 1083ed94..7a3b8907 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 1083ed94683c3356f9ee19210cfe9b0dd53e4815 +Subproject commit 7a3b8907060123fe5d487d4c9ba3a1e222f468bb diff --git a/qtnetworkauth b/qtnetworkauth index bebf6f48..f6aedc74 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit bebf6f4816c8025b592c260577dbf09fc0f4ed7e +Subproject commit f6aedc74c4a95440e649b625b6272f29e7f5fa71 diff --git a/qtpurchasing b/qtpurchasing index 4b87fcdf..1f9e8a54 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 4b87fcdf70d14b288e4859156403c3d2886020fa +Subproject commit 1f9e8a545dfb0c6a029ecf14d19692a8642be655 diff --git a/qtqa b/qtqa index 1110bd07..eaf59453 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1110bd076dba536dc6e6304fe8d6ee80f2d5718f +Subproject commit eaf59453eb1ea44fca63263dc25da473e624df6c diff --git a/qtquickcontrols b/qtquickcontrols index 65976402..314d1bdf 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 65976402344a2642d6d6dc5bfbf71b3b511f6d12 +Subproject commit 314d1bdf7d56462102639e12d34596cbfd4fce95 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6767d789..d26d6a46 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6767d789b3544c6ff7717250e1c0dee02ad91fd4 +Subproject commit d26d6a46bb5793e4a3bdc2c7a387f8f8a89b349b diff --git a/qtremoteobjects b/qtremoteobjects index e6eb6ab1..6eb36c47 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit e6eb6ab12daf76f3e716c0d51ceecdab61e39e48 +Subproject commit 6eb36c47776e5f4c300f43fd191429af0664b3e5 diff --git a/qtscript b/qtscript index 34784015..930a0cd9 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 34784015a96c204633bad5ed86056eee2d32c22f +Subproject commit 930a0cd94d06ea7278fc9aa58b637f862a8de357 diff --git a/qtscxml b/qtscxml index 81b0d786..e5b1a298 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 81b0d78673f5a632e3891d048be9a08fe48351d1 +Subproject commit e5b1a29882b8609fc41fd5af56495a408b747a80 diff --git a/qtsensors b/qtsensors index bfe35b4e..b6c120bd 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit bfe35b4ebc4ac46fd181b36d35e6535064f4e056 +Subproject commit b6c120bd507b6adc7a5f02b089b5187308d80bb3 diff --git a/qtserialbus b/qtserialbus index 557a7cb8..5b2d55c0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 557a7cb8c2b053a67d8dc55f7433f2db2286852b +Subproject commit 5b2d55c0f57c525e58bfe2c4afa80dc012920a14 diff --git a/qtserialport b/qtserialport index c38dcc11..00f3e2df 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c38dcc1118746a0a16405764a707ffc19dda362a +Subproject commit 00f3e2df573400c7ee350bc2b2c5e89e50ab27ca diff --git a/qtspeech b/qtspeech index 345d43ec..964b71d8 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 345d43ec7f349a2b71de784216d0a6fd6c42a0d0 +Subproject commit 964b71d8b92cdbbbbf49ecd2b3fbc55a240f6d4f diff --git a/qtsvg b/qtsvg index b3ce1912..2e719713 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b3ce191284221a384d04fd8a3d6eb152f84fd192 +Subproject commit 2e719713be8ac3b1e26b23221f12db136d9d5103 diff --git a/qttools b/qttools index e6a65cdb..1f3bf9c0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e6a65cdb85edc4710017c33d4966425d852f0e47 +Subproject commit 1f3bf9c015aeb4cc017980a2bf75724cd7b1049f diff --git a/qttranslations b/qttranslations index c30c9e0a..f54b179a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c30c9e0ae178cf3d3f20c058097d8f596f8df886 +Subproject commit f54b179a16a2301bac828a97a86b1a3719619d17 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 685ae5ca..477fa0d4 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 685ae5ca057d37ec2ca909fb08b5610b1829edc1 +Subproject commit 477fa0d4b5c27b649e15c8819bf8a95e7a8922c1 diff --git a/qtwayland b/qtwayland index 98f38b01..8bd8815f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 98f38b01997ec59aa5040f839deb6f062f01be17 +Subproject commit 8bd8815fd629e34c54924a2ada41007464da22ec diff --git a/qtwebchannel b/qtwebchannel index 5e43b636..5a9dd81f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 5e43b6364b6c0bbeb67772581e550fc3e64e9008 +Subproject commit 5a9dd81f260f320b5af108c1a6b3d0b82a04f15d diff --git a/qtwebengine b/qtwebengine index 78cc35d0..6666e23e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 78cc35d0705ef9f7b3e7785f031f77595ed71217 +Subproject commit 6666e23ed6252c3ef53c5f17d4f28bfe63736e33 diff --git a/qtwebglplugin b/qtwebglplugin index f73929c2..2bff9adb 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit f73929c2c6c9229f71470502faab14178d561157 +Subproject commit 2bff9adbbb6b65d35b944f4ee65ea7309c12a290 diff --git a/qtwebsockets b/qtwebsockets index 30e3ccc8..91bb3576 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 30e3ccc84031e5530ee38ab4a790267557067205 +Subproject commit 91bb3576f7787041ab85d0ff6c0dfe2ce26281b9 diff --git a/qtwebview b/qtwebview index f0a48620..4cefce76 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f0a48620d5d647ea1e2153a522a948f5b0fedc15 +Subproject commit 4cefce7644f1eb9b9a5750ebc1b361976d866448 diff --git a/qtwinextras b/qtwinextras index 8be91fab..3751a970 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 8be91fab769e1d55a3146acb04102df67968efd1 +Subproject commit 3751a970f02cbac9a63ae80273cacd62e690ad7b diff --git a/qtx11extras b/qtx11extras index 5a42fb1b..c12cc26b 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 5a42fb1b13a9ac91a6a078dc6d63dbbd5d87836e +Subproject commit c12cc26b7d64aef12f6f1ccedf3273f23799e920 diff --git a/qtxmlpatterns b/qtxmlpatterns index bc5129b8..75e9858a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit bc5129b8868891742356114ab05c6ac254fc07cd +Subproject commit 75e9858a87307f61b478735f73c0a60c52c25eb8 From 84899eca4c6dcc6def56abae781e5489c4f950a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 3 Jan 2018 08:13:36 +0200 Subject: [PATCH 50/59] Consolidate prefixes of provisioning scripts Change-Id: I75a4bcb049a2c4d034a74b6838ffe7ddf2c3015e Reviewed-by: Jani Heikkinen --- .../{mqtt_broker.sh => 22-mqtt_broker.sh} | 0 .../{mqtt_broker.sh => 22-mqtt_broker.sh} | 0 .../22-mqtt_broker.sh} | 0 .../{freeopcua.sh => 42-freeopcua.sh} | 0 .../mqtt_broker.sh | 36 ------------------- .../22-mqtt_broker.sh} | 0 .../mqtt_broker.sh | 36 ------------------- .../{mqtt_broker.ps1 => 22-mqtt_broker.ps1} | 0 .../{winrtrunner.ps1 => 23-winrtrunner.ps1} | 0 .../{mqtt_broker.ps1 => 22-mqtt_broker.ps1} | 0 .../{winrtrunner.ps1 => 23-winrtrunner.ps1} | 0 .../{mqtt_broker.ps1 => 22-mqtt_broker.ps1} | 0 .../{mqtt_broker.ps1 => 22-mqtt_broker.ps1} | 0 13 files changed, 72 deletions(-) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{mqtt_broker.sh => 22-mqtt_broker.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{mqtt_broker.sh => 22-mqtt_broker.sh} (100%) rename coin/provisioning/{qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh => qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh} (100%) rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{freeopcua.sh => 42-freeopcua.sh} (100%) delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh rename coin/provisioning/{qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh => qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh} (100%) delete mode 100644 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh rename coin/provisioning/qtci-windows-10-x86/{mqtt_broker.ps1 => 22-mqtt_broker.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{winrtrunner.ps1 => 23-winrtrunner.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{mqtt_broker.ps1 => 22-mqtt_broker.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{winrtrunner.ps1 => 23-winrtrunner.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86/{mqtt_broker.ps1 => 22-mqtt_broker.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{mqtt_broker.ps1 => 22-mqtt_broker.ps1} (100%) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh deleted file mode 100644 index e367c20b..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# - -source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh rename to coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh deleted file mode 100644 index e367c20b..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# - -source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 rename to coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 rename to coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 rename to coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/22-mqtt_broker.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/22-mqtt_broker.ps1 From 22e4664eb08dc5384c5afd0bd6c6a0725b242517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Sat, 6 Jan 2018 20:24:01 +0200 Subject: [PATCH 51/59] Fix opcua provisioning by sourcing .profile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When CMake is installed it exports its install path into .profile. However, freeopcua doesn't source it as builds do, so it couldn't find the cmake. Also, as Ubuntu is using .profile in our builds, this commit fixes so that the PATH is actually written into the right file. Task-number: QTBUG-65594 Change-Id: I561a88a07872436bb4a3bd62a2d55fd56a130121 Reviewed-by: Joni Jäntti Reviewed-by: Heikki Halmet --- coin/provisioning/common/cmake_linux.sh | 6 +++++- .../qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh index 35313d3c..3efe35a0 100755 --- a/coin/provisioning/common/cmake_linux.sh +++ b/coin/provisioning/common/cmake_linux.sh @@ -50,4 +50,8 @@ appPrefix="cmake-$version-Linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +if uname -a |grep -q "Ubuntu"; then + echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.profile +else + echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +fi diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh index 4f4fd6ea..0410cf97 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh @@ -44,6 +44,7 @@ cd freeopcua git checkout ca75e05a8e63d88dbfc259e1251f405106411b66 mkdir build cd build +source ~/.profile cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. make sudo make install From 2fe8d370e6700aa380669104ca18d2f1d14dc22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 3 Jan 2018 08:18:34 +0200 Subject: [PATCH 52/59] Add +x rights to provisioning scrips missing it and consolidate shebang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1e1fb37bfffd0451c02166227805b40b48d31582 Reviewed-by: Tony Sarajärvi Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh | 2 +- .../provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh | 0 6 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh old mode 100644 new mode 100755 index e367c20b..00e1c855 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh index e367c20b..00e1c855 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh old mode 100644 new mode 100755 index e367c20b..00e1c855 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh old mode 100644 new mode 100755 index 0410cf97..3ccb412d --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh old mode 100644 new mode 100755 index e367c20b..00e1c855 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh old mode 100644 new mode 100755 From a8e3c392b2568c48984f1c7a97d6555357550adc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Jan 2018 03:01:02 +0200 Subject: [PATCH 53/59] Update submodules on '5.10' in qt5 Change-Id: I8c259b106a628a317c81a59c042e79c3f145a402 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtsensors | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 0749ba2c..af1a179c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0749ba2c5eacc4822cf9c7a31edf8d70c4ef6064 +Subproject commit af1a179cc8b599523ca858b1b9f55c93a734d047 diff --git a/qtdeclarative b/qtdeclarative index 2eb2d638..590e7418 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2eb2d6386da304cd1164264ae0bff685c796d89c +Subproject commit 590e7418cc6afbf2b5b8cf85373f1674c583a7da diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d26d6a46..10b8f6af 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d26d6a46bb5793e4a3bdc2c7a387f8f8a89b349b +Subproject commit 10b8f6af42a1cd80273d0a2d36e75b79078b5994 diff --git a/qtrepotools b/qtrepotools index 14431b40..07f8dbb0 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 14431b4087125e247c1e2322e0cd043b78974ce2 +Subproject commit 07f8dbb095e4905d2d43e1527ce5616d047a3ae9 diff --git a/qtsensors b/qtsensors index b6c120bd..a5881f10 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b6c120bd507b6adc7a5f02b089b5187308d80bb3 +Subproject commit a5881f10e0ba6ba283b1215a5342056196661414 diff --git a/qttools b/qttools index 1f3bf9c0..171c37ec 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1f3bf9c015aeb4cc017980a2bf75724cd7b1049f +Subproject commit 171c37ecc2a0003315fd7cca48e41814bc7b7b8d diff --git a/qtwebengine b/qtwebengine index 6666e23e..7473a43b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6666e23ed6252c3ef53c5f17d4f28bfe63736e33 +Subproject commit 7473a43beff891c93a245620b6307f3a073dba28 From 52da24b78eaac04b490b1d4a1750515284521423 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Mon, 8 Jan 2018 12:15:31 +0200 Subject: [PATCH 54/59] Remove devtoolset sourcing from openssl provisioning on Ubuntu This line is a leftover from RHEL script and needs to be removed on Ubuntu. Change-Id: I8fc8ab7cff808da997cb88a3cec4c65eaa1528a4 Reviewed-by: Heikki Halmet --- .../10-openssl_for_android_linux.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh index af7d7c13..9937765a 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh @@ -33,8 +33,6 @@ ## ############################################################################# -source /opt/rh/devtoolset-4/enable - set -ex source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" From 2a28ce864bed677e4ac2477eedf6bee498075d94 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 2 Nov 2017 16:09:11 +0200 Subject: [PATCH 55/59] Split Common folder based on operating system families MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change will split common folder to four different folders: Linux, Unix, Windows and MacOS. Each of these folders includes scripts which are common for their operating system familes Task-number: QTQAINFRA-1451 Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/{ => linux}/android_linux.sh | 6 +++--- coin/provisioning/common/{ => linux}/cmake_linux.sh | 2 +- coin/provisioning/common/{ => linux}/disable_selinux.sh | 0 coin/provisioning/common/{ => linux}/fbx_linux.sh | 2 +- coin/provisioning/common/{ => linux}/integrity.sh | 2 +- .../common/{ => linux}/openssl_for_android_linux.sh | 4 ++-- coin/provisioning/common/{ => linux}/qnx_700.sh | 0 coin/provisioning/common/{ => linux}/version.sh | 0 .../{ => macos}/InstallAppFromCompressedFileFromURL.sh | 4 ++-- coin/provisioning/common/{ => macos}/InstallPKGFromURL.sh | 2 +- coin/provisioning/common/{ => macos}/cmake.sh | 0 coin/provisioning/common/{ => macos}/fbx_macos.sh | 4 ++-- coin/provisioning/common/{ => macos}/homebrew.sh | 0 .../common/{ => macos}/install-commandlinetools.sh | 4 ++-- coin/provisioning/common/{ => macos}/install_xcode.sh | 4 ++-- coin/provisioning/common/{ => macos}/pip.sh | 0 coin/provisioning/common/{ => macos}/python3.sh | 0 coin/provisioning/common/{ => macos}/system_updates.sh | 0 coin/provisioning/common/{ => macos}/virtualenv.sh | 0 coin/provisioning/common/{ => unix}/DownloadURL.sh | 0 .../common/{ => unix}/InstallFromCompressedFileFromURL.sh | 0 .../provisioning/common/{ => unix}/check_and_set_proxy.sh | 0 coin/provisioning/common/{ => unix}/http_proxy.txt | 0 coin/provisioning/common/{ => unix}/libclang.sh | 4 ++-- coin/provisioning/common/{ => unix}/try_catch.sh | 0 coin/provisioning/common/{ => windows}/03-conan.ps1 | 0 .../common/{ => windows}/3dstudio_3rdparty.ps1 | 0 .../common/{ => windows}/allow-remote-desktop-access.ps1 | 0 coin/provisioning/common/{ => windows}/cmake.ps1 | 0 .../icu/57.1/annulen/stable/export/conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../icu/59.1/vitallium/stable/export/conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../libxml2/2.9.4/annulen/stable/export/conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../2.9.4/vitallium/stable/export/conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../1.1.29/annulen/stable/export/conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../1.1.29/vitallium/stable/export/conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../conanmanifest.txt | 0 .../zlib/1.2.8/annulen/stable/export/conanmanifest.txt | 0 .../conanmanifest.txt | 0 coin/provisioning/common/{ => windows}/disable-ntp.ps1 | 0 coin/provisioning/common/{ => windows}/disable-sleep.ps1 | 0 coin/provisioning/common/{ => windows}/disable-uac.ps1 | 0 .../common/{ => windows}/disable-windefender.ps1 | 0 .../common/{ => windows}/disable-windows-updates.ps1 | 0 coin/provisioning/common/{ => windows}/fbx_windows.ps1 | 0 coin/provisioning/common/{ => windows}/helpers.ps1 | 0 coin/provisioning/common/{ => windows}/icu.ps1 | 0 .../common/{ => windows}/install-dependencywalker.ps1 | 2 +- coin/provisioning/common/{ => windows}/install-git.ps1 | 2 +- coin/provisioning/common/{ => windows}/install-jdk.ps1 | 2 +- coin/provisioning/common/{ => windows}/install-mingw.ps1 | 2 +- .../common/{ => windows}/install-notepad++.ps1 | 2 +- coin/provisioning/common/{ => windows}/install-qnx660.ps1 | 0 coin/provisioning/common/{ => windows}/install-ruby.ps1 | 2 +- .../common/{ => windows}/install-sevenzip.ps1 | 2 +- .../common/{ => windows}/install-strawberry-perl.ps1 | 2 +- coin/provisioning/common/{ => windows}/jom.ps1 | 0 coin/provisioning/common/{ => windows}/libclang.ps1 | 4 ++-- coin/provisioning/common/{ => windows}/libusb.ps1 | 0 coin/provisioning/common/{ => windows}/memorypershell.ps1 | 0 coin/provisioning/common/{ => windows}/mesa_llvmpipe.ps1 | 2 +- .../common/{ => windows}/msvc_2015_update3_patch.ps1 | 2 +- coin/provisioning/common/{ => windows}/mysql.ps1 | 0 coin/provisioning/common/{ => windows}/ninja.ps1 | 0 coin/provisioning/common/{ => windows}/openssl.ps1 | 2 +- coin/provisioning/common/{ => windows}/patch_qnx.ps1 | 0 coin/provisioning/common/{ => windows}/postgresql.ps1 | 0 coin/provisioning/common/{ => windows}/python.ps1 | 0 coin/provisioning/common/{ => windows}/python3.ps1 | 0 .../common/{ => windows}/set-network-test-server.ps1 | 4 ++-- coin/provisioning/common/{ => windows}/vc_redist.ps1 | 0 coin/provisioning/common/{ => windows}/wsearch-off.ps1 | 0 .../qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh | 2 +- .../qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 2 +- .../provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/05-libclang.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh | 2 +- .../provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/08-integrity.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh | 2 +- .../10-openssl_for_android_linux.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 8 ++++---- .../provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh | 2 +- .../10-openssl_for_android_linux.sh | 2 +- .../provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/18-icc.sh | 2 +- .../qtci-macos-10.12-x86_64/05-systemsetup.sh | 4 ++-- coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh | 4 ++-- coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh | 4 ++-- coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh | 8 ++++---- .../21-install-commandlinetools.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh | 4 ++-- coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh | 2 +- .../provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh | 4 ++-- coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh | 2 +- .../provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh | 4 ++-- coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh | 8 ++++---- .../qtci-osx-10.10-x86_64/01-system_updates.sh | 2 +- coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh | 2 +- coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh | 2 +- coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh | 2 +- .../qtci-osx-10.11-x86_64/01-system_updates.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh | 4 ++-- coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh | 4 ++-- coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh | 8 ++++---- .../qtci-osx-10.11-x86_64/21-install-commandlinetools.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh | 4 ++-- coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh | 4 ++-- coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh | 2 +- coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/02-python.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/03-conan.ps1 | 2 +- .../qtci-windows-10-x86/04-disable-windefender.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 | 2 +- .../provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/08-python3.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/10-icu.ps1 | 2 +- .../qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/60-jom.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 | 2 +- .../01-allow-remote-desktop-access.ps1 | 2 +- .../qtci-windows-10-x86_64/01-disable-windefender.ps1 | 2 +- .../qtci-windows-10-x86_64/02-disable-ntp.ps1 | 2 +- .../qtci-windows-10-x86_64/02-disable-sleep.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 | 2 +- .../qtci-windows-10-x86_64/03-install-sevenzip.ps1 | 2 +- .../qtci-windows-10-x86_64/04-disable-windows-updates.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 2 +- .../qtci-windows-10-x86_64/05-wsearch-off.ps1 | 2 +- .../qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1 | 2 +- .../qtci-windows-10-x86_64/08-install-git.ps1 | 2 +- .../qtci-windows-10-x86_64/08-install-jdk.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 | 2 +- .../09-install-dependencywalker.ps1 | 2 +- .../qtci-windows-10-x86_64/09-install-mingw530.ps1 | 2 +- .../qtci-windows-10-x86_64/09-install-mingw630.ps1 | 2 +- .../qtci-windows-10-x86_64/09-install-ruby.ps1 | 2 +- .../qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 | 2 +- .../qtci-windows-10-x86_64/09-set-network-test-server.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 | 2 +- .../qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 | 2 +- .../qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 | 2 +- .../qtci-windows-10-x86_64/90-install-notepad++.ps1 | 2 +- .../qtci-windows-10-x86_64/90-install-virtualbox.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 | 2 +- .../provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 | 2 +- .../qtci-windows-10-x86_64/90-signing-tools.ps1 | 2 +- .../qtci-windows-7-x86/01-allow-remote-desktop-access.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1 | 2 +- .../provisioning/qtci-windows-7-x86/02-memorypershell.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/02-python.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/03-conan.ps1 | 2 +- .../qtci-windows-7-x86/03-install-sevenzip.ps1 | 2 +- .../qtci-windows-7-x86/04-disable-windefender.ps1 | 2 +- .../qtci-windows-7-x86/04-disable-windows-updates.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/04-msys.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/08-install-git.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/08-ninja.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/08-python3.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/09-cmake.ps1 | 2 +- .../qtci-windows-7-x86/09-install-dependencywalker.ps1 | 2 +- .../qtci-windows-7-x86/09-install-mingw530.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1 | 2 +- .../qtci-windows-7-x86/09-install-strawberry-perl.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/09-jom.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/09-mysql.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1 | 2 +- .../qtci-windows-7-x86/09-set-network-test-server.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/10-icu.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/30-android.ps1 | 2 +- .../qtci-windows-7-x86/31-android_openssl.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 | 2 +- .../qtci-windows-7-x86/90-install-notepad++.ps1 | 2 +- .../01-allow-remote-desktop-access.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 | 2 +- .../qtci-windows-8.1-x86/02-disable-sleep.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 | 2 +- .../qtci-windows-8.1-x86/03-install-sevenzip.ps1 | 2 +- .../qtci-windows-8.1-x86/04-disable-windefender.ps1 | 2 +- .../qtci-windows-8.1-x86/04-disable-windows-updates.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 | 2 +- .../qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 | 2 +- .../qtci-windows-8.1-x86/09-install-dependencywalker.ps1 | 2 +- .../provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 | 2 +- .../qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 | 2 +- .../qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 | 2 +- .../qtci-windows-8.1-x86/09-set-network-test-server.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 | 2 +- .../qtci-windows-8.1-x86/90-install-notepad++.ps1 | 2 +- .../01-allow-remote-desktop-access.ps1 | 2 +- .../qtci-windows-8.1-x86_64/01-disable-uac.ps1 | 2 +- .../qtci-windows-8.1-x86_64/02-disable-ntp.ps1 | 2 +- .../qtci-windows-8.1-x86_64/02-disable-sleep.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 | 2 +- .../qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 | 2 +- .../qtci-windows-8.1-x86_64/04-disable-windefender.ps1 | 2 +- .../04-disable-windows-updates.ps1 | 2 +- .../qtci-windows-8.1-x86_64/05-wsearch-off.ps1 | 2 +- .../qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 | 2 +- .../provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 | 2 +- .../qtci-windows-8.1-x86_64/08-install-git.ps1 | 2 +- .../qtci-windows-8.1-x86_64/08-install-jdk.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 | 2 +- .../qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 | 2 +- .../09-install-dependencywalker.ps1 | 2 +- .../qtci-windows-8.1-x86_64/09-install-ruby.ps1 | 2 +- .../09-install-strawberry-perl.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 | 2 +- .../qtci-windows-8.1-x86_64/09-postgresql.ps1 | 2 +- .../09-set-network-test-server.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 | 2 +- .../qtci-windows-8.1-x86_64/90-install-notepad++.ps1 | 2 +- 282 files changed, 253 insertions(+), 253 deletions(-) rename coin/provisioning/common/{ => linux}/android_linux.sh (97%) rename coin/provisioning/common/{ => linux}/cmake_linux.sh (96%) rename coin/provisioning/common/{ => linux}/disable_selinux.sh (100%) rename coin/provisioning/common/{ => linux}/fbx_linux.sh (97%) rename coin/provisioning/common/{ => linux}/integrity.sh (97%) rename coin/provisioning/common/{ => linux}/openssl_for_android_linux.sh (96%) rename coin/provisioning/common/{ => linux}/qnx_700.sh (100%) rename coin/provisioning/common/{ => linux}/version.sh (100%) rename coin/provisioning/common/{ => macos}/InstallAppFromCompressedFileFromURL.sh (97%) rename coin/provisioning/common/{ => macos}/InstallPKGFromURL.sh (98%) rename coin/provisioning/common/{ => macos}/cmake.sh (100%) rename coin/provisioning/common/{ => macos}/fbx_macos.sh (97%) rename coin/provisioning/common/{ => macos}/homebrew.sh (100%) rename coin/provisioning/common/{ => macos}/install-commandlinetools.sh (96%) rename coin/provisioning/common/{ => macos}/install_xcode.sh (97%) rename coin/provisioning/common/{ => macos}/pip.sh (100%) rename coin/provisioning/common/{ => macos}/python3.sh (100%) rename coin/provisioning/common/{ => macos}/system_updates.sh (100%) rename coin/provisioning/common/{ => macos}/virtualenv.sh (100%) rename coin/provisioning/common/{ => unix}/DownloadURL.sh (100%) rename coin/provisioning/common/{ => unix}/InstallFromCompressedFileFromURL.sh (100%) rename coin/provisioning/common/{ => unix}/check_and_set_proxy.sh (100%) rename coin/provisioning/common/{ => unix}/http_proxy.txt (100%) rename coin/provisioning/common/{ => unix}/libclang.sh (96%) rename coin/provisioning/common/{ => unix}/try_catch.sh (100%) rename coin/provisioning/common/{ => windows}/03-conan.ps1 (100%) rename coin/provisioning/common/{ => windows}/3dstudio_3rdparty.ps1 (100%) rename coin/provisioning/common/{ => windows}/allow-remote-desktop-access.ps1 (100%) rename coin/provisioning/common/{ => windows}/cmake.ps1 (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt (100%) rename coin/provisioning/common/{ => windows}/disable-ntp.ps1 (100%) rename coin/provisioning/common/{ => windows}/disable-sleep.ps1 (100%) rename coin/provisioning/common/{ => windows}/disable-uac.ps1 (100%) rename coin/provisioning/common/{ => windows}/disable-windefender.ps1 (100%) rename coin/provisioning/common/{ => windows}/disable-windows-updates.ps1 (100%) rename coin/provisioning/common/{ => windows}/fbx_windows.ps1 (100%) rename coin/provisioning/common/{ => windows}/helpers.ps1 (100%) rename coin/provisioning/common/{ => windows}/icu.ps1 (100%) rename coin/provisioning/common/{ => windows}/install-dependencywalker.ps1 (98%) rename coin/provisioning/common/{ => windows}/install-git.ps1 (98%) rename coin/provisioning/common/{ => windows}/install-jdk.ps1 (98%) rename coin/provisioning/common/{ => windows}/install-mingw.ps1 (98%) rename coin/provisioning/common/{ => windows}/install-notepad++.ps1 (98%) rename coin/provisioning/common/{ => windows}/install-qnx660.ps1 (100%) rename coin/provisioning/common/{ => windows}/install-ruby.ps1 (98%) rename coin/provisioning/common/{ => windows}/install-sevenzip.ps1 (98%) rename coin/provisioning/common/{ => windows}/install-strawberry-perl.ps1 (98%) rename coin/provisioning/common/{ => windows}/jom.ps1 (100%) rename coin/provisioning/common/{ => windows}/libclang.ps1 (91%) rename coin/provisioning/common/{ => windows}/libusb.ps1 (100%) rename coin/provisioning/common/{ => windows}/memorypershell.ps1 (100%) rename coin/provisioning/common/{ => windows}/mesa_llvmpipe.ps1 (98%) rename coin/provisioning/common/{ => windows}/msvc_2015_update3_patch.ps1 (98%) rename coin/provisioning/common/{ => windows}/mysql.ps1 (100%) rename coin/provisioning/common/{ => windows}/ninja.ps1 (100%) rename coin/provisioning/common/{ => windows}/openssl.ps1 (99%) rename coin/provisioning/common/{ => windows}/patch_qnx.ps1 (100%) rename coin/provisioning/common/{ => windows}/postgresql.ps1 (100%) rename coin/provisioning/common/{ => windows}/python.ps1 (100%) rename coin/provisioning/common/{ => windows}/python3.ps1 (100%) rename coin/provisioning/common/{ => windows}/set-network-test-server.ps1 (94%) rename coin/provisioning/common/{ => windows}/vc_redist.ps1 (100%) rename coin/provisioning/common/{ => windows}/wsearch-off.ps1 (100%) diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh similarity index 97% rename from coin/provisioning/common/android_linux.sh rename to coin/provisioning/common/linux/android_linux.sh index c218ffe4..b4a412c8 100755 --- a/coin/provisioning/common/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -37,9 +37,9 @@ # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version -source "${BASH_SOURCE%/*}/../common/try_catch.sh" -source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" -source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh" targetFolder="/opt/android" sdkTargetFolder="$targetFolder/sdk" diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh similarity index 96% rename from coin/provisioning/common/cmake_linux.sh rename to coin/provisioning/common/linux/cmake_linux.sh index 35313d3c..7aaa4cb4 100755 --- a/coin/provisioning/common/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -38,7 +38,7 @@ # CMake is needed for autotests that verify that Qt can be built with CMake # shellcheck source=InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" version="3.6.2" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" diff --git a/coin/provisioning/common/disable_selinux.sh b/coin/provisioning/common/linux/disable_selinux.sh similarity index 100% rename from coin/provisioning/common/disable_selinux.sh rename to coin/provisioning/common/linux/disable_selinux.sh diff --git a/coin/provisioning/common/fbx_linux.sh b/coin/provisioning/common/linux/fbx_linux.sh similarity index 97% rename from coin/provisioning/common/fbx_linux.sh rename to coin/provisioning/common/linux/fbx_linux.sh index 9827f9ab..0b587aed 100755 --- a/coin/provisioning/common/fbx_linux.sh +++ b/coin/provisioning/common/linux/fbx_linux.sh @@ -34,7 +34,7 @@ ############################################################################# # This script installs FBX SDK -source "${BASH_SOURCE%/*}/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" #s script installs FBX SDK set -e diff --git a/coin/provisioning/common/integrity.sh b/coin/provisioning/common/linux/integrity.sh similarity index 97% rename from coin/provisioning/common/integrity.sh rename to coin/provisioning/common/linux/integrity.sh index 6c96d9e0..0c7234b3 100755 --- a/coin/provisioning/common/integrity.sh +++ b/coin/provisioning/common/linux/integrity.sh @@ -35,7 +35,7 @@ # This script installs INTEGRITY -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" version="11.4.4" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz" diff --git a/coin/provisioning/common/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh similarity index 96% rename from coin/provisioning/common/openssl_for_android_linux.sh rename to coin/provisioning/common/linux/openssl_for_android_linux.sh index 2ca38db9..cda41d72 100755 --- a/coin/provisioning/common/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -36,8 +36,8 @@ # This script install OpenSSL from sources. # Requires GCC and Perl to be in PATH. -source "${BASH_SOURCE%/*}/try_catch.sh" -source "${BASH_SOURCE%/*}/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" version="1.0.2g" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" diff --git a/coin/provisioning/common/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh similarity index 100% rename from coin/provisioning/common/qnx_700.sh rename to coin/provisioning/common/linux/qnx_700.sh diff --git a/coin/provisioning/common/version.sh b/coin/provisioning/common/linux/version.sh similarity index 100% rename from coin/provisioning/common/version.sh rename to coin/provisioning/common/linux/version.sh diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh similarity index 97% rename from coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh rename to coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh index bb7f772f..4d2ba1f8 100755 --- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh @@ -38,9 +38,9 @@ # to /Applications/. This can be overridden by a target parameter. # shellcheck source=try_catch.sh -source "${BASH_SOURCE%/*}/try_catch.sh" +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" # shellcheck source=DownloadURL.sh -source "${BASH_SOURCE%/*}/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" ExceptionDownload=99 ExceptionCreateTmpFile=100 diff --git a/coin/provisioning/common/InstallPKGFromURL.sh b/coin/provisioning/common/macos/InstallPKGFromURL.sh similarity index 98% rename from coin/provisioning/common/InstallPKGFromURL.sh rename to coin/provisioning/common/macos/InstallPKGFromURL.sh index bf834e5d..881086ba 100755 --- a/coin/provisioning/common/InstallPKGFromURL.sh +++ b/coin/provisioning/common/macos/InstallPKGFromURL.sh @@ -34,7 +34,7 @@ ############################################################################# # shellcheck source=try_catch.sh -source "${BASH_SOURCE%/*}/try_catch.sh" +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" ExceptionCreateTmpFile=100 ExceptionDownloadPrimaryUrl=101 diff --git a/coin/provisioning/common/cmake.sh b/coin/provisioning/common/macos/cmake.sh similarity index 100% rename from coin/provisioning/common/cmake.sh rename to coin/provisioning/common/macos/cmake.sh diff --git a/coin/provisioning/common/fbx_macos.sh b/coin/provisioning/common/macos/fbx_macos.sh similarity index 97% rename from coin/provisioning/common/fbx_macos.sh rename to coin/provisioning/common/macos/fbx_macos.sh index 0f5e16a3..9dc97814 100755 --- a/coin/provisioning/common/fbx_macos.sh +++ b/coin/provisioning/common/macos/fbx_macos.sh @@ -34,8 +34,8 @@ # This script installs FBX SDK -# shellcheck source=./try_catch.sh -source "${BASH_SOURCE%/*}/try_catch.sh" +# shellcheck source=./../unix/try_catch.sh +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz" targetFolder="/opt/fbx" diff --git a/coin/provisioning/common/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh similarity index 100% rename from coin/provisioning/common/homebrew.sh rename to coin/provisioning/common/macos/homebrew.sh diff --git a/coin/provisioning/common/install-commandlinetools.sh b/coin/provisioning/common/macos/install-commandlinetools.sh similarity index 96% rename from coin/provisioning/common/install-commandlinetools.sh rename to coin/provisioning/common/macos/install-commandlinetools.sh index 876d0b9c..d57e1d2f 100755 --- a/coin/provisioning/common/install-commandlinetools.sh +++ b/coin/provisioning/common/macos/install-commandlinetools.sh @@ -32,8 +32,8 @@ ## $QT_END_LICENSE$ ## ############################################################################# -source "${BASH_SOURCE%/*}/DownloadURL.sh" -source "${BASH_SOURCE%/*}/try_catch.sh" +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" set -ex # Command line tools is need by homebrew diff --git a/coin/provisioning/common/install_xcode.sh b/coin/provisioning/common/macos/install_xcode.sh similarity index 97% rename from coin/provisioning/common/install_xcode.sh rename to coin/provisioning/common/macos/install_xcode.sh index 5d8009e3..1fe611b3 100755 --- a/coin/provisioning/common/install_xcode.sh +++ b/coin/provisioning/common/macos/install_xcode.sh @@ -44,8 +44,8 @@ -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/try_catch.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" function InstallXCode() { diff --git a/coin/provisioning/common/pip.sh b/coin/provisioning/common/macos/pip.sh similarity index 100% rename from coin/provisioning/common/pip.sh rename to coin/provisioning/common/macos/pip.sh diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/macos/python3.sh similarity index 100% rename from coin/provisioning/common/python3.sh rename to coin/provisioning/common/macos/python3.sh diff --git a/coin/provisioning/common/system_updates.sh b/coin/provisioning/common/macos/system_updates.sh similarity index 100% rename from coin/provisioning/common/system_updates.sh rename to coin/provisioning/common/macos/system_updates.sh diff --git a/coin/provisioning/common/virtualenv.sh b/coin/provisioning/common/macos/virtualenv.sh similarity index 100% rename from coin/provisioning/common/virtualenv.sh rename to coin/provisioning/common/macos/virtualenv.sh diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh similarity index 100% rename from coin/provisioning/common/DownloadURL.sh rename to coin/provisioning/common/unix/DownloadURL.sh diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh similarity index 100% rename from coin/provisioning/common/InstallFromCompressedFileFromURL.sh rename to coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh diff --git a/coin/provisioning/common/check_and_set_proxy.sh b/coin/provisioning/common/unix/check_and_set_proxy.sh similarity index 100% rename from coin/provisioning/common/check_and_set_proxy.sh rename to coin/provisioning/common/unix/check_and_set_proxy.sh diff --git a/coin/provisioning/common/http_proxy.txt b/coin/provisioning/common/unix/http_proxy.txt similarity index 100% rename from coin/provisioning/common/http_proxy.txt rename to coin/provisioning/common/unix/http_proxy.txt diff --git a/coin/provisioning/common/libclang.sh b/coin/provisioning/common/unix/libclang.sh similarity index 96% rename from coin/provisioning/common/libclang.sh rename to coin/provisioning/common/unix/libclang.sh index ea33d62d..69d9ff96 100755 --- a/coin/provisioning/common/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -40,10 +40,10 @@ # In case of Linux, we expect to get the values as args set -e -source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" +source "${BASH_SOURCE%/*}/check_and_set_proxy.sh" BASEDIR=$(dirname "$0") -. $BASEDIR/sw_versions.txt +. $BASEDIR/../sw_versions.txt url=$1 sha1=$2 version=$3 diff --git a/coin/provisioning/common/try_catch.sh b/coin/provisioning/common/unix/try_catch.sh similarity index 100% rename from coin/provisioning/common/try_catch.sh rename to coin/provisioning/common/unix/try_catch.sh diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1 similarity index 100% rename from coin/provisioning/common/03-conan.ps1 rename to coin/provisioning/common/windows/03-conan.ps1 diff --git a/coin/provisioning/common/3dstudio_3rdparty.ps1 b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 similarity index 100% rename from coin/provisioning/common/3dstudio_3rdparty.ps1 rename to coin/provisioning/common/windows/3dstudio_3rdparty.ps1 diff --git a/coin/provisioning/common/allow-remote-desktop-access.ps1 b/coin/provisioning/common/windows/allow-remote-desktop-access.ps1 similarity index 100% rename from coin/provisioning/common/allow-remote-desktop-access.ps1 rename to coin/provisioning/common/windows/allow-remote-desktop-access.ps1 diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 similarity index 100% rename from coin/provisioning/common/cmake.ps1 rename to coin/provisioning/common/windows/cmake.ps1 diff --git a/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt similarity index 100% rename from coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt diff --git a/coin/provisioning/common/disable-ntp.ps1 b/coin/provisioning/common/windows/disable-ntp.ps1 similarity index 100% rename from coin/provisioning/common/disable-ntp.ps1 rename to coin/provisioning/common/windows/disable-ntp.ps1 diff --git a/coin/provisioning/common/disable-sleep.ps1 b/coin/provisioning/common/windows/disable-sleep.ps1 similarity index 100% rename from coin/provisioning/common/disable-sleep.ps1 rename to coin/provisioning/common/windows/disable-sleep.ps1 diff --git a/coin/provisioning/common/disable-uac.ps1 b/coin/provisioning/common/windows/disable-uac.ps1 similarity index 100% rename from coin/provisioning/common/disable-uac.ps1 rename to coin/provisioning/common/windows/disable-uac.ps1 diff --git a/coin/provisioning/common/disable-windefender.ps1 b/coin/provisioning/common/windows/disable-windefender.ps1 similarity index 100% rename from coin/provisioning/common/disable-windefender.ps1 rename to coin/provisioning/common/windows/disable-windefender.ps1 diff --git a/coin/provisioning/common/disable-windows-updates.ps1 b/coin/provisioning/common/windows/disable-windows-updates.ps1 similarity index 100% rename from coin/provisioning/common/disable-windows-updates.ps1 rename to coin/provisioning/common/windows/disable-windows-updates.ps1 diff --git a/coin/provisioning/common/fbx_windows.ps1 b/coin/provisioning/common/windows/fbx_windows.ps1 similarity index 100% rename from coin/provisioning/common/fbx_windows.ps1 rename to coin/provisioning/common/windows/fbx_windows.ps1 diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 similarity index 100% rename from coin/provisioning/common/helpers.ps1 rename to coin/provisioning/common/windows/helpers.ps1 diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/windows/icu.ps1 similarity index 100% rename from coin/provisioning/common/icu.ps1 rename to coin/provisioning/common/windows/icu.ps1 diff --git a/coin/provisioning/common/install-dependencywalker.ps1 b/coin/provisioning/common/windows/install-dependencywalker.ps1 similarity index 98% rename from coin/provisioning/common/install-dependencywalker.ps1 rename to coin/provisioning/common/windows/install-dependencywalker.ps1 index ad89fc7b..3fc17052 100644 --- a/coin/provisioning/common/install-dependencywalker.ps1 +++ b/coin/provisioning/common/windows/install-dependencywalker.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install Dependency Walker 2.2.6000 diff --git a/coin/provisioning/common/install-git.ps1 b/coin/provisioning/common/windows/install-git.ps1 similarity index 98% rename from coin/provisioning/common/install-git.ps1 rename to coin/provisioning/common/windows/install-git.ps1 index 6b4a34b0..00700a22 100644 --- a/coin/provisioning/common/install-git.ps1 +++ b/coin/provisioning/common/windows/install-git.ps1 @@ -30,7 +30,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # Install Git version 2.13.0 diff --git a/coin/provisioning/common/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 similarity index 98% rename from coin/provisioning/common/install-jdk.ps1 rename to coin/provisioning/common/windows/install-jdk.ps1 index e4260deb..f6cf6a66 100644 --- a/coin/provisioning/common/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install Java SE diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 similarity index 98% rename from coin/provisioning/common/install-mingw.ps1 rename to coin/provisioning/common/windows/install-mingw.ps1 index f835059a..9609336e 100644 --- a/coin/provisioning/common/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -31,7 +31,7 @@ ## ############################################################################ -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" function InstallMinGW { diff --git a/coin/provisioning/common/install-notepad++.ps1 b/coin/provisioning/common/windows/install-notepad++.ps1 similarity index 98% rename from coin/provisioning/common/install-notepad++.ps1 rename to coin/provisioning/common/windows/install-notepad++.ps1 index 2e893852..a6e20d5e 100644 --- a/coin/provisioning/common/install-notepad++.ps1 +++ b/coin/provisioning/common/windows/install-notepad++.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install Notepad++ diff --git a/coin/provisioning/common/install-qnx660.ps1 b/coin/provisioning/common/windows/install-qnx660.ps1 similarity index 100% rename from coin/provisioning/common/install-qnx660.ps1 rename to coin/provisioning/common/windows/install-qnx660.ps1 diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/windows/install-ruby.ps1 similarity index 98% rename from coin/provisioning/common/install-ruby.ps1 rename to coin/provisioning/common/windows/install-ruby.ps1 index 94e32b74..3a9aa0d2 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/windows/install-ruby.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install Ruby diff --git a/coin/provisioning/common/install-sevenzip.ps1 b/coin/provisioning/common/windows/install-sevenzip.ps1 similarity index 98% rename from coin/provisioning/common/install-sevenzip.ps1 rename to coin/provisioning/common/windows/install-sevenzip.ps1 index 5f19543f..e7e73e9c 100644 --- a/coin/provisioning/common/install-sevenzip.ps1 +++ b/coin/provisioning/common/windows/install-sevenzip.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script installs 7-Zip diff --git a/coin/provisioning/common/install-strawberry-perl.ps1 b/coin/provisioning/common/windows/install-strawberry-perl.ps1 similarity index 98% rename from coin/provisioning/common/install-strawberry-perl.ps1 rename to coin/provisioning/common/windows/install-strawberry-perl.ps1 index bd5347b6..8b4a4a25 100644 --- a/coin/provisioning/common/install-strawberry-perl.ps1 +++ b/coin/provisioning/common/windows/install-strawberry-perl.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script installs Strawberry Perl diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/windows/jom.ps1 similarity index 100% rename from coin/provisioning/common/jom.ps1 rename to coin/provisioning/common/windows/jom.ps1 diff --git a/coin/provisioning/common/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 similarity index 91% rename from coin/provisioning/common/libclang.ps1 rename to coin/provisioning/common/windows/libclang.ps1 index a4a9c870..9d857051 100644 --- a/coin/provisioning/common/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -1,10 +1,10 @@ param([Int32]$archVer=32) -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). # The Clang library (C-bindings), version 3.9 or higher is required for building. -Get-Content "$PSScriptRoot\..\common\sw_versions.txt" | Foreach-Object { +Get-Content "$PSScriptRoot\..\sw_versions.txt" | Foreach-Object { $var = $_.Split('=') New-Variable -Name $var[0] -Value $var[1] $libclang_version = $libclang_version -replace '["."]' diff --git a/coin/provisioning/common/libusb.ps1 b/coin/provisioning/common/windows/libusb.ps1 similarity index 100% rename from coin/provisioning/common/libusb.ps1 rename to coin/provisioning/common/windows/libusb.ps1 diff --git a/coin/provisioning/common/memorypershell.ps1 b/coin/provisioning/common/windows/memorypershell.ps1 similarity index 100% rename from coin/provisioning/common/memorypershell.ps1 rename to coin/provisioning/common/windows/memorypershell.ps1 diff --git a/coin/provisioning/common/mesa_llvmpipe.ps1 b/coin/provisioning/common/windows/mesa_llvmpipe.ps1 similarity index 98% rename from coin/provisioning/common/mesa_llvmpipe.ps1 rename to coin/provisioning/common/windows/mesa_llvmpipe.ps1 index 82333034..4a468e10 100644 --- a/coin/provisioning/common/mesa_llvmpipe.ps1 +++ b/coin/provisioning/common/windows/mesa_llvmpipe.ps1 @@ -30,7 +30,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" $version = "11_2_2" $package = "C:\Windows\temp\opengl32sw.7z" diff --git a/coin/provisioning/common/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 similarity index 98% rename from coin/provisioning/common/msvc_2015_update3_patch.ps1 rename to coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 index 02c5e61e..bab0f3a1 100644 --- a/coin/provisioning/common/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 @@ -30,7 +30,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # Install Cumulative Servicing Release Visual Studio 2015 update 3 # Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx diff --git a/coin/provisioning/common/mysql.ps1 b/coin/provisioning/common/windows/mysql.ps1 similarity index 100% rename from coin/provisioning/common/mysql.ps1 rename to coin/provisioning/common/windows/mysql.ps1 diff --git a/coin/provisioning/common/ninja.ps1 b/coin/provisioning/common/windows/ninja.ps1 similarity index 100% rename from coin/provisioning/common/ninja.ps1 rename to coin/provisioning/common/windows/ninja.ps1 diff --git a/coin/provisioning/common/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 similarity index 99% rename from coin/provisioning/common/openssl.ps1 rename to coin/provisioning/common/windows/openssl.ps1 index df320c72..f8268492 100644 --- a/coin/provisioning/common/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script installs OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine diff --git a/coin/provisioning/common/patch_qnx.ps1 b/coin/provisioning/common/windows/patch_qnx.ps1 similarity index 100% rename from coin/provisioning/common/patch_qnx.ps1 rename to coin/provisioning/common/windows/patch_qnx.ps1 diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/windows/postgresql.ps1 similarity index 100% rename from coin/provisioning/common/postgresql.ps1 rename to coin/provisioning/common/windows/postgresql.ps1 diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/windows/python.ps1 similarity index 100% rename from coin/provisioning/common/python.ps1 rename to coin/provisioning/common/windows/python.ps1 diff --git a/coin/provisioning/common/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 similarity index 100% rename from coin/provisioning/common/python3.ps1 rename to coin/provisioning/common/windows/python3.ps1 diff --git a/coin/provisioning/common/set-network-test-server.ps1 b/coin/provisioning/common/windows/set-network-test-server.ps1 similarity index 94% rename from coin/provisioning/common/set-network-test-server.ps1 rename to coin/provisioning/common/windows/set-network-test-server.ps1 index 1a1f50b7..69059a2a 100644 --- a/coin/provisioning/common/set-network-test-server.ps1 +++ b/coin/provisioning/common/windows/set-network-test-server.ps1 @@ -31,11 +31,11 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will set the network test server IP in to hosts file -$n = Get-Content "$PSScriptRoot\network_test_server_ip.txt" +$n = Get-Content "$PSScriptRoot\..\network_test_server_ip.txt" $n = $n.Split('=') New-Variable -Name $n[0] -Value $n[1] diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/windows/vc_redist.ps1 similarity index 100% rename from coin/provisioning/common/vc_redist.ps1 rename to coin/provisioning/common/windows/vc_redist.ps1 diff --git a/coin/provisioning/common/wsearch-off.ps1 b/coin/provisioning/common/windows/wsearch-off.ps1 similarity index 100% rename from coin/provisioning/common/wsearch-off.ps1 rename to coin/provisioning/common/windows/wsearch-off.ps1 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh index 945d2e99..90b32d0d 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh @@ -35,7 +35,7 @@ set -ex -source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" if [ "$proxy" != "" ]; then echo "proxy=$proxy" | sudo tee -a /etc/yum.conf diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh index 5248f86f..b418ed8b 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh @@ -8,4 +8,4 @@ VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952" -$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" +$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh index 00b57918..572ad7ad 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -ex -$(dirname $0)/../common/cmake_linux.sh +$(dirname $0)/../common/linux/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh index fb3e9642..739d06b6 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh @@ -44,4 +44,4 @@ echo "***** All installed RPM packages *****" >> ~/versions.txt rpm -q -a | sort >> ~/versions.txt echo "*********************************************" >> ~/versions.txt -$(dirname $0)/../common/version.sh +$(dirname $0)/../common/linux/version.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh index 52ac3d6c..f8847e51 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh @@ -36,8 +36,8 @@ set -ex BASEDIR=$(dirname "$0") +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" source $BASEDIR/../common/network_test_server_ip.txt -source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh index bb97d390..d95f4f21 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh @@ -35,7 +35,7 @@ set -ex -source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" name="p7zip" version="7-11" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh index bf2e1ce9..fa8d3a44 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh @@ -7,4 +7,4 @@ VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" SHA1="bbdbbc0296f42310077539b7247d285386119ef4" -$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" +$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh index 7ce3d514..9800229d 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh @@ -39,4 +39,4 @@ set -ex # CMake is needed for autotests that verify that Qt can be built with CMake -source "${BASH_SOURCE%/*}/../common/cmake_linux.sh" +source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh index c415db3a..970d80b1 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh @@ -35,4 +35,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/qnx_700.sh" +source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh index 4f3f4205..1710b878 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh @@ -35,4 +35,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/integrity.sh" +source "${BASH_SOURCE%/*}/../common/linux/integrity.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh index d5fe88c7..20e82868 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh @@ -35,7 +35,7 @@ set -ex -source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" packageEpel="epel-release-latest-7.noarch.rpm" OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh index b3cca8f9..e4d2dc15 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh @@ -35,4 +35,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/disable_selinux.sh" +source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh index 7ecc470d..b685362e 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh @@ -37,4 +37,4 @@ source /opt/rh/devtoolset-4/enable set -ex -source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" +source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh index 7e39935b..ca24a70e 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/fbx_linux.sh +$BASEDIR/../common/linux/fbx_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh index 19e41d46..ffe96d30 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh @@ -35,4 +35,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/android_linux.sh" +source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index f245c90c..60e637b7 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -35,12 +35,12 @@ # This script modifies system settings for automated use -# shellcheck source=../common/try_catch.sh - set -ex -source "${BASH_SOURCE%/*}/../common/try_catch.sh" -source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" NTS_IP=10.212.2.216 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index acf92779..ef2b14d0 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -37,7 +37,7 @@ set -ex -source "${BASH_SOURCE%/*}/../common/try_catch.sh" +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" ExceptionAPTUpdate=100 ExceptionAPT=101 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh index b3fea7df..ddb1d3dc 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh @@ -37,7 +37,7 @@ set -ex -source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" echo "Installing Yocto toolchain for 32-bit b2qt..." diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh index 9937765a..0f89e72c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh @@ -35,4 +35,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" +source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh index 7e39935b..ca24a70e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/fbx_linux.sh +$BASEDIR/../common/linux/fbx_linux.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh index 5808a45c..6784335a 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh @@ -35,4 +35,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/android_linux.sh" +source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh index ddfc88a6..8f81a7dd 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh @@ -1,5 +1,5 @@ #!/bin/bash BASEDIR=$(dirname "$0") -$BASEDIR/../common/cmake_linux.sh +$BASEDIR/../common/linux/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index eeb98b70..f419b7c1 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -4,7 +4,7 @@ set -ex BASEDIR=$(dirname "$0") source $BASEDIR/../common/network_test_server_ip.txt -source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh index f0e0f19c..65d3ad4b 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh @@ -8,4 +8,4 @@ VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" SHA1="bbdbbc0296f42310077539b7247d285386119ef4" -$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" +$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh index f1f2d5bd..2044310c 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh @@ -2,4 +2,4 @@ set -ex -$(dirname $0)/../common/cmake_linux.sh +$(dirname $0)/../common/linux/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh index b5f370ab..e5a4208b 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh @@ -35,7 +35,7 @@ # This script install Intel Parallel Studio XE Composer Edition for C++ Linux -source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" set -ex diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh index dceb3bcc..20430d6a 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh @@ -37,8 +37,8 @@ set -ex # This script modified system settings for automated use -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" VNCPassword=qt NTS_IP=10.212.2.216 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh index 6f5faee0..34202209 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh @@ -39,8 +39,8 @@ set -ex -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh index 39719bb8..66e4dfde 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh @@ -39,8 +39,8 @@ set -ex echo "Installing Java Development Kit" -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" ExceptionDownloadPrimaryUrl=100 ExceptionDownloadAltUrl=101 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh index f879d756..a0611154 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh @@ -44,10 +44,10 @@ set -ex -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" -# shellcheck source=../common/install_xcode.sh -source "${BASH_SOURCE%/*}/../common/install_xcode.sh" +# shellcheck source=../common/macos/install_xcode.sh +source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index 9801e99c..d534e74d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -35,7 +35,7 @@ set -ex -source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" +source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" version="8.3.2" packageName="CommandLineToolsforXcode$version.dmg" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh index 3cdbd463..e5dd1910 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/cmake.sh +$BASEDIR/../common/macos/cmake.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh index 9fb5d672..0ead5a58 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/homebrew.sh +$BASEDIR/../common/macos/homebrew.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh index b37bb02d..b47f9705 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh @@ -39,8 +39,8 @@ set -ex -# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh index 9e1df19a..69c6b318 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/pip.sh +$BASEDIR/../common/macos/pip.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh index c9e9c842..8f3f85ec 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh @@ -39,8 +39,8 @@ set -ex -# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" psqlVersion="9.6.0" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh index b18e4923..92b05bf3 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -ex -source "${BASH_SOURCE%/*}/../common/python3.sh" +source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh index 8cdb7108..a35d26ca 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/virtualenv.sh +$BASEDIR/../common/macos/virtualenv.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh index 2a8a90c3..fea11e01 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default -$BASEDIR/../common/libclang.sh +$BASEDIR/../common/unix/libclang.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh index 9c754dbf..b6e731f2 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh @@ -39,8 +39,8 @@ set -ex -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" targetFolder="/opt/android" sdkTargetFolder="$targetFolder/sdk" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh index acefd8b7..9ce5d9ff 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh @@ -3,5 +3,5 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/fbx_macos.sh +$BASEDIR/../common/macos/fbx_macos.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index 503a4c07..ccff42c3 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -37,10 +37,10 @@ set -ex -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" -# shellcheck source=../common/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" +# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh" opensslVersion="1.0.2k" opensslFile="openssl-$opensslVersion.tar.gz" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh index a1ab3a92..94b53309 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/system_updates.sh +$BASEDIR/../common/macos/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh index 3cdbd463..e5dd1910 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/cmake.sh +$BASEDIR/../common/macos/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh index 2a8a90c3..fea11e01 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default -$BASEDIR/../common/libclang.sh +$BASEDIR/../common/unix/libclang.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh index b18e4923..92b05bf3 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -ex -source "${BASH_SOURCE%/*}/../common/python3.sh" +source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh index a1ab3a92..94b53309 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/system_updates.sh +$BASEDIR/../common/macos/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh index 0e39a958..5cb067a7 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh @@ -37,8 +37,8 @@ set -ex -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" VNCPassword=qt NTS_IP=10.212.2.216 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh index 314a0d24..9f66cc66 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh @@ -39,8 +39,8 @@ set -ex -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/XZ.pkg" AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh index 779a525e..b1e1d657 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh @@ -44,10 +44,10 @@ set -ex -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" -# shellcheck source=../common/install_xcode.sh -source "${BASH_SOURCE%/*}/../common/install_xcode.sh" +# shellcheck source=../common/macos/install_xcode.sh +source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.2.xz 8.2 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh index a8f7cca1..cb7dcfc6 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh @@ -35,7 +35,7 @@ set -ex -source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" +source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" version="8.2" packageName="Command_Line_Tools_macOS_10.11_for_Xcode_$version.dmg" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh index 3cdbd463..e5dd1910 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/cmake.sh +$BASEDIR/../common/macos/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh index 9fb5d672..0ead5a58 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh @@ -3,4 +3,4 @@ set -ex BASEDIR=$(dirname "$0") -$BASEDIR/../common/homebrew.sh +$BASEDIR/../common/macos/homebrew.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh index 17bb0df3..89534baf 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh @@ -39,8 +39,8 @@ set -ex -# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz" AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh index f71225f5..8d88630b 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh @@ -39,8 +39,8 @@ set -ex -# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip" AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh index b18e4923..92b05bf3 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -ex -source "${BASH_SOURCE%/*}/../common/python3.sh" +source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh index 2a8a90c3..fea11e01 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh @@ -4,4 +4,4 @@ set -ex BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default -$BASEDIR/../common/libclang.sh +$BASEDIR/../common/unix/libclang.sh diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 index 1042c846..ee3b3b7d 100644 --- a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" +. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86/02-python.ps1 index 27c618e1..19e64a94 100644 --- a/coin/provisioning/qtci-windows-10-x86/02-python.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/02-python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" 32 +. "$PSScriptRoot\..\common\windows\python.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 index 2fc36311..75c6a232 100644 --- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\03-conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 index f92acd91..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windefender.ps1" +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 index 167cfd35..eed6b734 100644 --- a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\wsearch-off.ps1" +. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 index b405191e..1b1a07e9 100644 --- a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" +. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 b/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 index e46361a0..ba571a1e 100644 --- a/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\ninja.ps1" +. "$PSScriptRoot\..\common\windows\ninja.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 index cc8be923..3ad5b9fd 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libclang.ps1" 32 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 index 164fbe43..28299307 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python3.ps1" 32 +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 index 0d28ea1e..875b426f 100644 --- a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-ruby.ps1" +. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 index 325be36a..074a7a6d 100644 --- a/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\icu.ps1" +. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 index 37af7119..fe1aec7d 100644 --- a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 @@ -30,5 +30,5 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1" +. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 index 842c65dd..b246ce25 100644 --- a/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\jom.ps1" +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 index 8dbe0372..73dc7bc2 100644 --- a/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\cmake.ps1" +. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 index a853ffef..29a1cfa4 100644 --- a/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libusb.ps1" +. "$PSScriptRoot\..\common\windows\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 index e8e24995..af05e838 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1" +. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 index f92acd91..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windefender.ps1" +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 index 1042c846..ee3b3b7d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" +. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 index ae3f327d..5bf811ef 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-sleep.ps1" +. "$PSScriptRoot\..\common\windows\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 index 44c1c5ff..e2e9be9c 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" 64 +. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 index 65aee221..c2068666 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\03-conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 index ee3f36a9..a9044256 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-sevenzip.ps1" +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 index c19bf6cd..57428310 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windows-updates.ps1" +. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index 3ffe1a06..18ce0581 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # This script installs QNX SDP 7.0 diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 index 167cfd35..eed6b734 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\wsearch-off.ps1" +. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 index b405191e..1b1a07e9 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" +. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1 index e46361a0..ba571a1e 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\ninja.ps1" +. "$PSScriptRoot\..\common\windows\ninja.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 index f9129cff..38106de7 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-git.ps1" +. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 index 3b64ffec..15065b55 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-jdk.ps1" +. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 index 7eeb0a37..b6e3582c 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libclang.ps1" 64 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 index b0c21996..3201032d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python3.ps1" 64 +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 index 8d549455..331de489 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-dependencywalker.ps1" +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" 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 index 7c4cd8ac..684816f0 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\install-mingw.ps1" +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" # This script will install MinGW 5.3.0 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 index e11f2310..27612c49 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\install-mingw.ps1" +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" # This script will install MinGW 6.3.0 diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 index 0d28ea1e..875b426f 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-ruby.ps1" +. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 index 18109622..2b5756be 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-strawberry-perl.ps1" +. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 index f3906f78..d57ad1cd 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\openssl.ps1" +. "$PSScriptRoot\..\common\windows\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 index 16d2e180..7918fabf 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\set-network-test-server.ps1" +. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 index 325be36a..074a7a6d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\icu.ps1" +. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 index 37af7119..fe1aec7d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 @@ -30,5 +30,5 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1" +. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 index 82cee080..468b0433 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\fbx_windows.ps1" +. "$PSScriptRoot\..\common\windows\fbx_windows.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 index 39627626..2a71fd55 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-qnx660.ps1" +. "$PSScriptRoot\..\common\windows\install-qnx660.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 index 41210dcb..de486c97 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\patch_qnx.ps1" +. "$PSScriptRoot\..\common\windows\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 index 842c65dd..b246ce25 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\jom.ps1" +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 index 8dbe0372..73dc7bc2 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\cmake.ps1" +. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 index 3bc58072..114f52f9 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\3dstudio_3rdparty.ps1" +. "$PSScriptRoot\..\common\windows\3dstudio_3rdparty.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 index 1f26c731..455d92bf 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-notepad++.ps1" +. "$PSScriptRoot\..\common\windows\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 index 4d09becf..298375a3 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # This script will install VirtualBox diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 index a853ffef..29a1cfa4 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libusb.ps1" +. "$PSScriptRoot\..\common\windows\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 index f6902153..864a79a5 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 @@ -1,2 +1,2 @@ -. "$PSScriptRoot\..\common\mysql.ps1" +. "$PSScriptRoot\..\common\windows\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 index c1d8e13e..0e0d87be 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 @@ -1,2 +1,2 @@ -. "$PSScriptRoot\..\common\postgresql.ps1" +. "$PSScriptRoot\..\common\windows\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 index 882bd1de..7d01edac 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 @@ -32,7 +32,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # Signing tools are needed to sign offline installers when releasing diff --git a/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1 index e8e24995..af05e838 100644 --- a/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1" +. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1 index 2303699c..51eb0b2b 100644 --- a/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-uac.ps1" +. "$PSScriptRoot\..\common\windows\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 index 1042c846..ee3b3b7d 100644 --- a/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" +. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1 index ae3f327d..5bf811ef 100644 --- a/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-sleep.ps1" +. "$PSScriptRoot\..\common\windows\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1 b/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1 index ba24f9d7..e9a9c438 100644 --- a/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\memorypershell.ps1" +. "$PSScriptRoot\..\common\windows\memorypershell.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/02-python.ps1 b/coin/provisioning/qtci-windows-7-x86/02-python.ps1 index 27c618e1..19e64a94 100644 --- a/coin/provisioning/qtci-windows-7-x86/02-python.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/02-python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" 32 +. "$PSScriptRoot\..\common\windows\python.ps1" 32 diff --git a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 index 163739fa..807e5480 100644 --- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\03-conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` diff --git a/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 index ee3f36a9..a9044256 100644 --- a/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-sevenzip.ps1" +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 index f92acd91..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windefender.ps1" +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1 index c19bf6cd..57428310 100644 --- a/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windows-updates.ps1" +. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 index 9c1d90d4..8bfcdbae 100644 --- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # This script will install msys which is needed for configuring openssl for Android diff --git a/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 index 167cfd35..eed6b734 100644 --- a/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\wsearch-off.ps1" +. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 index ad3d5950..b9d8153e 100644 --- a/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\vc_redist.ps1" 32 +. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1 index f9129cff..38106de7 100644 --- a/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-git.ps1" +. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1 index 3b64ffec..15065b55 100644 --- a/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-jdk.ps1" +. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 index b405191e..1b1a07e9 100644 --- a/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" +. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1 b/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1 index e46361a0..ba571a1e 100644 --- a/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\ninja.ps1" +. "$PSScriptRoot\..\common\windows\ninja.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 index 164fbe43..28299307 100644 --- a/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python3.ps1" 32 +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1 b/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1 index 8dbe0372..73dc7bc2 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\cmake.ps1" +. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1 index 8d549455..331de489 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-dependencywalker.ps1" +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 index 7c4cd8ac..684816f0 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\install-mingw.ps1" +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" # This script will install MinGW 5.3.0 diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1 index 0d28ea1e..875b426f 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-ruby.ps1" +. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1 index 18109622..2b5756be 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-strawberry-perl.ps1" +. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-jom.ps1 b/coin/provisioning/qtci-windows-7-x86/09-jom.ps1 index 842c65dd..b246ce25 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-jom.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-jom.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\jom.ps1" +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1 index a41035da..eca19011 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mysql.ps1" +. "$PSScriptRoot\..\common\windows\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index f3906f78..d57ad1cd 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\openssl.ps1" +. "$PSScriptRoot\..\common\windows\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1 index 92339a45..451d2452 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\postgresql.ps1" +. "$PSScriptRoot\..\common\windows\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1 index 16d2e180..7918fabf 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\set-network-test-server.ps1" +. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 index ba194de6..6fea9693 100644 --- a/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # This script installs DirectX SDK diff --git a/coin/provisioning/qtci-windows-7-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1 index 325be36a..074a7a6d 100644 --- a/coin/provisioning/qtci-windows-7-x86/10-icu.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\icu.ps1" +. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 b/coin/provisioning/qtci-windows-7-x86/30-android.ps1 index f355a5de..3568c681 100644 --- a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/30-android.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # This script installs Android sdk and ndk # It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version $sdkBuildToolsVersion diff --git a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 index 4f2b74eb..a38272a6 100644 --- a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 @@ -33,7 +33,7 @@ # Requires: 7z, perl and msys -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # OpenSSL need to be configured from sources for Android build in windows 7 # Msys need to be installed to target machine diff --git a/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 index 41210dcb..de486c97 100644 --- a/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\patch_qnx.ps1" +. "$PSScriptRoot\..\common\windows\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 index 1f26c731..455d92bf 100644 --- a/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-notepad++.ps1" +. "$PSScriptRoot\..\common\windows\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 index e8e24995..af05e838 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1" +. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 index 2303699c..51eb0b2b 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-uac.ps1" +. "$PSScriptRoot\..\common\windows\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 index 1042c846..ee3b3b7d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" +. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 index ae3f327d..5bf811ef 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-sleep.ps1" +. "$PSScriptRoot\..\common\windows\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 index 44c1c5ff..e2e9be9c 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" 64 +. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 index ee3f36a9..a9044256 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-sevenzip.ps1" +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 index f92acd91..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windefender.ps1" +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 index c19bf6cd..57428310 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windows-updates.ps1" +. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 index 167cfd35..eed6b734 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\wsearch-off.ps1" +. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 index b405191e..1b1a07e9 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" +. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" 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 index ad3d5950..b9d8153e 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\vc_redist.ps1" 32 +. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 index f9129cff..38106de7 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-git.ps1" +. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 index 3b64ffec..15065b55 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-jdk.ps1" +. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 index cc8be923..3ad5b9fd 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libclang.ps1" 32 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 index 164fbe43..28299307 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python3.ps1" 32 +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 index 8d549455..331de489 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-dependencywalker.ps1" +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 index 0d28ea1e..875b426f 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-ruby.ps1" +. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 index 18109622..2b5756be 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-strawberry-perl.ps1" +. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 index 8540c67d..202d072d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 @@ -30,7 +30,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # Install Visual Studio 2013 update 5 diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 index a41035da..eca19011 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mysql.ps1" +. "$PSScriptRoot\..\common\windows\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 index f3906f78..d57ad1cd 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\openssl.ps1" +. "$PSScriptRoot\..\common\windows\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 index 92339a45..451d2452 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\postgresql.ps1" +. "$PSScriptRoot\..\common\windows\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 index 16d2e180..7918fabf 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\set-network-test-server.ps1" +. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 index 325be36a..074a7a6d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\icu.ps1" +. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 index 8dbe0372..73dc7bc2 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\cmake.ps1" +. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 index 842c65dd..b246ce25 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\jom.ps1" +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 index 1f26c731..455d92bf 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-notepad++.ps1" +. "$PSScriptRoot\..\common\windows\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 index e8e24995..af05e838 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1" +. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 index 2303699c..51eb0b2b 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-uac.ps1" +. "$PSScriptRoot\..\common\windows\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 index 1042c846..ee3b3b7d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" +. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 index ae3f327d..5bf811ef 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-sleep.ps1" +. "$PSScriptRoot\..\common\windows\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 index 44c1c5ff..e2e9be9c 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" 64 +. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 index ee3f36a9..a9044256 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-sevenzip.ps1" +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 index f92acd91..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windefender.ps1" +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 index c19bf6cd..57428310 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windows-updates.ps1" +. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 index 167cfd35..eed6b734 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\wsearch-off.ps1" +. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 index b405191e..1b1a07e9 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" +. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" 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 index 6070c80b..b8c1ce9f 100644 --- 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 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\vc_redist.ps1" 64 +. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 index f9129cff..38106de7 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-git.ps1" +. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 index 3b64ffec..15065b55 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-jdk.ps1" +. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 index 7eeb0a37..b6e3582c 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libclang.ps1" 64 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 index 8540c67d..202d072d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 @@ -30,7 +30,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # Install Visual Studio 2013 update 5 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 index b0c21996..3201032d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python3.ps1" 64 +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 index 8d549455..331de489 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-dependencywalker.ps1" +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 index 0d28ea1e..875b426f 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-ruby.ps1" +. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 index 18109622..2b5756be 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-strawberry-perl.ps1" +. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 index a41035da..eca19011 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mysql.ps1" +. "$PSScriptRoot\..\common\windows\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 index f3906f78..d57ad1cd 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\openssl.ps1" +. "$PSScriptRoot\..\common\windows\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 index 92339a45..451d2452 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\postgresql.ps1" +. "$PSScriptRoot\..\common\windows\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 index 16d2e180..7918fabf 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\set-network-test-server.ps1" +. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 index 325be36a..074a7a6d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\icu.ps1" +. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 index 8dbe0372..73dc7bc2 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\cmake.ps1" +. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 index 842c65dd..b246ce25 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\jom.ps1" +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 index 1f26c731..455d92bf 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-notepad++.ps1" +. "$PSScriptRoot\..\common\windows\install-notepad++.ps1" From 123ff665c3ccd529de7b2cebc3a7afa90ea7c9a8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Jan 2018 11:34:59 +0100 Subject: [PATCH 56/59] Update submodules on '5.9' in qt5 Change-Id: I46157aa3edab44a436fbf9a02e6213f5c2a00f85 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 1c822451..73a5a93f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1c8224511dee2794553da9dc8ed484d49dc78b45 +Subproject commit 73a5a93ff982a2e783828b1e11988614d38d8687 diff --git a/qtconnectivity b/qtconnectivity index 5a67821b..caad6365 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5a67821b9615b5fc17cab405566a81cc7f554ad4 +Subproject commit caad6365b291cc5066ff5aaacdc1b6e02818bc10 diff --git a/qtdeclarative b/qtdeclarative index 76da60b5..6b1fe1a5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 76da60b5ad388b6873f496b07b2c3ccabe9c9490 +Subproject commit 6b1fe1a54183498cd87266c41e79eb4d3c396e42 diff --git a/qtlocation b/qtlocation index 844e0e4a..8dd711a9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 844e0e4aec3285ec5cfde90422acd796bc4d7d39 +Subproject commit 8dd711a9e9dd88195bc85d3e15b30dd1384aebae diff --git a/qtmultimedia b/qtmultimedia index 13df2988..b9440a30 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 13df2988efbe9a82225ccbf4cad463391d94c8e8 +Subproject commit b9440a3047cfca9ae253e850db31b8e9b08538e7 diff --git a/qtquickcontrols b/qtquickcontrols index 8da20dde..5f0bd47f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 8da20ddef88cb48b7bb09ff7dc1db6517add8e72 +Subproject commit 5f0bd47f81469407023bc9b05b13cdf1834d50b3 diff --git a/qtrepotools b/qtrepotools index 14431b40..21ec9879 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 14431b4087125e247c1e2322e0cd043b78974ce2 +Subproject commit 21ec987901a927793d7baa9db3fd37d0216aef06 diff --git a/qtwebchannel b/qtwebchannel index b90fbebb..6701ff31 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b90fbebbb5e257f771e96980109fb543647b1844 +Subproject commit 6701ff310933ec33f9199b53d78299764f646387 diff --git a/qtwebengine b/qtwebengine index 9ef3a826..26ffb70f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9ef3a8263098c6a32db8b824aabf85587d1f1140 +Subproject commit 26ffb70f5748e0e7340d88681f2841ae246a8e7e From ebe2b86fd071545138a99e6682b8b7009d27ffcb Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 4 Jan 2018 16:33:27 +0300 Subject: [PATCH 57/59] Remove 'Packaging' flag from QtWebKit MSVC2017/x86 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt doesn't provide binaries for this platform. Change-Id: Iab30435bb480ee898c2409f87facabb26fce9421 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qtwebkit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index b3dc74f7..75fa9c20 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests From 3e96fec2e148f39a9ec298a60bd331b6c19214da Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Jan 2018 22:52:17 +0100 Subject: [PATCH 58/59] Update submodules on '5.9' in qt5 Change-Id: If0b6b7bdb5151aa7488afed379785de63ca3aef2 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtrepotools | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 73a5a93f..1df2906c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 73a5a93ff982a2e783828b1e11988614d38d8687 +Subproject commit 1df2906c75f379a62bce487d3d2db3ade3095b16 diff --git a/qtdeclarative b/qtdeclarative index 6b1fe1a5..ddf495fb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6b1fe1a54183498cd87266c41e79eb4d3c396e42 +Subproject commit ddf495fb81ea89173af3310f50314b177bc866d2 diff --git a/qtlocation b/qtlocation index 8dd711a9..8825b9f9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8dd711a9e9dd88195bc85d3e15b30dd1384aebae +Subproject commit 8825b9f97612442b645cc4dc428cb2c80349abbe diff --git a/qtrepotools b/qtrepotools index 21ec9879..dbb2058c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 21ec987901a927793d7baa9db3fd37d0216aef06 +Subproject commit dbb2058c339bcf15db983c9597277864c157516f From 271fedaf88465d9b28dd3d2ce74acfc6d05a5633 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 11 Jan 2018 03:00:54 +0200 Subject: [PATCH 59/59] Update submodules on '5.10' in qt5 Change-Id: If56253b74477a0bdc034f1daf32920d3363a27f4 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qtbase b/qtbase index af1a179c..1623f669 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit af1a179cc8b599523ca858b1b9f55c93a734d047 +Subproject commit 1623f66989d162faead5200e50b48d079edda3ba diff --git a/qtdeclarative b/qtdeclarative index 590e7418..2e8a45d9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 590e7418cc6afbf2b5b8cf85373f1674c583a7da +Subproject commit 2e8a45d99f94cbd2c805dd3de56d60d9baa9bd4e diff --git a/qtlocation b/qtlocation index eca7ffd4..30c69a44 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit eca7ffd4f8539292aed40b81284e0cd81f80c998 +Subproject commit 30c69a44b0ad671481b5adb2fe997e7f7d56820e diff --git a/qtmultimedia b/qtmultimedia index 7a3b8907..b8609cd3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7a3b8907060123fe5d487d4c9ba3a1e222f468bb +Subproject commit b8609cd3ffeddd02a514c6b5f9170c8017966e41 diff --git a/qtnetworkauth b/qtnetworkauth index f6aedc74..8cce9fa1 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit f6aedc74c4a95440e649b625b6272f29e7f5fa71 +Subproject commit 8cce9fa16f3531e1e094a798c007480afa2bcaab diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 10b8f6af..772c01c0 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 10b8f6af42a1cd80273d0a2d36e75b79078b5994 +Subproject commit 772c01c0ced1c3420b2c8fb3ec4b4bbc898b7d6a diff --git a/qtrepotools b/qtrepotools index 07f8dbb0..dbb2058c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 07f8dbb095e4905d2d43e1527ce5616d047a3ae9 +Subproject commit dbb2058c339bcf15db983c9597277864c157516f diff --git a/qtsvg b/qtsvg index 2e719713..b9cddbd8 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2e719713be8ac3b1e26b23221f12db136d9d5103 +Subproject commit b9cddbd84b74fdda30190800ed827dc80aa65f6c diff --git a/qttools b/qttools index 171c37ec..58f0987e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 171c37ecc2a0003315fd7cca48e41814bc7b7b8d +Subproject commit 58f0987e16ac4580d9e4a6b604dd7603510b0385 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 477fa0d4..e94108a9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 477fa0d4b5c27b649e15c8819bf8a95e7a8922c1 +Subproject commit e94108a9b45a5a972e9111a45a27476665484c82 diff --git a/qtwayland b/qtwayland index 8bd8815f..8ab1765b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8bd8815fd629e34c54924a2ada41007464da22ec +Subproject commit 8ab1765b0f9640eb410864971cb4336adc7b30ab diff --git a/qtwebchannel b/qtwebchannel index 5a9dd81f..ee70a3dc 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 5a9dd81f260f320b5af108c1a6b3d0b82a04f15d +Subproject commit ee70a3dc1dff15f6fc00ea979ae0c169e201acab diff --git a/qtwebengine b/qtwebengine index 7473a43b..0b406584 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7473a43beff891c93a245620b6307f3a073dba28 +Subproject commit 0b406584b711e5c6e12baeb15e10045f02914af4 diff --git a/qtwebglplugin b/qtwebglplugin index 2bff9adb..bc8fefc2 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 2bff9adbbb6b65d35b944f4ee65ea7309c12a290 +Subproject commit bc8fefc2470ccb2ecc2edaab9822f71be09fa901 diff --git a/qtwebsockets b/qtwebsockets index 91bb3576..f5ea17db 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 91bb3576f7787041ab85d0ff6c0dfe2ce26281b9 +Subproject commit f5ea17db7f103bb28f210d96c5b82b4315799930