diff options
| -rw-r--r-- | .gitmodules | 68 | ||||
| -rw-r--r-- | coin/provisioning/common/DownloadURL.sh | 3 | ||||
| -rw-r--r-- | coin/provisioning/common/cmake.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/common/helpers.ps1 | 5 | ||||
| -rw-r--r-- | coin/provisioning/common/install-ruby.ps1 | 3 | ||||
| -rw-r--r-- | coin/provisioning/common/python.ps1 | 3 | ||||
| m--------- | qtandroidextras | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtcanvas3d | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmacextras | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtquickcontrols | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtserialbus | 0 | ||||
| m--------- | qtserialport | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebchannel | 0 | ||||
| m--------- | qtwebengine | 0 | ||||
| m--------- | qtwebsockets | 0 | ||||
| m--------- | qtwebview | 0 | ||||
| m--------- | qtx11extras | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
29 files changed, 44 insertions, 40 deletions
diff --git a/.gitmodules b/.gitmodules index 2acc9bf2..9e391985 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.6.3 + branch = 5.6 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.6.3 + branch = 5.6 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.6.3 + branch = 5.6 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.6.3 + branch = 5.6 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.6.3 + branch = 5.6 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.6.3 + branch = 5.6 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.6.3 + branch = 5.6 status = essential priority = 40 [submodule "qtrepotools"] @@ -75,7 +75,7 @@ serialize = qtwebengine path = qtwebkit url = ../qtwebkit.git - branch = 5.6.3 + branch = 5.6 status = obsolete project = WebKit.pro priority = 20 @@ -83,7 +83,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.6.3 + branch = 5.6 status = obsolete [submodule "qtqa"] depends = qtbase @@ -97,14 +97,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtsystems"] depends = qtbase @@ -137,130 +137,130 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git - branch = 5.6.3 + branch = 5.6 status = preview [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.6.3 + branch = 5.6 status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.6.3 + branch = 5.6 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.6.3 + branch = 5.6 status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 5.6.3 + branch = 5.6 status = deprecated [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.6.3 + branch = 5.6 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.6.3 + branch = 5.6 status = addon [submodule "qtquickcontrols2"] depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.6.3 + branch = 5.6 status = preview [submodule "qtpurchasing"] depends = qtbase qtandroidextras diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh index 305f2675..c60fae21 100644 --- a/coin/provisioning/common/DownloadURL.sh +++ b/coin/provisioning/common/DownloadURL.sh @@ -70,7 +70,8 @@ function DownloadURL { esac } echo "Checking SHA1 on PKG '$targetFile'" - echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 + echo "$expectedSha1 *$targetFile" > $targetFile.sha1 + shasum --check $targetFile.sha1 || throw $ExceptionSHA1 ) catch || { diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 50e2e82c..8a94dc5d 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -53,5 +53,7 @@ if((Test-Path -Path "C:\CMake" )){ $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" Rename-Item $defaultinstallfolder C:\CMake +Add-Path "C:\CMake\bin" + echo "CMake = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index 3f7f0a68..b957603a 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -69,6 +69,7 @@ function Download [string] $CachedUrl = $(BadParam("the locally cached URL")), [string] $Destination = $(BadParam("a download target location")) ) + $ProgressPreference = 'SilentlyContinue' try { if ($CachedUrl.StartsWith("http")) { Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination @@ -86,7 +87,9 @@ function Add-Path [string]$Path ) echo "Adding $Path to Path" - [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine) + + $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') + [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine) } function is64bitWinHost diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index 81b01342..57cf227f 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -55,7 +55,6 @@ cmd /c "$rubyPackage /silent" echo "Cleaning $rubyPackage.." Remove-Item -Recurse -Force "$rubyPackage" -$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') -[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Ruby22-x64\bin", [EnvironmentVariableTarget]::Machine) +Add-Path "C:\Ruby22-x64\bin" echo "Ruby = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 0be96eef..c3eba2d8 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -59,8 +59,7 @@ echo "Chancing allowZip64 value to 'True'..." echo "Remove $package..." del $package -$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') -[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) +Add-Path "C:\Python27;C:\Python27\Scripts" C:\Python27\python.exe -m ensurepip # Install python virtual env diff --git a/qtandroidextras b/qtandroidextras -Subproject 6163101324d9bd7cef59c98efd584f7fd6b6230 +Subproject dfb9f2cfd658860f69dd55363122a7c2c56b88f diff --git a/qtbase b/qtbase -Subproject e6f8b072d2bf15f8b82bede48ff29ce8ac8dbd9 +Subproject 40ca27e0d2107fd97b01bfb201cff408f7c5a0c diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 8bbd832997841927e0d8a433f4ec20c82cdea20 +Subproject 61804e56b82330fac0f29beec0e56262233467b diff --git a/qtconnectivity b/qtconnectivity -Subproject 12b5e352c312a88518d6db34673350a70cd5361 +Subproject f7bfd2adb82e3a8797e168a37287510e4a004b2 diff --git a/qtdeclarative b/qtdeclarative -Subproject bb01612a8809efd268903e41b9e3a17cff48f1c +Subproject f724b5380c911fbc841ff8ed4831dccd37fff6e diff --git a/qtdoc b/qtdoc -Subproject c46e1a02eefb6b4050ef0cbb4190d086813da31 +Subproject 27f883002b9fba6e5bbcbc84ad0d366fb814980 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject bf13dd5ca02d861c3a554743948c939a339d506 +Subproject 4dc734d85f59e3a16a50a9d7ffebc7aa304f524 diff --git a/qtimageformats b/qtimageformats -Subproject a7a998ee6e328babaa0edfee0d156fb28cf1b38 +Subproject b6ffd71e2315e699d4ad32859cf36c67635820e diff --git a/qtlocation b/qtlocation -Subproject 35348e80145305778a89923d3bfe50d7baba769 +Subproject 0a38932510ffaad5387b7e86c7ca70aed8af5c5 diff --git a/qtmacextras b/qtmacextras -Subproject 5aea592832ad6380b3eab91790b147b22cfdb92 +Subproject 9e98d9a6f56d1076ec9438b2b22f46ed0798273 diff --git a/qtmultimedia b/qtmultimedia -Subproject 4dd780a81e886a8a5eb86d1a045716ac4194eba +Subproject 6d4948122063b651948a5c4db2197d633d7e96c diff --git a/qtquickcontrols b/qtquickcontrols -Subproject b66f6b05c5f8024ddd9f8c46f33ccb618323999 +Subproject 9fc3fcb5a827196dee8c7afbd70a4c2361c6510 diff --git a/qtsensors b/qtsensors -Subproject 099b3a7442a553aedf4d5bb8955dabcae4dae66 +Subproject 12b98b6ff70a18c27f543dda029e75c197d8cbc diff --git a/qtserialbus b/qtserialbus -Subproject 21616f7bc1e7325d2cb04403388b8fdaeea99e2 +Subproject f5b1c3a32b2a7c9bc06b68c469981ae46fb7172 diff --git a/qtserialport b/qtserialport -Subproject 2f7b2533b323644289c60370f68492aea6b1a62 +Subproject 9e4b9d276f0de2d298da4ffdf6f15a996040219 diff --git a/qttools b/qttools -Subproject 56dbabb7a64a4d416e8cf7b61e068208fd03235 +Subproject 705d06c2841ef5d9ebda954c112fc8f1e32ec2c diff --git a/qtwayland b/qtwayland -Subproject 70575643cfece4f0aca4b40e77ac5d7c0e8042a +Subproject d6f7bb39e71777ce5568d462841caccc17f3a20 diff --git a/qtwebchannel b/qtwebchannel -Subproject 065afc22e9cc61364968aafc74ff2ca4524fab5 +Subproject 64306392ce3a7751bfb58e1352b212ad5cba8ae diff --git a/qtwebengine b/qtwebengine -Subproject fad625e0ba39e855817bbf206ab9a846d07aeee +Subproject 04fa812ef5025aa991d9a79dd26e9ecfcb3182a diff --git a/qtwebsockets b/qtwebsockets -Subproject 65e7130466963e0fd9cee8719d8b37c9fb15db3 +Subproject d3032491971e1cee8f1171f16b8e6d3d2fa42ee diff --git a/qtwebview b/qtwebview -Subproject 6d9a88e3048e230a3ee516c39bf55f714117869 +Subproject d39941695dbc10b06188580b675f2b7c337ca50 diff --git a/qtx11extras b/qtx11extras -Subproject e33fc10fa49da17b297c53e44d109dc4d24c974 +Subproject 25e20a724f411f6e07cd3dc9f4870298a308c2c diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 50582280b10fb1962b3bdfdd06a72ae1e032504 +Subproject 0533f8ba47f57da5d7363c2c00cf0b239ce7288 |