summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-09-18 09:20:32 +0200
committerLiang Qi <liang.qi@qt.io>2017-09-18 09:42:25 +0200
commite7472f43087921c3d83ff4452bbdb67ed27ed604 (patch)
tree09565f89d0e5b5a702b532b103fe677c1b13edba
parent92d1bdcb43e988919bfdcb91c0e6f366bed07145 (diff)
parent12fd0d5b9b486eaf80712d390265402a3bb06f0e (diff)
Merge remote-tracking branch 'origin/5.6.3' into 5.6
Conflicts: .gitmodules Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c
-rw-r--r--coin/platform_configs/qt5.txt2
-rw-r--r--coin/provisioning/common/install-mingw.ps126
-rw-r--r--coin/provisioning/common/install-qnx660.ps146
-rw-r--r--coin/provisioning/common/vc_redist.ps12
-rw-r--r--coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh8
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps110
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps18
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 (renamed from coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1)0
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/python3.ps1 (renamed from coin/provisioning/qtci-windows-8-x86/python3.ps1)0
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 (renamed from coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1)0
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 (renamed from coin/provisioning/qtci-windows-8-x86_64/python3.ps1)0
12 files changed, 101 insertions, 2 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index b9565ebe..92d55b1f 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -9,6 +9,8 @@ qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packagin
qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-10-x86_64-7 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-7 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2
# target arch is used here only for documentation the value is ignored
qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe
diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/install-mingw.ps1
new file mode 100644
index 00000000..fc02631d
--- /dev/null
+++ b/coin/provisioning/common/install-mingw.ps1
@@ -0,0 +1,26 @@
+function InstallMinGW
+{
+ Param (
+ [string] $version = $(BadParam("the version being printed to versions.txt")),
+ [string] $release = $(BadParam("release part of the file name"))
+ )
+
+ $envvar = "MINGW$version"
+ $envvar = $envvar -replace '["."]'
+ $targetdir = "C:\$envvar"
+ $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\i686-" + $version + "-" + $release + ".7z"
+
+ $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip"
+ Copy-Item $url_cache $mingwPackage
+
+ Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"}
+
+ echo "Adding MinGW environment variable."
+ [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine)
+
+ echo "Cleaning $mingwPackage.."
+ Remove-Item -Recurse -Force "$mingwPackage"
+
+ echo "MinGW = $version $release" >> ~\versions.txt
+
+}
diff --git a/coin/provisioning/common/install-qnx660.ps1 b/coin/provisioning/common/install-qnx660.ps1
new file mode 100644
index 00000000..bf9c9d09
--- /dev/null
+++ b/coin/provisioning/common/install-qnx660.ps1
@@ -0,0 +1,46 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\helpers.ps1"
+
+# This script will install QNX 6.6.0
+
+$version = "6.6.0"
+$nondottedversion = $version -replace '[.]',''
+$targetFolder = "c:"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip"
+
+Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"}
+
+[Environment]::SetEnvironmentVariable("QNX_660", "$targetFolder", "Machine")
+echo "QNX = $version" >> ~\versions.txt
diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/vc_redist.ps1
index 95567669..4213dde9 100644
--- a/coin/provisioning/common/vc_redist.ps1
+++ b/coin/provisioning/common/vc_redist.ps1
@@ -59,6 +59,6 @@ echo "Fetching from URL..."
Download $externalUrl $internalUrl $package
Verify-Checksum $package $sha1
echo "Installing $package..."
-cmd /c "$package /q"
+Start-Process -FilePath $package -ArgumentList "/q" -Wait
echo "Remove $package..."
del $package
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
index 7c3220ee..c278a2ce 100644
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
@@ -87,7 +87,13 @@ function InstallAndroidPackage {
sudo rm -fr "$targetFolder"/"$version"
}
-sudo mkdir "$targetFolder"
+if [ -d "$targetFolder" ]; then
+ echo "Removing old Android installation"
+ sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; )
+fi
+
+sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; )
+
# Install Android SDK
echo "Installing Android SDK version $sdkPackage..."
InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1
new file mode 100644
index 00000000..39627626
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-qnx660.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
new file mode 100644
index 00000000..ded894a5
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
@@ -0,0 +1,10 @@
+. "$PSScriptRoot\..\common\install-mingw.ps1"
+
+# This script will install MinGW 5.3.0
+
+$version = "5.3.0"
+$release = "release-posix-dwarf-rt_v4-rev0"
+
+InstallMinGW $version $release
+
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
new file mode 100644
index 00000000..a2710760
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
@@ -0,0 +1,8 @@
+. "$PSScriptRoot\..\common\install-mingw.ps1"
+
+# This script will install MinGW 6.3.0
+
+$version = "6.3.0"
+$release = "release-posix-dwarf-rt_v5-rev2"
+
+InstallMinGW $version $release
diff --git a/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1
index ad3d5950..ad3d5950 100644
--- a/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1
diff --git a/coin/provisioning/qtci-windows-8-x86/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1
index 164fbe43..164fbe43 100644
--- a/coin/provisioning/qtci-windows-8-x86/python3.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1
diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1
index 6070c80b..6070c80b 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1
diff --git a/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1
index b0c21996..b0c21996 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/python3.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1