diff options
Diffstat (limited to 'coin/provisioning/common')
-rwxr-xr-x | coin/provisioning/common/linux/qnx_700.sh | 8 | ||||
-rw-r--r-- | coin/provisioning/common/open62541.sh (renamed from coin/provisioning/common/windows/install-qnx660.ps1) | 29 | ||||
-rw-r--r-- | coin/provisioning/common/win10-enable-devmode.ps1 | 5 | ||||
-rw-r--r-- | coin/provisioning/common/windows/helpers.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/common/windows/icu.ps1 | 44 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-mingw.ps1 | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/libclang.ps1 | 24 | ||||
-rw-r--r-- | coin/provisioning/common/windows/patch_qnx.ps1 | 51 |
8 files changed, 48 insertions, 116 deletions
diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 73783468..4f7c4fb1 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -56,6 +56,12 @@ if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then fi rm -rf $targetFile + # Set env variables -echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc +if uname -a |grep -q "Ubuntu"; then + echo "export QNX_700=$targetFolder$folderName" >> ~/.profile +else + echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc +fi + echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-qnx660.ps1 b/coin/provisioning/common/open62541.sh index bf9c9d09..bde5b0de 100644 --- a/coin/provisioning/common/windows/install-qnx660.ps1 +++ b/coin/provisioning/common/open62541.sh @@ -1,9 +1,11 @@ -############################################################################ +#!/bin/env 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. +## This file is part of the test suite of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage @@ -31,16 +33,19 @@ ## ############################################################################# -. "$PSScriptRoot\helpers.ps1" - -# This script will install QNX 6.6.0 +TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" +trap "sudo rm -fr $TEMPDIR" EXIT +cd $TEMPDIR -$version = "6.6.0" -$nondottedversion = $version -replace '[.]','' -$targetFolder = "c:" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip" +pip install six -Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"} +git clone https://github.com/open62541/open62541.git open62541 +cd open62541 +git checkout 302003d2448946fa4d8a02cc209b8931d31e975b +mkdir build +cd build +cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib .. +make -[Environment]::SetEnvironmentVariable("QNX_660", "$targetFolder", "Machine") -echo "QNX = $version" >> ~\versions.txt +sudo make install +sudo /sbin/ldconfig diff --git a/coin/provisioning/common/win10-enable-devmode.ps1 b/coin/provisioning/common/win10-enable-devmode.ps1 new file mode 100644 index 00000000..022adc52 --- /dev/null +++ b/coin/provisioning/common/win10-enable-devmode.ps1 @@ -0,0 +1,5 @@ +# Turning on developer mode. +# +# In order to run auto tests for UWP, we have to enable developer mode on Windows 10 machines. +# https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development +REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /V AllowDevelopmentWithoutDevLicense /T REG_DWORD /D 1 /F diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index f6a9fd90..ff781b6c 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -116,6 +116,7 @@ function Add-Path $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine) + $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') } function is64bitWinHost diff --git a/coin/provisioning/common/windows/icu.ps1 b/coin/provisioning/common/windows/icu.ps1 index c08748d8..be0f7277 100644 --- a/coin/provisioning/common/windows/icu.ps1 +++ b/coin/provisioning/common/windows/icu.ps1 @@ -39,51 +39,7 @@ $version = "53_1" if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { - $url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z" - $url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z" - $sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F" - - $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z" - - if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) { - echo "Fetching from URL ..." - Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64 - Verify-Checksum $icuPackage_msvc2013_64 $sha1_2013 - Get-ChildItem $icuPackage_msvc2013_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_64_devel\""} - - echo "Cleaning $icuPackage_msvc2013_64..." - Remove-Item -Recurse -Force $icuPackage_msvc2013_64 - - echo "ICU MSVC2013 = $version" >> ~\versions.txt - } - -# FIXME: do we really want to have it per MSVC version? What about MSVC2015? -[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine") - # FIXME: do we really want to use the 4.8.2 ICU build? [Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine") -} else { - - $url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z" - $url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z" - $sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800" - - $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z" - - if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) { - echo "Fetching from URL ..." - Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32 - Verify-Checksum $icuPackage_msvc2013_32 $sha1_2013_32 - Get-ChildItem $icuPackage_msvc2013_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_32_devel\""} - - echo "Cleaning $icuPackage_msvc2013_32..." - Remove-Item -Recurse -Force $icuPackage_msvc2013_32 - - echo "ICU MSVC2013 = $version" >> ~\versions.txt - } - -# FIXME: do we really want to have it per MSVC version? What about MSVC2015? -[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine") - } diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 index 9609336e..f3e96318 100644 --- a/coin/provisioning/common/windows/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -58,7 +58,7 @@ function InstallMinGW Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} echo "Adding MinGW environment variable." - [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine) + [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw" + $win_arch.Substring($win_arch.get_Length()-2), [EnvironmentVariableTarget]::Machine) echo "Cleaning $mingwPackage.." Remove-Item -Recurse -Force "$mingwPackage" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 9d857051..af041916 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -4,29 +4,39 @@ param([Int32]$archVer=32) # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). # The Clang library (C-bindings), version 3.9 or higher is required for building. +# Starting from Qt 5.11 QDoc requires Clang to parse C++ + Get-Content "$PSScriptRoot\..\sw_versions.txt" | Foreach-Object { $var = $_.Split('=') New-Variable -Name $var[0] -Value $var[1] $libclang_version = $libclang_version -replace '["."]' } +$zip = "c:\users\qt\downloads\libclang.7z" +$baseDestination = "C:\Utils\libclang-" + $libclang_version if ( $archVer -eq 64 ) { $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0" $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_64.7z" -} else { - $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" - $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z" + $destination = $baseDestination + "-64" + + Download $url $url $zip + Verify-Checksum $zip $sha1 + + C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils\ + Rename-Item C:\Utils\libclang $destination + del $zip } -$zip = "c:\users\qt\downloads\libclang.7z" -$destination = "C:\Utils\libclang-" + $libclang_version +$sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" +$url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z" +$destination = $baseDestination + "-32" Download $url $url $zip Verify-Checksum $zip $sha1 C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils\ Rename-Item C:\Utils\libclang $destination - -[Environment]::SetEnvironmentVariable("LLVM_INSTALL_DIR", $destination, [EnvironmentVariableTarget]::Machine) del $zip + +[Environment]::SetEnvironmentVariable("LLVM_INSTALL_DIR", $baseDestination + "-_ARCH_", [EnvironmentVariableTarget]::Machine) echo "libClang = $libclang_version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/patch_qnx.ps1 b/coin/provisioning/common/windows/patch_qnx.ps1 deleted file mode 100644 index 632859a0..00000000 --- a/coin/provisioning/common/windows/patch_qnx.ps1 +++ /dev/null @@ -1,51 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite 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$ -## -############################################################################# - -# Patch QNX SDK due to issues in the standard library. -# The patches are available here: -# http://www.qnx.com/download/feature.html?programid=27555 -# A copy of the patch must be in the root of the Coin path in -# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip - - -. "$PSScriptRoot\helpers.ps1" - -$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip" -$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565" -$tempDir = "C:\temp\qnx_path" - -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip -Verify-Checksum $zip $sha1 -Extract-Zip $zip $tempDir -Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force -Remove-Item $tempDir -recurse |