diff options
Diffstat (limited to 'coin/provisioning')
30 files changed, 223 insertions, 90 deletions
diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh index c26c9bf1..06fe8bf7 100755 --- a/coin/provisioning/common/linux/gcc.sh +++ b/coin/provisioning/common/linux/gcc.sh @@ -88,15 +88,15 @@ function InstallGCC() { # openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links if [ -f "/usr/sbin/update-alternatives" ]; then - sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" \ - --slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \ - --slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \ - --slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" + sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority" \ + --slave /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" \ + --slave /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" \ + --slave /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}" else - sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" - sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" "$priority" - sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" "$priority" - sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}" "$priority" fi echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf diff --git a/coin/provisioning/common/macos/libusb.sh b/coin/provisioning/common/macos/libusb.sh new file mode 100755 index 00000000..cf9e7150 --- /dev/null +++ b/coin/provisioning/common/macos/libusb.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 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 libusb +set -ex + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +brew install libusb +read -r -a arr <<< $(brew list --versions libusb) +version=${arr[1]} +echo "libusb = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/pkgconfig.sh b/coin/provisioning/common/macos/pkgconfig.sh new file mode 100755 index 00000000..9fad4912 --- /dev/null +++ b/coin/provisioning/common/macos/pkgconfig.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 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 pkgconfig +set -ex + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +brew install pkgconfig +read -r -a arr <<< $(brew list --versions pkgconfig) +version=${arr[1]} +echo "pkgconfig = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh index 34bcf289..8aaa0dc3 100755 --- a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh @@ -67,6 +67,9 @@ function InstallFromCompressedFileFromURL { "xz") tar -xf "$targetFile" --directory "$targetDirectory" ;; + "tbz2") + tar -xjf "$targetFile" --directory "$targetDirectory" + ;; *) exit 1 ;; diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index acb2483a..a2fda735 100755 --- a/coin/provisioning/common/unix/emsdk.sh +++ b/coin/provisioning/common/unix/emsdk.sh @@ -39,59 +39,55 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh" # shellcheck source=./DownloadURL.sh source "${BASH_SOURCE%/*}/DownloadURL.sh" -version="1.38.27" -version_node="8.9.1" -urlOfficial="https://s3.amazonaws.com/mozilla-games/emscripten/packages" +version="1.39.8" urlCache="http://ci-files01-hki.intra.qt.io/input/emsdk" targetFolder="/opt/emsdk" -urlEmscriptenCache="$urlCache/emscripten-$version.tar.gz" -urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" -sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161" +# cross-platform emscripten SDK +urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.tar.gz" +urlEmscriptenCache="$urlCache/emscripten.$version.tar.gz" +sha1Emscripten="a593ea3b4ab7e3d57e1232b19a903ccf8f137d2f" +# platform-specific toolchain and node binaries. urls obtained from "emsdk install" if uname -a |grep -q Darwin; then - urlEmscriptenLlvmCache="$urlCache/macos/emscripten-llvm-e$version.tar.gz" - urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/osx_64bit/emscripten-llvm-e$version.tar.gz" - urlNodeCache="$urlCache/macos/node-v$version_node-darwin-x64.tar.gz" - urlNodeExternal="$urlOfficial/node-v$version_node-darwin-x64.tar.gz" - sha1EmscriptenLlvm="66dffbc44cfcb7bcb1ed0d2658b519276c3077fa" - sha1Node="b9ec6fe9701d385e385886a4b171ba02bb6aead7" - node_js="$targetFolder/node-v$version_node-darwin-x64/bin" + urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2" + urlWasmBinariesCache="$urlCache/macos/wasm-binaries.$version.tbz2" + sha1WasmBinaries="aedb30fb07d565c35305af0920ab072ae743895d" + + urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-darwin-x64.tar.gz" + urlNodeBinariesCache="$urlCache/mac/node-v12.9.1-darwin-x64.tar.gz" + sha1NodeBinaries="f5976321ded091e70358e406b223f6fd64e35a43" + pathNodeExecutable='node-v12.9.1-darwin-x64/bin/node' else - urlEmscriptenLlvmCache="$urlCache/linux/emscripten-llvm-e$version.tar.gz" - urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" - urlNodeCache="$urlCache/linux/node-v$version_node-linux-x64.tar.xz" - urlNodeExternal="$urlOfficial/node-v$version_node-linux-x64.tar.xz" - sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb" - sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" - node_js="$targetFolder/node-v$version_node-linux-x64/bin" + urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2" + urlWasmBinariesCache="$urlCache/linux/wasm-binaries.$version.tbz2" + sha1WasmBinaries="eb7fc94aa79a6e215272e2586173515aa37c3141" + + urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-linux-x64.tar.xz" + urlNodeBinariesCache="$urlCache/linux/node-v12.9.1-linux-x64.tar.xz" + sha1NodeBinaries="cde96023b468d593c50de27470dd714c8cfda9aa" + pathNodeExecutable='node-v12.9.1-linux-x64/bin/node' fi sudo mkdir "$targetFolder" InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" "" -InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" "" -InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" "" +InstallFromCompressedFileFromURL "$urlWasmBinariesCache" "$urlWasmBinariesExternal" "$sha1WasmBinaries" "$targetFolder" "" +InstallFromCompressedFileFromURL "$urlNodeBinariesCache" "$urlNodeBinariesExternal" "$sha1NodeBinaries" "$targetFolder" "" sudo chmod -R a+rwx "$targetFolder" echo "Writing $targetFolder/.emscripten" cat <<EOM >"$targetFolder/.emscripten" -LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/' -EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer' -BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen' -NODE_JS='$node_js/node' EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version' -SPIDERMONKEY_ENGINE = '' -V8_ENGINE = '' +LLVM_ROOT='$targetFolder/install/bin' +BINARYEN_ROOT='$targetFolder/install' +NODE_JS='$targetFolder/$pathNodeExecutable' TEMP_DIR = '/tmp' -COMPILER_ENGINE = NODE_JS -JS_ENGINES = [NODE_JS] EOM -SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version\"" +SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\"" SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" echo "Emsdk = $version" >> ~/versions.txt -echo "Emsdk node = $version_node" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index c5984e26..e7e0de22 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -77,27 +77,20 @@ function Run-Conan-Install $manifestsDir = "$PSScriptRoot\conan_manifests" $buildinfoRoot = "C:\Utils\conanbuildinfos" + # Make up to 5 attempts for all download operations in conan + $env:CONAN_RETRY = "5" + Get-ChildItem -Path "$ConanfilesDir\*.txt" | ForEach-Object { $conanfile = $_.FullName $outpwd = "$buildinfoRoot\$BuildinfoDir\$($_.BaseName)" New-Item $outpwd -Type directory -Force | Out-Null - for ($i = 1; $i -le 5; $i++) { - try { - Push-Location $outpwd - Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", ` - '-s', ('compiler="' + $Compiler + '"'), ` - "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile" - break; - } catch { - if ($i -eq 5) { - throw "Could not install conan content" - } - } finally { - Pop-Location - } - } + Push-Location $outpwd + Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", ` + '-s', ('compiler="' + $Compiler + '"'), ` + "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile" + Pop-Location Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt" } diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1 index 2ce2754f..b3375d07 100755 --- a/coin/provisioning/common/windows/emsdk.ps1 +++ b/coin/provisioning/common/windows/emsdk.ps1 @@ -35,33 +35,38 @@ # This script will install emscripten needed by WebAssembly -$version = "1.38.27" -$versionNode = "8.9.1" -$versionWinPython = "2.7.13" +$version = "1.39.8" +$versionNode = "12.9.1" +$versionWinPython = "3.7.4" $versionJre = "8_update_152" -$urlOfficialMozilla = "https://s3.amazonaws.com/mozilla-games/emscripten/packages" +$urlEmscripten = "https://storage.googleapis.com/webassembly/emscripten-releases-builds" + +# cross-platform emscripten SDK +$urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.zip" $urlCache = "http://ci-files01-hki.intra.qt.io/input/emsdk" -$urlOfficialEmscriptenLlvm = "$urlOfficialMozilla/llvm/tag/win_64bit/emscripten-llvm-e$version.zip" -$urlCacheEmscriptenLlvm = "$urlCache/windows/emscripten-llvm-e$version.zip" -$sha1EmscriptenLlvm = "1cd950feec50f1f3265f04ab01fb270250eb4232" +$urlEmscriptenCache="$urlCache/emscripten.$version.zip" + +$urlWasmBinariesExternal="$urlEmscripten/win/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.zip" +$urlWasmBinariesCache="$urlCache\windows\wasm-binaries.$version.zip" +$sha1WasmBinaries="E94DCA7BA0526F88EDDBE45A0A0F61778D173603" -$urlOfficialNode = "$urlOfficialMozilla/node-v$versionNode-win-x64.zip" +$urlOfficialNode = "$urlEmscripten/deps/node-v$versionNode-win-x64.zip" $urlCacheNode = "$urlCache/windows/node-v$versionNode-win-x64.zip" -$sha1Node = "249c840f7b953e4cb7ac9db89aa92a98daa1dc63" +$sha1Node = "D064145694578D6617AA99C694772D21480B6B6D" -$urlOfficialWinPython = "$urlOfficialMozilla/WinPython-64bit-$versionWinPython.1Zero.zip" -$urlCacheWinPython = "$urlCache/windows/WinPython-64bit-$versionWinPython.1Zero.zip" -$sha1WinPython = "7e5a021878e0165ba0603e995b013e244d6e10cb" +$urlOfficialWinPython = "$urlEmscripten/deps/python-$versionWinPython-embed-amd64-patched.zip" +$urlCacheWinPython = "$urlCache/windows/python-$versionWinPython-embed-amd64-patched.zip" +$sha1WinPython = "27C5A465390167FC03F3DD9075E3FDAAD9FBE104" -$urlOfficialProtableJre = "$urlOfficialMozilla/portable_jre_${versionJre}_64bit.zip" +$urlOfficialProtableJre = "$urlEmscripten/deps/portable_jre_${versionJre}_64bit.zip" $urlCacheProtableJre = "$urlCache/windows/portable_jre_${versionJre}_64bit.zip" $sha1ProtableJre = "6830524ec8b16742f956897abb6b6f5ef890a1c2" $urlOfficialEmscripten = "https://github.com/kripken/emscripten/archive/$version.zip" $urlCacheEmscripten = "$urlCache/windows/emscripten-$version.zip" -$sha1Emscripten = "22d78a0af48b50271ab183fd3d8ea2f9ba311ee7" +$sha1Emscripten = "3721DC133824BA59CDBDFC93704D47CE265F2AFE" $installLocationEmsdk = "C:\\Utils\\emsdk" $temp = "C:\Windows\Temp" @@ -84,35 +89,33 @@ function Install { New-Item -ItemType directory -Force -Path "$installLocationEmsdk" -Install $urlOfficialEmscriptenLlvm $urlCacheEmscriptenLlvm $sha1EmscriptenLlvm "$temp\emscripten-llvm-e$version.zip" "$installLocationEmsdk\emscripten-llvm-e$version" +Install $urlWasmBinariesExternal $urlWasmBinariesCache $sha1WasmBinaries "$temp\wasm-binaries.$version.zip" "$installLocationEmsdk\emscripten-llvm-e$version" Install $urlOfficialNode $urlCacheNode $sha1Node "$temp\node-v$versionNode-win-x64.zip" "$installLocationEmsdk" -Install $urlOfficialWinPython $urlCacheWinPython $sha1WinPython "$temp\WinPython-64bit-$versionWinPython.1Zero.zip" "$installLocationEmsdk" +Install $urlOfficialWinPython $urlCacheWinPython $sha1WinPython "$temp\python-$versionWinPython-embed-amd64-patched.zip" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched" Install $urlOfficialProtableJre $urlCacheProtableJre $sha1ProtableJre "$temp\portable_jre_$versionJre_64bit.zip" "$installLocationEmsdk" Install $urlOfficialEmscripten $urlCacheEmscripten $sha1Emscripten "$temp\emscripten-$version.zip" "$installLocationEmsdk" cd $installLocationEmsdk -"LLVM_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version'" | Out-File '.emscripten' -Encoding ASCII -"EMSCRIPTEN_NATIVE_OPTIMIZER='$installLocationEmsdk\\emscripten-llvm-e$version\\optimizer'" | Out-File '.emscripten' -Append -Encoding ASCII -"BINARYEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\binaryen'" | Out-File '.emscripten' -Append -Encoding ASCII -"NODE_JS='$installLocationEmsdk\\node-v$versionNode-win-x64\\bin\\node'" | Out-File '.emscripten' -Append -Encoding ASCII -"EMSCRIPTEN_ROOT='$installLocationEmsdk\emscripten-$version'" | Out-File '.emscripten' -Append -Encoding ASCII -"SPIDERMONKEY_ENGINE = ''" | Out-File '.emscripten' -Append -Encoding ASCII -"V8_ENGINE = ''" | Out-File '.emscripten' -Append -Encoding ASCII +"LLVM_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\bin'" | Out-File '.emscripten' -Encoding ASCII +"BINARYEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install'" | Out-File '.emscripten' -Append -Encoding ASCII +"PYTHON='$installLocationEmsdk\\python-$versionWinPython-embed-amd64-patched\\python.exe'" | Out-File '.emscripten' -Append -Encoding ASCII +"NODE_JS='$installLocationEmsdk\\node-v$versionNode-win-x64\\bin\\node.exe'" | Out-File '.emscripten' -Append -Encoding ASCII +"EMSCRIPTEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\emscripten'" | Out-File '.emscripten' -Append -Encoding ASCII +"JAVA='$installLocationEmsdk\\Java64'" | Out-File '.emscripten' -Append -Encoding ASCII "TEMP_DIR = '/tmp'" | Out-File '.emscripten' -Append -Encoding ASCII "COMPILER_ENGINE = NODE_JS" | Out-File '.emscripten' -Append -Encoding ASCII "JS_ENGINES = [NODE_JS]" | Out-File '.emscripten' -Append -Encoding ASCII Set-EnvironmentVariable "EMSDK" "$installLocationEmsdk" Set-EnvironmentVariable "EM_CONFIG" "$installLocationEmsdk\.emscripten" -Set-EnvironmentVariable "EMSDK_LLVM_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version" -Set-EnvironmentVariable "EMSCRIPTEN_NATIVE_OPTIMIZER" "$installLocationEmsdk\emscripten-llvm-e$version\optimizer.exe" -Set-EnvironmentVariable "BINARYEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\binaryen" +Set-EnvironmentVariable "EMSDK_LLVM_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\bin" +Set-EnvironmentVariable "BINARYEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\" Set-EnvironmentVariable "EMSDK_NODE" "$installLocationEmsdk\node$versionNode-win-x64\bin\node.exe" -Set-EnvironmentVariable "EMSDK_PYTHON" "$installLocationEmsdk\WinPython-64bit-$versionWinPython.1Zero\python-$versionWinPython.amd64\python.exe" +Set-EnvironmentVariable "EMSDK_PYTHON" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched\python.exe" Set-EnvironmentVariable "EMSDK_JAVA_HOME" "$installLocationEmsdk\java64" Set-EnvironmentVariable "EMSCRIPTEN" "$installLocationEmsdk\emscripten-$version" -Set-EnvironmentVariable "EMSCRIPTEN_ROOT" "$installLocationEmsdk\emscripten-$version" -Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-$version;$installLocationEmsdk;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version;$installLocationEmsdk\WinPython-64bit-$versionWinPython.1Zero\python-$versionWinPython.amd64;$installLocationEmsdk\java64\bin" +Set-EnvironmentVariable "EMSCRIPTEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten" +Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version\install\bin;$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched;$installLocationEmsdk\java64\bin" Write-Output "emsdk = $version" >> ~/versions.txt Write-Output "emsdk llvm = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 0c4a9680..b26df151 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -61,8 +61,13 @@ Extract-tar_gz $PackagePath $TargetLocation $msys = "$TargetLocation\$folder\msys2_shell.cmd" # install perl -Run-Executable "$msys" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" -Run-Executable "$msys" "`"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" +# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file. +cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" +Start-Sleep -s 30 +cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" + +if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } +if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } Write-Host "Cleaning $PackagePath.." Remove-Item -Recurse -Force -Path "$PackagePath" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 50eea33b..639c82fd 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -169,6 +169,8 @@ installPackages+=(git-lfs) installPackages+=(chrpath) installPackages+=(gawk) installPackages+=(texinfo) +# Needed for Poppler test in QtWebEngine +installPackages+=(libpoppler-cpp-dev) # Needed for qtwebkit installPackages+=(ruby) installPackages+=(libxslt1-dev) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh index 947583da..6c6a90c8 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -5,4 +5,4 @@ set -ex # shellcheck source=../common/linux/gcc.sh source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" -InstallGCC 9.1.0 50 3953fa0d34a467630088d2a43603f74a36a80468 ded538076858926d361af790d59c1f8440dd29b2 +InstallGCC 9.2.0 50 2b3873263d4d6b09b37102078d80dcd7016b9392 44975966b15bca922ba64efa8ec3257726a79153 diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh index 729f9003..729f9003 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-install_telegraf.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh index d3724ceb..d3724ceb 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh index 38707a8a..38707a8a 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-disable-ntp.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh index d1f3050f..d1f3050f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh index bbe2b4b4..bbe2b4b4 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh index 12dabace..ab966a02 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/08-pythondev.sh @@ -5,7 +5,7 @@ set -ex -sudo zypper -nq install python-devel python-virtualenv +sudo zypper -nq install python-devel python-xml # install python3 sudo zypper -nq install python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh index 5eb53566..5eb53566 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-install-openssl.sh index 4f1d3768..4f1d3768 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-install-openssl.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-install-openssl.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh index 7ab8528a..7ab8528a 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/18-icc.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh index e677427f..e677427f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh index 44cf1b80..44cf1b80 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/55-emsdk.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh index e4281588..e4281588 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh index 5ff78055..5ff78055 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-unset-proxy.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh index 03565da2..03565da2 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/99-version.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-pkgconfig.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-pkgconfig.sh new file mode 100755 index 00000000..9362a345 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-pkgconfig.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Install pkgconfig + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/pkgconfig.sh" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh b/coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh new file mode 100755 index 00000000..acc7ad4f --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/27-libusb.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Install libusb + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/libusb.sh" diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 deleted file mode 100644 index 1dc08d21..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 new file mode 100644 index 00000000..fa8edb85 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install MinGW 8.1.0 + +$release = "i686-8.1.0-release-posix-dwarf-rt_v6-rev0" +$sha1 = "dd4f34f473e84c79b6b446adb3a5fac7919ba9cb" +$suffix = "_i686" + +InstallMinGW $release $sha1 $suffix + + diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 new file mode 100644 index 00000000..b712c2b3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install 64-bit MinGW 8.1.0 + +$release = "x86_64-8.1.0-release-posix-seh-rt_v6-rev0" + +$sha1 = "5aa456654a6ce77249c27888b5d0f856fc011b9c" + +InstallMinGW $release $sha1 + diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1 new file mode 100644 index 00000000..fa8edb85 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install MinGW 8.1.0 + +$release = "i686-8.1.0-release-posix-dwarf-rt_v6-rev0" +$sha1 = "dd4f34f473e84c79b6b446adb3a5fac7919ba9cb" +$suffix = "_i686" + +InstallMinGW $release $sha1 $suffix + + |