diff options
Diffstat (limited to 'coin/provisioning/common')
-rw-r--r-- | coin/provisioning/common/icu.ps1 | 89 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/linux/android_linux.sh (renamed from coin/provisioning/common/android_linux.sh) | 21 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/cmake_linux.sh (renamed from coin/provisioning/common/cmake_linux.sh) | 10 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/linux/disable_selinux.sh (renamed from coin/provisioning/common/disable_selinux.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/fbx_linux.sh (renamed from coin/provisioning/common/fbx_linux.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/integrity.sh (renamed from coin/provisioning/common/integrity.sh) | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/linux/openssl_for_android_linux.sh (renamed from coin/provisioning/common/openssl_for_android_linux.sh) | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/linux/qnx_700.sh (renamed from coin/provisioning/common/qnx_700.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/version.sh (renamed from coin/provisioning/common/version.sh) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh (renamed from coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh) | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/macos/InstallPKGFromURL.sh (renamed from coin/provisioning/common/InstallPKGFromURL.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/cmake.sh (renamed from coin/provisioning/common/cmake.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/fbx_macos.sh (renamed from coin/provisioning/common/fbx_macos.sh) | 6 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/homebrew.sh (renamed from coin/provisioning/common/homebrew.sh) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/macos/install-commandlinetools.sh (renamed from coin/provisioning/common/install-commandlinetools.sh) | 6 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/install_xcode.sh (renamed from coin/provisioning/common/install_xcode.sh) | 6 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/pip.sh (renamed from coin/provisioning/common/pip.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/python3.sh (renamed from coin/provisioning/common/python3.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/system_updates.sh (renamed from coin/provisioning/common/system_updates.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/virtualenv.sh (renamed from coin/provisioning/common/virtualenv.sh) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/ruby.ps1 | 7 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/unix/DownloadURL.sh (renamed from coin/provisioning/common/DownloadURL.sh) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh (renamed from coin/provisioning/common/InstallFromCompressedFileFromURL.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/unix/check_and_set_proxy.sh | 50 | ||||
-rw-r--r-- | coin/provisioning/common/unix/http_proxy.txt | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/unix/libclang.sh (renamed from coin/provisioning/common/libclang.sh) | 4 | ||||
-rw-r--r-- | coin/provisioning/common/unix/mqtt_broker.sh (renamed from coin/provisioning/common/mqtt_broker.sh) | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/unix/try_catch.sh (renamed from coin/provisioning/common/try_catch.sh) | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/03-conan.ps1 (renamed from coin/provisioning/common/03-conan.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/3dstudio_3rdparty.ps1 (renamed from coin/provisioning/common/3dstudio_3rdparty.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/allow-remote-desktop-access.ps1 (renamed from coin/provisioning/common/allow-remote-desktop-access.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/cmake.ps1 (renamed from coin/provisioning/common/cmake.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/disable-ntp.ps1 (renamed from coin/provisioning/common/disable-ntp.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/disable-sleep.ps1 (renamed from coin/provisioning/common/disable-sleep.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/disable-uac.ps1 (renamed from coin/provisioning/common/disable-uac.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/disable-windefender.ps1 (renamed from coin/provisioning/common/disable-windefender.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/disable-windows-updates.ps1 (renamed from coin/provisioning/common/disable-windows-updates.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/fbx_windows.ps1 (renamed from coin/provisioning/common/fbx_windows.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/helpers.ps1 (renamed from coin/provisioning/common/helpers.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/icu.ps1 | 45 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-dependencywalker.ps1 (renamed from coin/provisioning/common/install-dependencywalker.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-git.ps1 (renamed from coin/provisioning/common/install-git.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-jdk.ps1 (renamed from coin/provisioning/common/install-jdk.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-mingw.ps1 (renamed from coin/provisioning/common/install-mingw.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-notepad++.ps1 (renamed from coin/provisioning/common/install-notepad++.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-ruby.ps1 (renamed from coin/provisioning/common/install-ruby.ps1) | 16 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-sevenzip.ps1 (renamed from coin/provisioning/common/install-sevenzip.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-strawberry-perl.ps1 (renamed from coin/provisioning/common/install-strawberry-perl.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/jom.ps1 (renamed from coin/provisioning/common/jom.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/libclang.ps1 (renamed from coin/provisioning/common/libclang.ps1) | 4 | ||||
-rw-r--r-- | coin/provisioning/common/windows/libusb.ps1 (renamed from coin/provisioning/common/libusb.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/memorypershell.ps1 (renamed from coin/provisioning/common/memorypershell.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/mesa_llvmpipe.ps1 (renamed from coin/provisioning/common/mesa_llvmpipe.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/mqtt_broker.ps1 (renamed from coin/provisioning/common/mqtt_broker.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 (renamed from coin/provisioning/common/msvc_2015_update3_patch.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/mysql.ps1 (renamed from coin/provisioning/common/mysql.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/ninja.ps1 (renamed from coin/provisioning/common/ninja.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/openssl.ps1 (renamed from coin/provisioning/common/openssl.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/postgresql.ps1 (renamed from coin/provisioning/common/postgresql.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/python.ps1 (renamed from coin/provisioning/common/python.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/python3.ps1 (renamed from coin/provisioning/common/python3.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/set-network-test-server.ps1 (renamed from coin/provisioning/common/set-network-test-server.ps1) | 4 | ||||
-rw-r--r-- | coin/provisioning/common/windows/vc_redist.ps1 (renamed from coin/provisioning/common/vc_redist.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/vulkansdk.ps1 (renamed from coin/provisioning/common/vulkansdk.ps1) | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/winrtrunner.ps1 (renamed from coin/provisioning/common/winrtrunner.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/common/windows/wsearch-off.ps1 (renamed from coin/provisioning/common/wsearch-off.ps1) | 0 |
89 files changed, 176 insertions, 160 deletions
diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1 deleted file mode 100644 index 196ca5bc..00000000 --- a/coin/provisioning/common/icu.ps1 +++ /dev/null @@ -1,89 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################ - -. "$PSScriptRoot\helpers.ps1" - -# This script installs ICU. - -$version = "53_1" - -if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { - - $url_official_2012 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_64_devel.7z" - $url_cache_2012 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_64_devel.7z" - $sha1_2012 = "8A8C371F3ED58E81BBCF58CF5F8388CEF51FA9AC" - - $icuPackage_msvc2012_64 = "C:\Windows\Temp\icu-$version-msvc2012_64.7z" - - if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_64_devel\)) { - echo "Fetching from URL ..." - Download $url_official_2012 $url_cache_2012 $icuPackage_msvc2012_64 - Verify-Checksum $icuPackage_msvc2012_64 $sha1_2012 - Get-ChildItem $icuPackage_msvc2012_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_64_devel\""} - - echo "Cleaning $icuPackage_msvc2012_64..." - Remove-Item -Recurse -Force $icuPackage_msvc2012_64 - - echo "ICU MSVC2012 = $version" >> ~\versions.txt - } - -# FIXME: do we really want to have it per MSVC version? What about MSVC2015? -[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_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_2012_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_32_devel.7z" - $url_cache_2012_32 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_32_devel.7z" - $sha1_2012_32 = "F2FF287EEB0163B015D37AE08871165FBA87BCF0" - - $icuPackage_msvc2012_32 = "C:\Windows\Temp\icu-$version-msvc2012_32.7z" - - if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_32_devel\)) { - echo "Fetching from URL ..." - Download $url_official_2012_32 $url_cache_2012_32 $icuPackage_msvc2012_32 - Verify-Checksum $icuPackage_msvc2012_32 $sha1_2012_32 - Get-ChildItem $icuPackage_msvc2012_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_32_devel\""} - - echo "Cleaning $icuPackage_msvc2012_32..." - Remove-Item -Recurse -Force $icuPackage_msvc2012_32 - - echo "ICU MSVC2012 = $version" >> ~\versions.txt - } - -# FIXME: do we really want to have it per MSVC version? What about MSVC2015? -[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_32_devel\\icu53_1", "Machine") - -} diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index ee3008c1..b4a412c8 100644..100755 --- a/coin/provisioning/common/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,8 +37,9 @@ # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version -source "${BASH_SOURCE%/*}/../common/try_catch.sh" -source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh" targetFolder="/opt/android" sdkTargetFolder="$targetFolder/sdk" @@ -79,10 +80,20 @@ try rm "$toolsTargetFile" || throw $ExceptionRmTools echo "Changing ownership of Android files." - sudo chown -R qt:wheel "$targetFolder" + if uname -a |grep -q "el6\|el7"; then + sudo chown -R qt:wheel "$targetFolder" + else + sudo chown -R qt:users "$targetFolder" + fi echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager + if [ "$proxy" != "" ]; then + proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1) + proxy_port=$(echo $proxy | cut -d':' -f3) + echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager + else + echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager + fi echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 701d9081..27358a20 100755 --- a/coin/provisioning/common/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -38,7 +38,7 @@ # CMake is needed for autotests that verify that Qt can be built with CMake # shellcheck source=InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" version="3.6.2" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" @@ -50,4 +50,8 @@ appPrefix="cmake-$version-Linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +if uname -a |grep -q "Ubuntu"; then + echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.profile +else + echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +fi diff --git a/coin/provisioning/common/disable_selinux.sh b/coin/provisioning/common/linux/disable_selinux.sh index 30162166..30162166 100644..100755 --- a/coin/provisioning/common/disable_selinux.sh +++ b/coin/provisioning/common/linux/disable_selinux.sh diff --git a/coin/provisioning/common/fbx_linux.sh b/coin/provisioning/common/linux/fbx_linux.sh index 66d4793b..0b587aed 100755 --- a/coin/provisioning/common/fbx_linux.sh +++ b/coin/provisioning/common/linux/fbx_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -34,7 +34,7 @@ ############################################################################# # This script installs FBX SDK -source "${BASH_SOURCE%/*}/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" #s script installs FBX SDK set -e diff --git a/coin/provisioning/common/integrity.sh b/coin/provisioning/common/linux/integrity.sh index 6998866a..0c7234b3 100755 --- a/coin/provisioning/common/integrity.sh +++ b/coin/provisioning/common/linux/integrity.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -35,7 +35,7 @@ # This script installs INTEGRITY -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" version="11.4.4" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz" diff --git a/coin/provisioning/common/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 70684eaf..cda41d72 100644..100755 --- a/coin/provisioning/common/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## @@ -36,8 +36,8 @@ # This script install OpenSSL from sources. # Requires GCC and Perl to be in PATH. -source "${BASH_SOURCE%/*}/try_catch.sh" -source "${BASH_SOURCE%/*}/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" version="1.0.2g" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" diff --git a/coin/provisioning/common/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 74ce2948..4f7c4fb1 100644..100755 --- a/coin/provisioning/common/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/version.sh b/coin/provisioning/common/linux/version.sh index e7662e1e..ed24d805 100755 --- a/coin/provisioning/common/version.sh +++ b/coin/provisioning/common/linux/version.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh index 2af2db10..4d2ba1f8 100644..100755 --- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -38,9 +38,9 @@ # to /Applications/. This can be overridden by a target parameter. # shellcheck source=try_catch.sh -source "${BASH_SOURCE%/*}/try_catch.sh" +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" # shellcheck source=DownloadURL.sh -source "${BASH_SOURCE%/*}/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" ExceptionDownload=99 ExceptionCreateTmpFile=100 diff --git a/coin/provisioning/common/InstallPKGFromURL.sh b/coin/provisioning/common/macos/InstallPKGFromURL.sh index c00b646c..881086ba 100644..100755 --- a/coin/provisioning/common/InstallPKGFromURL.sh +++ b/coin/provisioning/common/macos/InstallPKGFromURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -34,7 +34,7 @@ ############################################################################# # shellcheck source=try_catch.sh -source "${BASH_SOURCE%/*}/try_catch.sh" +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" ExceptionCreateTmpFile=100 ExceptionDownloadPrimaryUrl=101 diff --git a/coin/provisioning/common/cmake.sh b/coin/provisioning/common/macos/cmake.sh index e10dd41d..c727c8ff 100755 --- a/coin/provisioning/common/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/fbx_macos.sh b/coin/provisioning/common/macos/fbx_macos.sh index 66a2d998..9dc97814 100755 --- a/coin/provisioning/common/fbx_macos.sh +++ b/coin/provisioning/common/macos/fbx_macos.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## ## Copyright (C) 2017 The Qt Company Ltd. @@ -34,8 +34,8 @@ # This script installs FBX SDK -# shellcheck source=./try_catch.sh -source "${BASH_SOURCE%/*}/try_catch.sh" +# shellcheck source=./../unix/try_catch.sh +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz" targetFolder="/opt/fbx" diff --git a/coin/provisioning/common/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index a6efe123..a6efe123 100755 --- a/coin/provisioning/common/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh diff --git a/coin/provisioning/common/install-commandlinetools.sh b/coin/provisioning/common/macos/install-commandlinetools.sh index f224d31d..d57e1d2f 100644..100755 --- a/coin/provisioning/common/install-commandlinetools.sh +++ b/coin/provisioning/common/macos/install-commandlinetools.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -32,8 +32,8 @@ ## $QT_END_LICENSE$ ## ############################################################################# -source "${BASH_SOURCE%/*}/DownloadURL.sh" -source "${BASH_SOURCE%/*}/try_catch.sh" +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" set -ex # Command line tools is need by homebrew diff --git a/coin/provisioning/common/install_xcode.sh b/coin/provisioning/common/macos/install_xcode.sh index c6f00ee7..1fe611b3 100755 --- a/coin/provisioning/common/install_xcode.sh +++ b/coin/provisioning/common/macos/install_xcode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -44,8 +44,8 @@ -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/try_catch.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../unix/try_catch.sh" function InstallXCode() { diff --git a/coin/provisioning/common/pip.sh b/coin/provisioning/common/macos/pip.sh index c9af5fbc..c9af5fbc 100755 --- a/coin/provisioning/common/pip.sh +++ b/coin/provisioning/common/macos/pip.sh diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/macos/python3.sh index 31591339..fc20aa2d 100755 --- a/coin/provisioning/common/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/system_updates.sh b/coin/provisioning/common/macos/system_updates.sh index 2dee2708..0736d740 100755 --- a/coin/provisioning/common/system_updates.sh +++ b/coin/provisioning/common/macos/system_updates.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/virtualenv.sh b/coin/provisioning/common/macos/virtualenv.sh index b6a9a796..b6a9a796 100755 --- a/coin/provisioning/common/virtualenv.sh +++ b/coin/provisioning/common/macos/virtualenv.sh diff --git a/coin/provisioning/common/ruby.ps1 b/coin/provisioning/common/ruby.ps1 deleted file mode 100644 index f7813c20..00000000 --- a/coin/provisioning/common/ruby.ps1 +++ /dev/null @@ -1,7 +0,0 @@ -. "$PSScriptRoot\helpers.ps1" - -$installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe" - -Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.intra.qt.io/input/ruby/rubyinstaller-2.3.1.exe $installer -Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36" -& $installer /DIR=C:\ruby /VERYSILENT diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index c60fae21..cb890e8a 100644..100755 --- a/coin/provisioning/common/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh index df84431a..fb77b714 100644..100755 --- a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/unix/check_and_set_proxy.sh b/coin/provisioning/common/unix/check_and_set_proxy.sh new file mode 100755 index 00000000..8dad878c --- /dev/null +++ b/coin/provisioning/common/unix/check_and_set_proxy.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash +############################################################################# +## +## 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. +## +## $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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/try_catch.sh" +source "${BASH_SOURCE%/*}/http_proxy.txt" + +try +( + wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io +) + +if [ $? -eq 0 ]; then + echo "Setting http_proxy to $proxy" + export http_proxy=$proxy + +else + echo "Proxy not detected at $proxy" +fi + diff --git a/coin/provisioning/common/unix/http_proxy.txt b/coin/provisioning/common/unix/http_proxy.txt new file mode 100644 index 00000000..3aa6ceba --- /dev/null +++ b/coin/provisioning/common/unix/http_proxy.txt @@ -0,0 +1,2 @@ +proxy="http://proxy.intra.qt.io:3128" + diff --git a/coin/provisioning/common/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 381127b1..69d9ff96 100755 --- a/coin/provisioning/common/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -40,8 +40,10 @@ # In case of Linux, we expect to get the values as args set -e +source "${BASH_SOURCE%/*}/check_and_set_proxy.sh" + BASEDIR=$(dirname "$0") -. $BASEDIR/sw_versions.txt +. $BASEDIR/../sw_versions.txt url=$1 sha1=$2 version=$3 diff --git a/coin/provisioning/common/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh index b52b78b1..c2fb2e30 100644 --- a/coin/provisioning/common/mqtt_broker.sh +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -35,8 +35,8 @@ # This script installs paho testing broker -# shellcheck source=../common/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" +# shellcheck source=./InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0" PrimaryUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" diff --git a/coin/provisioning/common/try_catch.sh b/coin/provisioning/common/unix/try_catch.sh index b21861e3..560d040d 100644..100755 --- a/coin/provisioning/common/try_catch.sh +++ b/coin/provisioning/common/unix/try_catch.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1 index 2c9d9f8d..2c9d9f8d 100644 --- a/coin/provisioning/common/03-conan.ps1 +++ b/coin/provisioning/common/windows/03-conan.ps1 diff --git a/coin/provisioning/common/3dstudio_3rdparty.ps1 b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 index f9c8faa7..f9c8faa7 100644 --- a/coin/provisioning/common/3dstudio_3rdparty.ps1 +++ b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 diff --git a/coin/provisioning/common/allow-remote-desktop-access.ps1 b/coin/provisioning/common/windows/allow-remote-desktop-access.ps1 index 06ea20a4..06ea20a4 100644 --- a/coin/provisioning/common/allow-remote-desktop-access.ps1 +++ b/coin/provisioning/common/windows/allow-remote-desktop-access.ps1 diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index d7e26556..d7e26556 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 diff --git a/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt index c61454b9..c61454b9 100644 --- a/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt index ada3d009..ada3d009 100644 --- a/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt index b7d5c80b..b7d5c80b 100644 --- a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt index 888563eb..888563eb 100644 --- a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt index 948bc2f1..948bc2f1 100644 --- a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt index e9b0ee71..e9b0ee71 100644 --- a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt index 905c0750..905c0750 100644 --- a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt index c5714a18..c5714a18 100644 --- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt index b68bca2b..b68bca2b 100644 --- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt index 54a81a2e..54a81a2e 100644 --- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt index 46e106f7..46e106f7 100644 --- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt index 5aded80c..5aded80c 100644 --- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt index e07078e6..e07078e6 100644 --- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt index 75b0084f..75b0084f 100644 --- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt index 73d392f3..73d392f3 100644 --- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt index ead7f1ca..ead7f1ca 100644 --- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt index de2aa3a0..de2aa3a0 100644 --- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt index 0820b583..0820b583 100644 --- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt index 22a7c428..22a7c428 100644 --- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt index 0501df3e..0501df3e 100644 --- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt index db328396..db328396 100644 --- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt index d7806e94..d7806e94 100644 --- a/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt diff --git a/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt index 88b5c152..88b5c152 100644 --- a/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt diff --git a/coin/provisioning/common/disable-ntp.ps1 b/coin/provisioning/common/windows/disable-ntp.ps1 index 4ec9d1bd..4ec9d1bd 100644 --- a/coin/provisioning/common/disable-ntp.ps1 +++ b/coin/provisioning/common/windows/disable-ntp.ps1 diff --git a/coin/provisioning/common/disable-sleep.ps1 b/coin/provisioning/common/windows/disable-sleep.ps1 index dda785ac..dda785ac 100644 --- a/coin/provisioning/common/disable-sleep.ps1 +++ b/coin/provisioning/common/windows/disable-sleep.ps1 diff --git a/coin/provisioning/common/disable-uac.ps1 b/coin/provisioning/common/windows/disable-uac.ps1 index 757c4a7e..757c4a7e 100644 --- a/coin/provisioning/common/disable-uac.ps1 +++ b/coin/provisioning/common/windows/disable-uac.ps1 diff --git a/coin/provisioning/common/disable-windefender.ps1 b/coin/provisioning/common/windows/disable-windefender.ps1 index 2d1f0783..2d1f0783 100644 --- a/coin/provisioning/common/disable-windefender.ps1 +++ b/coin/provisioning/common/windows/disable-windefender.ps1 diff --git a/coin/provisioning/common/disable-windows-updates.ps1 b/coin/provisioning/common/windows/disable-windows-updates.ps1 index 1a014733..1a014733 100644 --- a/coin/provisioning/common/disable-windows-updates.ps1 +++ b/coin/provisioning/common/windows/disable-windows-updates.ps1 diff --git a/coin/provisioning/common/fbx_windows.ps1 b/coin/provisioning/common/windows/fbx_windows.ps1 index 00de579d..00de579d 100644 --- a/coin/provisioning/common/fbx_windows.ps1 +++ b/coin/provisioning/common/windows/fbx_windows.ps1 diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index ff781b6c..ff781b6c 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 diff --git a/coin/provisioning/common/windows/icu.ps1 b/coin/provisioning/common/windows/icu.ps1 new file mode 100644 index 00000000..be0f7277 --- /dev/null +++ b/coin/provisioning/common/windows/icu.ps1 @@ -0,0 +1,45 @@ +############################################################################ +## +## 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$ +## +############################################################################ + +. "$PSScriptRoot\helpers.ps1" + +# This script installs ICU. + +$version = "53_1" + +if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { + +# 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") + +} diff --git a/coin/provisioning/common/install-dependencywalker.ps1 b/coin/provisioning/common/windows/install-dependencywalker.ps1 index ad89fc7b..3fc17052 100644 --- a/coin/provisioning/common/install-dependencywalker.ps1 +++ b/coin/provisioning/common/windows/install-dependencywalker.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install Dependency Walker 2.2.6000 diff --git a/coin/provisioning/common/install-git.ps1 b/coin/provisioning/common/windows/install-git.ps1 index 6b4a34b0..00700a22 100644 --- a/coin/provisioning/common/install-git.ps1 +++ b/coin/provisioning/common/windows/install-git.ps1 @@ -30,7 +30,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # Install Git version 2.13.0 diff --git a/coin/provisioning/common/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index e4260deb..f6cf6a66 100644 --- a/coin/provisioning/common/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install Java SE diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 index cabc906c..f3e96318 100644 --- a/coin/provisioning/common/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -31,7 +31,7 @@ ## ############################################################################ -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" function InstallMinGW { diff --git a/coin/provisioning/common/install-notepad++.ps1 b/coin/provisioning/common/windows/install-notepad++.ps1 index 2e893852..a6e20d5e 100644 --- a/coin/provisioning/common/install-notepad++.ps1 +++ b/coin/provisioning/common/windows/install-notepad++.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install Notepad++ diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/windows/install-ruby.ps1 index 57cf227f..3a9aa0d2 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/windows/install-ruby.ps1 @@ -31,30 +31,28 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install Ruby -$version = "2.2.6" +$version = "2.4.2-2" if( (is64bitWinHost) -eq 1 ) { $arch = "-x64" - $sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A" + $sha1 = "c961c2752a183487bc42ed24beb7e931230fa7d5" } else { - $arch = "" - $sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df" + $arch = "-x86" + $sha1 = "2639a481c3b5ad11f57d5523cc41ca884286089e" } $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe" -$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe" +$url_official = "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-" + $version + "/rubyinstaller-" + $version + $arch + ".exe" $rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe" Download $url_official $url_cache $rubyPackage Verify-Checksum $rubyPackage $sha1 -cmd /c "$rubyPackage /silent" +Start-Process -FilePath $rubyPackage -ArgumentList "/dir=C:\Ruby-$version$arch /tasks=modpath /verysilent" -Wait echo "Cleaning $rubyPackage.." Remove-Item -Recurse -Force "$rubyPackage" -Add-Path "C:\Ruby22-x64\bin" - echo "Ruby = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/install-sevenzip.ps1 b/coin/provisioning/common/windows/install-sevenzip.ps1 index 5f19543f..e7e73e9c 100644 --- a/coin/provisioning/common/install-sevenzip.ps1 +++ b/coin/provisioning/common/windows/install-sevenzip.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script installs 7-Zip diff --git a/coin/provisioning/common/install-strawberry-perl.ps1 b/coin/provisioning/common/windows/install-strawberry-perl.ps1 index bd5347b6..8b4a4a25 100644 --- a/coin/provisioning/common/install-strawberry-perl.ps1 +++ b/coin/provisioning/common/windows/install-strawberry-perl.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script installs Strawberry Perl diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/windows/jom.ps1 index c1e2cbf7..c1e2cbf7 100644 --- a/coin/provisioning/common/jom.ps1 +++ b/coin/provisioning/common/windows/jom.ps1 diff --git a/coin/provisioning/common/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 02a3974a..af041916 100644 --- a/coin/provisioning/common/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -1,12 +1,12 @@ param([Int32]$archVer=32) -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # 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\..\common\sw_versions.txt" | Foreach-Object { +Get-Content "$PSScriptRoot\..\sw_versions.txt" | Foreach-Object { $var = $_.Split('=') New-Variable -Name $var[0] -Value $var[1] $libclang_version = $libclang_version -replace '["."]' diff --git a/coin/provisioning/common/libusb.ps1 b/coin/provisioning/common/windows/libusb.ps1 index 38d8b8e6..38d8b8e6 100644 --- a/coin/provisioning/common/libusb.ps1 +++ b/coin/provisioning/common/windows/libusb.ps1 diff --git a/coin/provisioning/common/memorypershell.ps1 b/coin/provisioning/common/windows/memorypershell.ps1 index 2a8ebb68..2a8ebb68 100644 --- a/coin/provisioning/common/memorypershell.ps1 +++ b/coin/provisioning/common/windows/memorypershell.ps1 diff --git a/coin/provisioning/common/mesa_llvmpipe.ps1 b/coin/provisioning/common/windows/mesa_llvmpipe.ps1 index 82333034..4a468e10 100644 --- a/coin/provisioning/common/mesa_llvmpipe.ps1 +++ b/coin/provisioning/common/windows/mesa_llvmpipe.ps1 @@ -30,7 +30,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" $version = "11_2_2" $package = "C:\Windows\temp\opengl32sw.7z" diff --git a/coin/provisioning/common/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1 index 610f22d8..610f22d8 100644 --- a/coin/provisioning/common/mqtt_broker.ps1 +++ b/coin/provisioning/common/windows/mqtt_broker.ps1 diff --git a/coin/provisioning/common/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 index 02c5e61e..bab0f3a1 100644 --- a/coin/provisioning/common/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 @@ -30,7 +30,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # Install Cumulative Servicing Release Visual Studio 2015 update 3 # Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx diff --git a/coin/provisioning/common/mysql.ps1 b/coin/provisioning/common/windows/mysql.ps1 index 63088861..63088861 100644 --- a/coin/provisioning/common/mysql.ps1 +++ b/coin/provisioning/common/windows/mysql.ps1 diff --git a/coin/provisioning/common/ninja.ps1 b/coin/provisioning/common/windows/ninja.ps1 index 08bf2579..08bf2579 100644 --- a/coin/provisioning/common/ninja.ps1 +++ b/coin/provisioning/common/windows/ninja.ps1 diff --git a/coin/provisioning/common/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index df320c72..f8268492 100644 --- a/coin/provisioning/common/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script installs OpenSSL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/windows/postgresql.ps1 index ca47f078..ca47f078 100644 --- a/coin/provisioning/common/postgresql.ps1 +++ b/coin/provisioning/common/windows/postgresql.ps1 diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/windows/python.ps1 index c3eba2d8..c3eba2d8 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 diff --git a/coin/provisioning/common/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index 316b567a..316b567a 100644 --- a/coin/provisioning/common/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 diff --git a/coin/provisioning/common/set-network-test-server.ps1 b/coin/provisioning/common/windows/set-network-test-server.ps1 index 1a1f50b7..69059a2a 100644 --- a/coin/provisioning/common/set-network-test-server.ps1 +++ b/coin/provisioning/common/windows/set-network-test-server.ps1 @@ -31,11 +31,11 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will set the network test server IP in to hosts file -$n = Get-Content "$PSScriptRoot\network_test_server_ip.txt" +$n = Get-Content "$PSScriptRoot\..\network_test_server_ip.txt" $n = $n.Split('=') New-Variable -Name $n[0] -Value $n[1] diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/windows/vc_redist.ps1 index 4a8376b6..4a8376b6 100644 --- a/coin/provisioning/common/vc_redist.ps1 +++ b/coin/provisioning/common/windows/vc_redist.ps1 diff --git a/coin/provisioning/common/vulkansdk.ps1 b/coin/provisioning/common/windows/vulkansdk.ps1 index c572fa47..bade33ef 100644 --- a/coin/provisioning/common/vulkansdk.ps1 +++ b/coin/provisioning/common/windows/vulkansdk.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install Vulkan SDK diff --git a/coin/provisioning/common/winrtrunner.ps1 b/coin/provisioning/common/windows/winrtrunner.ps1 index f433ac7a..f433ac7a 100644 --- a/coin/provisioning/common/winrtrunner.ps1 +++ b/coin/provisioning/common/windows/winrtrunner.ps1 diff --git a/coin/provisioning/common/wsearch-off.ps1 b/coin/provisioning/common/windows/wsearch-off.ps1 index 09c45bbd..09c45bbd 100644 --- a/coin/provisioning/common/wsearch-off.ps1 +++ b/coin/provisioning/common/windows/wsearch-off.ps1 |