diff options
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | coin/platform_configs/default.txt | 2 | ||||
| -rw-r--r-- | coin/platform_configs/tqtc-qt-rta.txt | 2 | ||||
| -rwxr-xr-x | coin/provisioning/common/linux/android_linux.sh | 6 | ||||
| -rwxr-xr-x | coin/provisioning/common/linux/qnx_700.sh | 2 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 | 1 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 1 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 | 1 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 | 1 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/60-jom.ps1 | 1 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/60-jom.ps1 | 1 |
11 files changed, 15 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index f1a6f8e8..26c3e3d8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -249,8 +249,8 @@ branch = dev status = essential [submodule "qtpurchasing"] - depends = qtbase qtandroidextras - recommends = qtdeclarative + depends = qtbase + recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git branch = dev diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 9ec6a406..a5dc5d4a 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,7 +12,7 @@ qtci-linux-Ubuntu-16.04-x86_64-2 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch 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 +qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo 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.11-x86_64-3 Clang Release NoFramework DisableTests diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt index 8143688f..8fbb5a00 100644 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ b/coin/platform_configs/tqtc-qt-rta.txt @@ -2,5 +2,5 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86-6 MSVC2017 Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 696f7d29..5679c4c6 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -95,3 +95,9 @@ echo "Android SDK tools = $toolsVersion" >> ~/versions.txt echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt echo "Android NDK = $ndkVersion" >> ~/versions.txt + +cd $sdkTargetFolder/tools/bin +echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" +echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-21;google_apis;x86" -c 2048M -f +# Purely informative, show the list of avd devices +./avdmanager list avd diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 584c91a8..b53c1d26 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -44,7 +44,7 @@ sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz" sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113" folderName="qnx700" targetFile="qnx700.tar.xz" -wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" +wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" echo "$sha1 $targetFile" | sha1sum --check if [ ! -d "$targetFolder" ]; then mkdir -p $targetFolder diff --git a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 index 3a351f41..a153e9d8 100644 --- a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 @@ -47,7 +47,6 @@ if (Test-Path $preparedPackage) { # The prepared package contains updated packages so that not everything has to be downloaded Write-Host "Using prepared package" Copy-Item -Recurse $preparedPackage $packagePath - exit 0 # Remove the whole downloaded folder $toRemove = $packagePath + "\vs14-kb3165756-update" $executable = "$toRemove\vs14-kb3165756.exe" 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 56ed138a..bf706eb2 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 @@ -90,7 +90,6 @@ installPackages+=(libxslt-devel) # For building Wayland from source installPackages+=(libffi-devel) -sudo yum -y update sudo yum -y install "${installPackages[@]}" # Make python 2.7 and its pip default diff --git a/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 new file mode 100644 index 00000000..a9044256 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 new file mode 100644 index 00000000..15065b55 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/60-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/60-jom.ps1 new file mode 100644 index 00000000..b246ce25 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/60-jom.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/60-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/60-jom.ps1 new file mode 100644 index 00000000..b246ce25 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/60-jom.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\jom.ps1" |