diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-16 23:14:25 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-16 23:14:25 +0100 |
commit | 062b29b311cc87f438d7a6d5d5b5bfb8142fb7df (patch) | |
tree | efd30f31dc86008734d902673309215377aedffe /coin | |
parent | 26fda37639ce3c062eba550c9d87dc367b2b1c0c (diff) | |
parent | 329d718a1910f7b8e53b9d2feea2dc7a64b54adb (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Iac3073d85bd94d27c296b307a827ee6bd97c4194
Diffstat (limited to 'coin')
27 files changed, 328 insertions, 78 deletions
diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 521191bb..b3dc74f7 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-7 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging 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 diff --git a/coin/provisioning/common/disable-ntp.ps1 b/coin/provisioning/common/disable-ntp.ps1 new file mode 100644 index 00000000..4ec9d1bd --- /dev/null +++ b/coin/provisioning/common/disable-ntp.ps1 @@ -0,0 +1,2 @@ +# Disable the NTP from syncing +w32tm /config /syncfromflags:NO diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/fbx_linux.sh index 50f12c89..66d4793b 100644..100755 --- a/coin/provisioning/common/install-java.ps1 +++ b/coin/provisioning/common/fbx_linux.sh @@ -1,4 +1,6 @@ -############################################################################ +#!/bin/bash + +############################################################################# ## ## Copyright (C) 2017 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ @@ -31,32 +33,30 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +# This script installs FBX SDK +source "${BASH_SOURCE%/*}/DownloadURL.sh" +#s script installs FBX SDK -# This script will install Java RE -# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only. +set -e +tarballName="fbx20161_2_fbxsdk_linux.tar.gz" +targetFolder="/opt/fbx" +cachedUrl="http://ci-files01-hki.intra.qt.io/input/fbx/$tarballName" +officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$tarballName" +sha1="b0a08778de025e2c6e90d6fbdb6531f74a3da605" +tmpFolder="/tmp" +targetFile="$tmpFolder/$tarballName" +installer="$tmpFolder/fbx20161_2_fbxsdk_linux" -$installdir = "C:\Program Files\Java\jre7" +DownloadURL "$cachedUrl" "$officialUrl" "$sha1" "$targetFile" -$version = "7u7" -if( (is64bitWinHost) -eq 1 ) { - $arch = "x64" - $sha1 = "9af03460c416931bdee18c2dcebff5db50cb8cb3" -} -else { - $arch = "i586" - $sha1 = "f76b1be20b144b1ee1d1de3255edb0a6b57d0219" -} +sudo tar -C $tmpFolder -xf "$targetFile" +sudo mkdir -p $targetFolder +(echo "yes"; echo "n") | sudo "$installer" -w "$tmpFolder" "$targetFolder" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-" + $arch + ".exe" -$javaPackage = "C:\Windows\Temp\java-$version.exe" +rm -rf "$targetFile" -Copy-Item $url_cache $javaPackage -cmd /c "$javaPackage /s SPONSORS=0" -echo "Cleaning $javaPackage.." -Remove-Item -Recurse -Force "$javaPackage" +# Set env variables +echo "export FBXSDK=$targetFolder" >> ~/.profile -[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine) -Add-Path "$installdir\bin" +echo "FBX SDK = 2016.1.2" >> ~/versions.txt -echo "Java = $version $arch" >> ~\versions.txt diff --git a/coin/provisioning/common/fbx_macos.sh b/coin/provisioning/common/fbx_macos.sh new file mode 100755 index 00000000..66a2d998 --- /dev/null +++ b/coin/provisioning/common/fbx_macos.sh @@ -0,0 +1,79 @@ +#!/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$ +## +############################################################################# + +# This script installs FBX SDK + +# shellcheck source=./try_catch.sh +source "${BASH_SOURCE%/*}/try_catch.sh" + +fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz" +targetFolder="/opt/fbx" +cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName" +officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$fileName" +sha1="f82535423c700c605320c52e13e781c92208ec6b" +targetFolder="/tmp" +targetFile="$targetFolder/$fileName" +installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg" + +ExceptionExtractPrimaryUrl=100 + +try +( + echo "Extracting '$cachedUrl'" + tar -xzf "$cachedUrl" -C "$targetFolder" || throw $ExceptionExtractPrimaryUrl +) +catch || { + case $ex_code in + $ExceptionExtractPrimaryUrl) + set -e + echo "Failed to uncompress from '$cachedUrl'" + echo "Downloading from '$officialUrl'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl" || exit 1; + echo "Checking SHA1 on PKG '$targetFile'" + echo "$sha1 *$targetFile" > $targetFile.sha1 + shasum --check $targetFile.sha1 + echo "Extracting '$targetFile'" + tar -xzf "$targetFile" -C "$targetFolder" || exit 1; + ;; + esac +} +set -e +rm -rf "$targetFile" +echo "Running installer for '$installer'" +sudo installer -pkg "$installer" -target "/" + +# Set env variables +echo "export FBXSDK=/Applications/Autodesk/FBX\ SDK/2016.1.2/" >> ~/.bashrc +echo "FBX SDK = 2016.1.2" >> ~/versions.txt + diff --git a/coin/provisioning/common/01-macos-removethemall.sh b/coin/provisioning/common/fbx_windows.ps1 index f0e26480..00de579d 100644 --- a/coin/provisioning/common/01-macos-removethemall.sh +++ b/coin/provisioning/common/fbx_windows.ps1 @@ -1,10 +1,9 @@ -#!/bin/sh -############################################################################# +############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## 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. +## This file is part of the provisioning scripts of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage @@ -32,18 +31,38 @@ ## ############################################################################# -function RemoveDir { - param=$1 - - if [ ! -d $param ] - then - echo "'$param' don't exists" - else - echo "Removing $param..." - sudo rm -fr $param - fi -} - -# Remove Android -param="/opt/android" -RemoveDir $param +. "$PSScriptRoot\helpers.ps1" + +# This script will install FBX SDK + +$version = "2016.1.2" + +$name = "fbx20161_2_fbxsdk_vs2015_win" +$packageName = "$name.7z" +$installerName = "$name.exe" +$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\fbx\$packageName" +$sha1 = "3690400625672bef6369bcf90dcde4d78b493b24" + +# The executable is an interactive installer only. We can't run it in a script silently. +# $officialUrl = "http://download.autodesk.com/us/fbx_release_older/2016.1.2/$installerName" +# This sha is for the executable +# $sha1 = "54f581c7c19cf5a08cf5e7bc62b8cc7f0617558e" + +#$targetFile = "C:\Windows\Temp\$packageName" +$targetFolder = "C:\Program Files\" + +#echo "Downloading '$installerName'" +#Download $officialUrl $cacheUrl $targetFile +#Verify-Checksum $targetFile $sha1 + +echo "Extracting '$cacheUrl'" +#Extract-7Zip $cacheUrl $targetFolder +Start-Process -FilePath "C:\Utils\sevenzip\7z.exe" -ArgumentList "x -y `"$cacheUrl`" -o`"$targetFolder`"" -Wait + +#Remove-Item -Recurse -Force "$packageName" + +echo "Adding environment variables." +[Environment]::SetEnvironmentVariable("FBXSDK", "$targetFolder\Autodesk\FBX\FBX SDK\2016.1.2", [EnvironmentVariableTarget]::Machine) + +echo "FBX SDK = $version" >> ~\versions.txt + 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 f07be55a..9b71f935 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 @@ -50,40 +50,42 @@ try 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 + yes | sudo aptdcon --hide-terminal --install git || throw $ExceptionAPT # 7zip is a needed decompressing tool - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install p7zip || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install p7zip || throw $ExceptionAPT # libssl-dev provides headers for OpenSSL - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libssl-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --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 + yes | sudo aptdcon --hide-terminal --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 + yes | sudo aptdcon --hide-terminal --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 + yes | sudo aptdcon --hide-terminal --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 + yes | sudo aptdcon --hide-terminal --install libglib2.0-dev || throw $ExceptionAPT # MySQL support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libmysqlclient-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libmysqlclient-dev || throw $ExceptionAPT # PostgreSQL support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libpq-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libpq-dev || throw $ExceptionAPT # SQLite support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libsqlite3-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install libsqlite3-dev || throw $ExceptionAPT # ODBC support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install unixodbc-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --install unixodbc-dev || throw $ExceptionAPT # Support for FreeType font engine - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libfreetype6-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --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 + yes | sudo aptdcon --hide-terminal --install libjpeg-dev || throw $ExceptionAPT # Enable support for printer driver - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libcups2-dev || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --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 + 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 # Support for cross-building to x86 (needed by WebEngine boot2qt builds) - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT + yes | sudo aptdcon --hide-terminal --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 + yes | sudo aptdcon --hide-terminal --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 ) catch || { case $ex_code in @@ -101,4 +103,3 @@ catch || { ;; esac } - 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 new file mode 100755 index 00000000..7c5fadcb --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/fbx_linux.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 new file mode 100644 index 00000000..50c6796b --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/fbx_macos.sh + diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh new file mode 100755 index 00000000..49e087a8 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh @@ -0,0 +1,138 @@ +#!/bin/sh + +############################################################################# +## +## 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$ +## +############################################################################# + +# Install tools for singing packages +# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed. + +set -ex + +cache="http://ci-files01-hki.intra.qt.io/input" +cacheSigningTools="$cache/mac/sign_tools" +targetFolder="/Users/qt" +keychains="$targetFolder/Library/Keychains" + +Install() { + + url=$1 + targetFile=$2 + expectedSha1=$3 + + echo "Fetching $targetFile from $url..." + curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile" + shasum "$targetFile" |grep "$expectedSha1" + +} + +# qt-license +sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d" +Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense + +# Login keychain +sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" +Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" +loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt") +loginKeychain=$keychains/login.keychain + +echo "Setting login.keychain as default keychain.." +security default-keychain -s $loginKeychain* +echo "Unlocking Login keychain with password.." +security unlock-keychain -p "$loginKeychainPassword" $loginKeychain* + +echo "remove the "Lock after X minutes of inactivity" from login.keychain" +security set-keychain-settings $loginKeychain + +# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer +sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64" +Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA +sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer" + +# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer +sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186" +Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA +sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer" + +# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain' +sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724" +unlockKeychain=$targetFolder/unlock-keychain.sh +Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain +sudo chmod 755 "$unlockKeychain" + +# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed. +shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910" +csreq=$targetFolder/csreq_qt_company.txt +Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq +chmod 755 "$csreq" + +# iOS signing tools +devIDKeychain="Developer_ID_TheQtCompany.keychain" +shaDevIdKeychain="0420a129c17725a97afd6fdafeb9cddfb80a65ca" +Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain +echo "Opening $devIDKeychain.." +open "$keychains/$devIDKeychain" + +sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" +Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" +DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt") + +echo "Unlocking $devIDKeychain with password.." +security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain +security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain + +sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" +Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios +iosPassword=$(<"$targetFolder/ios_password.txt") + +iPhoneDeveloper="iosdevelopment.p12" +shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c" +Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper +echo "Importing $iPhoneDeveloper.." +security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign + +iPhoneDistribution="iosdistribution.p12" +shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171" +Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution +echo "Importing $iPhoneDistribution.." +security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign + +# Mobileprovision +echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." +mkdir "$targetFolder/Library/MobileDevice" +mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" +shaMobileprovision="88c67c95a6f59e6463a00da0b5021f581db624bf" +Install "$cacheSigningTools/latest_ios_cert/iOS_Dev08112017.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision + +# Removing password files +rm -fr "$targetFolder/login_keychain_password.txt" + diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh deleted file mode 100644 index 6b56aac4..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -source "$BASEDIR/../common/01-macos-removethemall.sh" - diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh deleted file mode 100644 index ba8dbdd3..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index 30979954..a7ced8ae 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -13,8 +13,8 @@ libxml2:shared=True libxslt:shared=True [imports] -bin, icudt57.dll -> ./bin -bin, icuin57.dll -> ./bin -bin, icuuc57.dll -> ./bin +bin, icudt59.dll -> ./bin +bin, icuin59.dll -> ./bin +bin, icuuc59.dll -> ./bin bin, libxml2.dll -> ./bin bin, libxslt.dll -> ./bin 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 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 new file mode 100644 index 00000000..82cee080 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\fbx_windows.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 deleted file mode 100644 index 07c4f487..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\install-java.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 new file mode 100644 index 00000000..3b64ffec --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index 30979954..a7ced8ae 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -13,8 +13,8 @@ libxml2:shared=True libxslt:shared=True [imports] -bin, icudt57.dll -> ./bin -bin, icuin57.dll -> ./bin -bin, icuuc57.dll -> ./bin +bin, icudt59.dll -> ./bin +bin, icuin59.dll -> ./bin +bin, icuuc59.dll -> ./bin bin, libxml2.dll -> ./bin bin, libxslt.dll -> ./bin diff --git a/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.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 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 deleted file mode 100644 index 07c4f487..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\install-java.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 new file mode 100644 index 00000000..3b64ffec --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-jdk.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 new file mode 100644 index 00000000..1042c846 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 deleted file mode 100644 index 07c4f487..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\install-java.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 new file mode 100644 index 00000000..3b64ffec --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-jdk.ps1" |