diff options
author | Liang Qi <liang.qi@qt.io> | 2020-07-02 11:22:30 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-07-02 11:22:30 +0200 |
commit | 029cabb7292b4213bf28a6a8808a8ed38689a8d6 (patch) | |
tree | 94817fbd83cf43e6931effbbe62e85cbb9f8beda | |
parent | 67ff8eb9585406fbd781f746e2a00f91ff368301 (diff) | |
parent | 7143d018dc7f1cbe5b7bd3d5fb5a8dd50fe71589 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
Change-Id: I57f8a62c4f146cd1eda26885ce1507c072cb107f
6 files changed, 30 insertions, 20 deletions
diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 02cd57d3..f344c275 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -41,8 +41,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" -sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-linux.tar.xz" -sha1="a278234bf38cc70ead98fc0a8d2e63070fb69621" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz" +sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1" folderName="qnx700" targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh index 5a46049e..721b377f 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh @@ -37,7 +37,16 @@ set -ex sudo zypper -nq install elfutils binutils -sudo zypper -nq install git gcc gcc-c++ ninja make patch wget tar +sudo zypper addrepo --no-gpgcheck https://download.opensuse.org/repositories/devel:gcc/SLE-15/devel:gcc.repo +sudo zypper refresh +sudo zypper -nq install --force-resolution gcc10 gcc10-c++ + +sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 1 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-10 \ + --slave /usr/bin/cc cc /usr/bin/gcc-10 \ + --slave /usr/bin/c++ c++ /usr/bin/g++-10 + +sudo zypper -nq install git ninja make patch wget tar sudo zypper -nq install bison flex gperf \ zlib-devel \ diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh index 7ab8528a..2bf47639 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh @@ -43,12 +43,12 @@ set -ex mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" localMount="/mnt/storage/" -iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" +iccPackage="parallel_studio_xe_2020_update1_composer_edition_for_cpp.tgz" iccPackageSource="$localMount/intel/$iccPackage" iccInstallPath="/opt/intel" iccTmpPath="/tmp/icc" -iccLicense="l_icc_2018.lic" +iccLicense="l_icc_2020.lic" iccLicenseSource="$localMount/semisecure/$iccLicense" iccLicenseTarget="/home/qt/$iccLicense" @@ -63,24 +63,26 @@ cp "$iccLicenseSource" "$iccLicenseTarget" sudo umount "$localMount" +{ serialNumber=$(cat $iccLicenseTarget | grep -e "SerialNumber" | awk -F '[=]' '{print $2}'); } 2>/dev/null + cat >"$iccInstallInstructions" <<EOT ACCEPT_EULA=accept CONTINUE_WITH_OPTIONAL_ERROR=yes PSET_INSTALL_DIR=$iccInstallPath CONTINUE_WITH_INSTALLDIR_OVERWRITE=yes PSET_MODE=install -ACTIVATION_LICENSE_FILE=$iccLicenseTarget -ACTIVATION_TYPE=license_file -PHONEHOME_SEND_USAGE_DATA=no -ARCH_SELECTED=ALL -COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset +ACTIVATION_SERIAL_NUMBER=$serialNumber +ACTIVATION_TYPE=serial_number +INTEL_SW_IMPROVEMENT_PROGRAM_CONSENT=no +ARCH_SELECTED=INTEL64 +COMPONENTS=;intel-conda-index-tool__x86_64;intel-comp__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps__x86_64;intel-comp-ps-ss-bec__x86_64;intel-openmp__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-conda-icc_rt-linux-64-shadow-package__x86_64;intel-icc__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-doc__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icx__x86_64;intel-icx-common__noarch;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-conda-tbb-linux-64-shadow-package__x86_64;intel-conda-tbb-devel-linux-64-shadow-package__x86_64;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-compxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset EOT -(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu) +( cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu ) # Export LD_LIBRARY_PATH to Coin -echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc -echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc -echo "ICC = 18.0.1 20171018" >> ~/versions.txt +echo "export ICC64_19_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc +echo "export ICC64_19_PATH=$iccInstallPath/compilers_and_libraries_2020.1.217/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 19.1.1.217 20200306" >> ~/versions.txt rm -rf "$iccTmpPath" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh index d2905e9d..7552c5ad 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh @@ -36,7 +36,7 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-macos.tar.xz" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh index a5547972..570e67cb 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh @@ -36,13 +36,13 @@ # This script installs QNX 7. targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" folderName="qnx700" sudo mkdir -p "$targetFolder" echo "Extracting QNX 7" -sudo unzip -q "$sourceFile" -d "$targetFolder" +sudo tar -C "$targetFolder" -Jxf $sourceFile sudo chown -R qt:wheel "$targetFolder"/"$folderName" @@ -54,4 +54,3 @@ fi # Set env variables echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc echo "QNX SDP = 7.0.0" >> ~/versions.txt - diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index b7a5230c..49b71837 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,10 +36,10 @@ # This script installs QNX SDP 7.0 $zip = Get-DownloadLocation "qnx700.7z" -$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-windows.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-windows.7z" Download $url $url $zip -Verify-Checksum $zip "59c681466ff78f64b98b16a95b0b44650a729dfd" +Verify-Checksum $zip "1f10e9660efc81b18cb897871ba2b0384cf0fc6d" Extract-7Zip $zip C:\ Set-EnvironmentVariable "QNX_700" "C:\QNX700" |