Merge remote-tracking branch 'origin/5.6.3' into 5.6
authorLiang Qi <liang.qi@qt.io>
Mon, 18 Sep 2017 07:20:32 +0000 (09:20 +0200)
committerLiang Qi <liang.qi@qt.io>
Mon, 18 Sep 2017 07:42:25 +0000 (09:42 +0200)
 Conflicts:
.gitmodules

Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c

12 files changed:
coin/platform_configs/qt5.txt
coin/provisioning/common/install-mingw.ps1 [new file with mode: 0644]
coin/provisioning/common/install-qnx660.ps1 [new file with mode: 0644]
coin/provisioning/common/vc_redist.ps1
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 [new file with mode: 0644]
coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 [new file with mode: 0644]
coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 [new file with mode: 0644]
coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 [moved from coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 with 100% similarity]
coin/provisioning/qtci-windows-8.1-x86/python3.ps1 [moved from coin/provisioning/qtci-windows-8-x86/python3.ps1 with 100% similarity]
coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 [moved from coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 with 100% similarity]
coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 [moved from coin/provisioning/qtci-windows-8-x86_64/python3.ps1 with 100% similarity]

index b9565eb..92d55b1 100644 (file)
@@ -9,6 +9,8 @@ qtci-windows-7-x86-2        Android_ANY         x86         Mingw49     Packagin
 qtci-osx-10.11-x86_64       Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
 qtci-osx-10.11-x86_64       Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
 qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-10-x86_64-7    QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-7    QNX_660             x86         Mingw53     Packaging Release DisableTests OpenGLES2
 # target arch is used here only for documentation the value is ignored
 qtci-windows-10-x86_64-8    WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
 
diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/install-mingw.ps1
new file mode 100644 (file)
index 0000000..fc02631
--- /dev/null
@@ -0,0 +1,26 @@
+function InstallMinGW
+{
+    Param (
+        [string] $version     = $(BadParam("the version being printed to versions.txt")),
+        [string] $release     = $(BadParam("release part of the file name"))
+    )
+
+    $envvar = "MINGW$version"
+    $envvar = $envvar -replace '["."]'
+    $targetdir = "C:\$envvar"
+    $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\i686-" + $version + "-" + $release + ".7z"
+
+    $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip"
+    Copy-Item $url_cache $mingwPackage
+
+    Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"}
+
+    echo "Adding MinGW environment variable."
+    [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine)
+
+    echo "Cleaning $mingwPackage.."
+    Remove-Item -Recurse -Force "$mingwPackage"
+
+    echo "MinGW = $version $release" >> ~\versions.txt
+
+}
diff --git a/coin/provisioning/common/install-qnx660.ps1 b/coin/provisioning/common/install-qnx660.ps1
new file mode 100644 (file)
index 0000000..bf9c9d0
--- /dev/null
@@ -0,0 +1,46 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\helpers.ps1"
+
+# This script will install QNX 6.6.0
+
+$version = "6.6.0"
+$nondottedversion = $version -replace '[.]',''
+$targetFolder = "c:"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip"
+
+Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"}
+
+[Environment]::SetEnvironmentVariable("QNX_660", "$targetFolder", "Machine")
+echo "QNX = $version" >> ~\versions.txt
index 9556766..4213dde 100644 (file)
@@ -59,6 +59,6 @@ echo "Fetching from URL..."
 Download $externalUrl $internalUrl $package
 Verify-Checksum $package $sha1
 echo "Installing $package..."
-cmd /c "$package /q"
+Start-Process -FilePath $package -ArgumentList "/q" -Wait
 echo "Remove $package..."
 del $package
index 7c3220e..c278a2c 100644 (file)
@@ -87,7 +87,13 @@ function InstallAndroidPackage {
     sudo rm -fr "$targetFolder"/"$version"
 }
 
-sudo mkdir "$targetFolder"
+if [ -d "$targetFolder" ]; then
+    echo "Removing old Android installation"
+    sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; )
+fi
+
+sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; )
+
 # Install Android SDK
 echo "Installing Android SDK version $sdkPackage..."
 InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1
new file mode 100644 (file)
index 0000000..3962762
--- /dev/null
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-qnx660.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
new file mode 100644 (file)
index 0000000..ded894a
--- /dev/null
@@ -0,0 +1,10 @@
+. "$PSScriptRoot\..\common\install-mingw.ps1"
+
+# This script will install MinGW 5.3.0
+
+$version = "5.3.0"
+$release = "release-posix-dwarf-rt_v4-rev0"
+
+InstallMinGW $version $release
+
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
new file mode 100644 (file)
index 0000000..a271076
--- /dev/null
@@ -0,0 +1,8 @@
+. "$PSScriptRoot\..\common\install-mingw.ps1"
+
+# This script will install MinGW 6.3.0
+
+$version = "6.3.0"
+$release = "release-posix-dwarf-rt_v5-rev2"
+
+InstallMinGW $version $release