diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-06 09:08:20 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-06 09:08:20 +0100 |
commit | 2a39f8e5fe113cf96b3b11848ead1bf4011f1966 (patch) | |
tree | 49b1305970567c66026a0531300f195ee55eeacd /coin/provisioning | |
parent | d3c2de907d299481c942f96ab84c627761dbb446 (diff) | |
parent | 89d4dec81886a5e2d1e7537195f8677146666c85 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250
Diffstat (limited to 'coin/provisioning')
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/DownloadURL.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/InstallFromCompressedFileFromURL.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/InstallPKGFromURL.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/android_linux.sh | 17 | ||||
-rwxr-xr-x | coin/provisioning/common/check_and_set_proxy.sh | 50 | ||||
-rwxr-xr-x | coin/provisioning/common/cmake.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/cmake_linux.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/disable_selinux.sh | 0 | ||||
-rwxr-xr-x | coin/provisioning/common/fbx_linux.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/fbx_macos.sh | 2 | ||||
-rw-r--r-- | coin/provisioning/common/http_proxy.txt | 2 | ||||
-rw-r--r-- | coin/provisioning/common/icu.ps1 | 36 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/install-commandlinetools.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/install_xcode.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/integrity.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/libclang.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/openssl_for_android_linux.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/python3.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/qnx_700.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/system_updates.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/common/try_catch.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/version.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh | 42 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh (renamed from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh) | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh (renamed from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh (renamed from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh (renamed from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh) | 9 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh | 38 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh) | 1 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh | 6 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh | 40 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh | 38 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh) | 21 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh) | 104 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh) | 0 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh) | 3 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh | 6 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh | 8 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh (renamed from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh) | 11 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh (renamed from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh (renamed from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh) | 3 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh (renamed from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh | 39 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh) | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh (renamed from coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh) | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh (renamed from coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh) | 3 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh) | 3 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh) | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh (renamed from coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh (renamed from coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh) | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh) | 3 | ||||
-rw-r--r-- | coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh (renamed from coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh) | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh) | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh) | 3 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh) | 3 | ||||
-rwxr-xr-x | coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh) | 2 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/msvc.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/08-python3.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/python3.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/10-icu.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/icu.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/60-jom.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/jom.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/cmake.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/libusb.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/msvc.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/python3.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/icu.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/jom.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/cmake.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 | 51 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/libusb.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/mysql.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/08-python3.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/25-python3.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/10-icu.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/12-icu.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/25-python.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 (renamed from coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86/06-python.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86/python3.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86/openssl.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86/icu.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86/cmake.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86/jom.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1) | 0 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 (renamed from coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1) | 0 |
167 files changed, 663 insertions, 147 deletions
diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh index c60fae21..cb890e8a 100644..100755 --- a/coin/provisioning/common/DownloadURL.sh +++ b/coin/provisioning/common/DownloadURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh index 2af2db10..bb7f772f 100644..100755 --- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh index df84431a..fb77b714 100644..100755 --- a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/InstallPKGFromURL.sh b/coin/provisioning/common/InstallPKGFromURL.sh index c00b646c..bf834e5d 100644..100755 --- a/coin/provisioning/common/InstallPKGFromURL.sh +++ b/coin/provisioning/common/InstallPKGFromURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/android_linux.sh index ee3008c1..c218ffe4 100644..100755 --- a/coin/provisioning/common/android_linux.sh +++ b/coin/provisioning/common/android_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -39,6 +39,7 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../common/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/check_and_set_proxy.sh b/coin/provisioning/common/check_and_set_proxy.sh new file mode 100755 index 00000000..8dad878c --- /dev/null +++ b/coin/provisioning/common/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/cmake.sh b/coin/provisioning/common/cmake.sh index e10dd41d..c727c8ff 100755 --- a/coin/provisioning/common/cmake.sh +++ b/coin/provisioning/common/cmake.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh index 701d9081..35313d3c 100755 --- a/coin/provisioning/common/cmake_linux.sh +++ b/coin/provisioning/common/cmake_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/disable_selinux.sh b/coin/provisioning/common/disable_selinux.sh index 30162166..30162166 100644..100755 --- a/coin/provisioning/common/disable_selinux.sh +++ b/coin/provisioning/common/disable_selinux.sh diff --git a/coin/provisioning/common/fbx_linux.sh b/coin/provisioning/common/fbx_linux.sh index 66d4793b..9827f9ab 100755 --- a/coin/provisioning/common/fbx_linux.sh +++ b/coin/provisioning/common/fbx_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/fbx_macos.sh b/coin/provisioning/common/fbx_macos.sh index 66a2d998..0f5e16a3 100755 --- a/coin/provisioning/common/fbx_macos.sh +++ b/coin/provisioning/common/fbx_macos.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## ## Copyright (C) 2017 The Qt Company Ltd. diff --git a/coin/provisioning/common/http_proxy.txt b/coin/provisioning/common/http_proxy.txt new file mode 100644 index 00000000..3aa6ceba --- /dev/null +++ b/coin/provisioning/common/http_proxy.txt @@ -0,0 +1,2 @@ +proxy="http://proxy.intra.qt.io:3128" + diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1 index 16dd8a6f..c08748d8 100644 --- a/coin/provisioning/common/icu.ps1 +++ b/coin/provisioning/common/icu.ps1 @@ -39,29 +39,12 @@ $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" - $url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z" $url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z" $sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F" - $icuPackage_msvc2012_64 = "C:\Windows\Temp\icu-$version-msvc2012_64.7z" $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_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 - } - if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) { echo "Fetching from URL ..." Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64 @@ -75,7 +58,6 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e } # 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") [Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine") # FIXME: do we really want to use the 4.8.2 ICU build? @@ -83,29 +65,12 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e } 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" - $url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z" $url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z" $sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800" - $icuPackage_msvc2012_32 = "C:\Windows\Temp\icu-$version-msvc2012_32.7z" $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_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 - } - if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) { echo "Fetching from URL ..." Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32 @@ -119,7 +84,6 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e } # 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") [Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine") } diff --git a/coin/provisioning/common/install-commandlinetools.sh b/coin/provisioning/common/install-commandlinetools.sh index f224d31d..876d0b9c 100644..100755 --- a/coin/provisioning/common/install-commandlinetools.sh +++ b/coin/provisioning/common/install-commandlinetools.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/install_xcode.sh b/coin/provisioning/common/install_xcode.sh index c6f00ee7..5d8009e3 100755 --- a/coin/provisioning/common/install_xcode.sh +++ b/coin/provisioning/common/install_xcode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/integrity.sh b/coin/provisioning/common/integrity.sh index 6998866a..6c96d9e0 100755 --- a/coin/provisioning/common/integrity.sh +++ b/coin/provisioning/common/integrity.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/libclang.sh b/coin/provisioning/common/libclang.sh index 381127b1..ea33d62d 100755 --- a/coin/provisioning/common/libclang.sh +++ b/coin/provisioning/common/libclang.sh @@ -40,6 +40,8 @@ # In case of Linux, we expect to get the values as args set -e +source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" + BASEDIR=$(dirname "$0") . $BASEDIR/sw_versions.txt url=$1 diff --git a/coin/provisioning/common/openssl_for_android_linux.sh b/coin/provisioning/common/openssl_for_android_linux.sh index 70684eaf..2ca38db9 100644..100755 --- a/coin/provisioning/common/openssl_for_android_linux.sh +++ b/coin/provisioning/common/openssl_for_android_linux.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/python3.sh index 31591339..fc20aa2d 100755 --- a/coin/provisioning/common/python3.sh +++ b/coin/provisioning/common/python3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/qnx_700.sh b/coin/provisioning/common/qnx_700.sh index 1f1c0f3f..73783468 100644..100755 --- a/coin/provisioning/common/qnx_700.sh +++ b/coin/provisioning/common/qnx_700.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/system_updates.sh b/coin/provisioning/common/system_updates.sh index 2dee2708..0736d740 100755 --- a/coin/provisioning/common/system_updates.sh +++ b/coin/provisioning/common/system_updates.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/try_catch.sh b/coin/provisioning/common/try_catch.sh index b21861e3..560d040d 100644..100755 --- a/coin/provisioning/common/try_catch.sh +++ b/coin/provisioning/common/try_catch.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/version.sh b/coin/provisioning/common/version.sh index e7662e1e..ed24d805 100755 --- a/coin/provisioning/common/version.sh +++ b/coin/provisioning/common/version.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..945d2e99 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $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$ +## +############################################################################# + +set -ex + +source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" + +if [ "$proxy" != "" ]; then + echo "proxy=$proxy" | sudo tee -a /etc/yum.conf +fi diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh index 852c1100..d3072b37 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh @@ -1,6 +1,10 @@ +#!/usr/bin/env bash # provides: fix for possible bug in the subscription manager # version: provided by RedHat # needed for yum to work properly in case there is incorrect data in # the sslclientkey repository parameter value + +set -ex + sudo rm -f /etc/pki/entitlement/* sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh index f6c90a75..c8edc2a2 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh @@ -1,4 +1,8 @@ +#!/usr/bin/env bash # provides: odbc devel packages on RHEL # version: provided by default Linux distribution repository # needed for configure -plugin-sql-odbc in qtbase + +set -ex + sudo yum install -y unixODBC-devel diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh index aa64a892..5248f86f 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") . $BASEDIR/../common/sw_versions.txt VERSION=$libclang_version diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh index 0003127a..552e7586 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -1,6 +1,10 @@ +#!/usr/bin/env bash # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside + +set -ex + sudo yum install -y python-devel python-virtualenv # install the EPEL repository which provides python3 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh index d7abd285..00b57918 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -1 +1,4 @@ +#!/usr/bin/env bash +set -ex + $(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh index 229e259f..b156e8f9 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh @@ -1,3 +1,6 @@ -#!/bin/env bash +#!/usr/bin/env bash # Required for tqtc-boot2qt/qdb + +set -ex + sudo yum install -y libusb1-devel diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh index 03a69edb..e4492eb0 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh index 27c7137b..6f998a60 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh index 5ef5f0e9..fb3e9642 100644..100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## @@ -36,6 +36,9 @@ # This script needs to be called last during provisioning so that the software information will show up last in provision log. # Storage installed RPM packages information + +set -ex + echo "*********************************************" >> ~/versions.txt echo "***** All installed RPM packages *****" >> ~/versions.txt rpm -q -a | sort >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh deleted file mode 100755 index 2697de04..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh index a76a8638..8b10ffd1 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -33,6 +33,8 @@ ## ############################################################################# +set -ex + # refresh local certificates sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh index 22bf19a3..52ac3d6c 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -33,10 +33,11 @@ ## ############################################################################# -set -e +set -ex BASEDIR=$(dirname "$0") source $BASEDIR/../common/network_test_server_ip.txt +source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts @@ -49,3 +50,7 @@ export DISPLAY=:0 gsettings set org.gnome.desktop.screensaver lock-enabled false # disable blank screen power saving gsettings set org.gnome.desktop.session idle-delay 0 + +if [ "$proxy" != "" ]; then + echo "proxy=$proxy" | sudo tee -a /etc/yum.conf +fi diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh new file mode 100755 index 00000000..8f080992 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $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$ +## +############################################################################# + +set -ex + +sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh index 439e2db5..f3b90756 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -33,6 +33,8 @@ ## ############################################################################# +set -ex + sudo yum-config-manager --enable rhel-server-rhscl7-rpms sudo yum -y install devtoolset-4 diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index a958adb6..23b80d89 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -33,7 +33,7 @@ ## ############################################################################# -set -e +set -ex installPackages=() installPackages+=(git) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh index 966f3045..bb97d390 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -32,6 +32,9 @@ ## $QT_END_LICENSE$ ## ############################################################################# + +set -ex + source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" name="p7zip" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh index abbda212..bf2e1ce9 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -ex BASEDIR=$(dirname "$0") . $BASEDIR/../common/sw_versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh index 46976e9a..7ce3d514 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -35,6 +35,8 @@ # This script installs CMake 3.6.2 +set -ex + # CMake is needed for autotests that verify that Qt can be built with CMake source "${BASH_SOURCE%/*}/../common/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh index 4a4031cc..c415db3a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -33,4 +33,6 @@ ## ############################################################################# +set -ex + source "${BASH_SOURCE%/*}/../common/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh index 56b1556d..4f3f4205 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -33,4 +33,6 @@ ## ############################################################################# +set -ex + source "${BASH_SOURCE%/*}/../common/integrity.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh index 6ae0f820..d5fe88c7 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -33,10 +33,10 @@ ## ############################################################################# -source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" - set -ex +source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" + packageEpel="epel-release-latest-7.noarch.rpm" OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel" CachedUrl="http://ci-files01-hki.intra.qt.io/input/redhat/$packageEpel" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh index 3eced1a4..b3cca8f9 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -33,4 +33,6 @@ ## ############################################################################# +set -ex + source "${BASH_SOURCE%/*}/../common/disable_selinux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh new file mode 100755 index 00000000..7ecc470d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $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 /opt/rh/devtoolset-4/enable + +set -ex + +source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh index 7c5fadcb..7e39935b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh @@ -1,4 +1,6 @@ -#!/bin/bash +#!/usr/bin/env bash + +set -ex BASEDIR=$(dirname "$0") $BASEDIR/../common/fbx_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh index 9447c43f..ed9d6679 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh new file mode 100755 index 00000000..19e41d46 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $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$ +## +############################################################################# + +set -ex + +source "${BASH_SOURCE%/*}/../common/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 2498e441..f245c90c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -36,7 +36,11 @@ # This script modifies system settings for automated use # shellcheck source=../common/try_catch.sh + +set -ex + source "${BASH_SOURCE%/*}/../common/try_catch.sh" +source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" NTS_IP=10.212.2.216 @@ -44,9 +48,12 @@ ExceptionGsettings1=100 ExceptionGsettings2=101 ExceptionGsettings3=102 ExceptionNTS=103 +ExceptionProxy=104 try ( + echo "Set timezone to UTC" || throw $ExceptionTimezone + sudo timedatectl set-timezone Etc/UTC echo "Timeout for blanking the screen (0 = never)" gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1 echo "Prevents screen lock when screesaver goes active." @@ -56,9 +63,17 @@ try echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS + + if [ "$proxy" != "" ]; then + echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy + fi ) catch || { case $ex_code in + $ExceptionTimezone) + echo "Failed to set timezone to UTC" + exit 1; + ;; $ExceptionGsettings1) echo "Failed to disable black screen." exit 1; @@ -75,6 +90,10 @@ catch || { echo "Failed to set network teset server address into /etc/hosts." exit 1; ;; + $ExceptionProxy) + echo "Failed to set proxy /etc/apt/apt.conf." + exit 1; + ;; esac } diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index 980da2ca..acf92779 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -35,6 +35,8 @@ # Install required packages with APT +set -ex + source "${BASH_SOURCE%/*}/../common/try_catch.sh" ExceptionAPTUpdate=100 @@ -49,47 +51,103 @@ try sudo systemctl stop $service sudo systemctl disable $service done - echo "Running update for apt" - sudo apt-get update - echo "Installing packages" # Git is not needed by builds themselves, but is nice to have # immediately as one starts debugging - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install git || throw $ExceptionAPT + installPackages+=(git) # 7zip is a needed decompressing tool - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install p7zip || throw $ExceptionAPT + installPackages+=(p7zip) # libssl-dev provides headers for OpenSSL - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libssl-dev || throw $ExceptionAPT + installPackages+=(libssl-dev) # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT + installPackages+=("^libxcb.*") + installPackages+=(libxkbcommon-dev) + installPackages+=(libxkbcommon-x11-dev) + installPackages+=(libx11-xcb-dev) + installPackages+=(libglu1-mesa-dev) + installPackages+=(libxrender-dev) + installPackages+=(libxi-dev) # Enable linking to system dbus - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libdbus-1-dev || throw $ExceptionAPT + installPackages+=(libdbus-1-dev) # Needed libraries for WebEngine - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT + installPackages+=(libudev-dev) + installPackages+=(libegl1-mesa-dev) + installPackages+=(libfontconfig1-dev) + installPackages+=(libxss-dev) # Common event loop handling - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libglib2.0-dev || throw $ExceptionAPT + installPackages+=(libglib2.0-dev) # MySQL support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libmysqlclient-dev || throw $ExceptionAPT + installPackages+=(libmysqlclient-dev) # PostgreSQL support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libpq-dev || throw $ExceptionAPT + installPackages+=(libpq-dev) # SQLite support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libsqlite3-dev || throw $ExceptionAPT + installPackages+=(libsqlite3-dev) # ODBC support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install unixodbc-dev || throw $ExceptionAPT + installPackages+=(unixodbc-dev) # Support for FreeType font engine - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libfreetype6-dev || throw $ExceptionAPT + installPackages+=(libfreetype6-dev) # Enable the usage of system jpeg libraries - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libjpeg-dev || throw $ExceptionAPT + installPackages+=(libjpeg-dev) # Enable support for printer driver - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libcups2-dev || throw $ExceptionAPT + installPackages+=(libcups2-dev) # Install libraries needed for QtMultimedia to be able to support all plugins - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT + installPackages+=(libasound2-dev) + installPackages+=(libgstreamer1.0-dev) + installPackages+=(libgstreamer-plugins-base1.0-dev) + installPackages+=(libgstreamer-plugins-good1.0-dev) + installPackages+=(libgstreamer-plugins-bad1.0-dev) # Support for cross-building to x86 (needed by WebEngine boot2qt builds) - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT + installPackages+=(g++-multilib) # python3 development package - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT + installPackages+=(python3-dev) + installPackages+=(python3-pip) + installPackages+=(python3-virtualenv) # Automates interactive applications (Needed by RTA to automate configure testing) - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install expect || throw $ExceptionAPT + installPackages+=(expect) + installPackages+=(mesa-common-dev) + installPackages+=(libgl1-mesa-glx) + installPackages+=(libgl1-mesa-dev) + installPackages+=(libegl1-mesa-dev) + installPackages+=(curl) + installPackages+=(libicu-dev) + installPackages+=(zlib1g-dev) + installPackages+=(zlib1g) + installPackages+=(openjdk-8-jdk) + installPackages+=(libgtk-3-dev) + installPackages+=(ninja-build) + installPackages+=(libssl-dev) + installPackages+=(libxcursor-dev) + installPackages+=(libxcomposite-dev) + installPackages+=(libxdamage-dev) + installPackages+=(libxrandr-dev) + installPackages+=(libfontconfig1-dev) + installPackages+=(libxss-dev) + installPackages+=(libsrtp0-dev) + installPackages+=(libwebp-dev) + installPackages+=(libjsoncpp-dev) + installPackages+=(libopus-dev) + installPackages+=(libminizip-dev) + installPackages+=(libavutil-dev) + installPackages+=(libavformat-dev) + installPackages+=(libavcodec-dev) + installPackages+=(libevent-dev) + installPackages+=(bison) + installPackages+=(flex) + installPackages+=(gperf) + installPackages+=(libasound2-dev) + installPackages+=(libpulse-dev) + installPackages+=(libxtst-dev) + installPackages+=(libnspr4-dev) + installPackages+=(libnss3-dev) + installPackages+=(libopenal-dev) + installPackages+=(libbluetooth-dev) + #VirtualBox for RTA + installPackages+=(virtualbox) + installPackages+=(dkms) + + echo "Running update for apt" + sudo apt-get update + echo "Installing packages" + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" || throw $ExceptionAPT ) catch || { case $ex_code in diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh index 74ef2b4e..74ef2b4e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh index ad4e25a9..dd6acd39 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -35,7 +35,7 @@ # This script installs the Yocto toolchain -set -e +set -ex source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh index b69295fc..af7d7c13 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh @@ -34,4 +34,7 @@ ############################################################################# source /opt/rh/devtoolset-4/enable + +set -ex + source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh new file mode 100755 index 00000000..7e39935b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/fbx_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh index 637c4224..5808a45c 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh @@ -33,4 +33,6 @@ ## ############################################################################# +set -ex + source "${BASH_SOURCE%/*}/../common/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh new file mode 100755 index 00000000..ddfc88a6 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/cmake_linux.sh + diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh deleted file mode 100755 index d8874561..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# provides: python development libraries -# version: provided by default Linux distribution repository -# needed to build pyside -sudo zypper -nq install python-devel python-virtualenv - -# install python3 -sudo zypper -nq install python3 python3-pip python3-virtualenv diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index 4b2f2546..eeb98b70 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -1,8 +1,10 @@ -#!/bin/bash -set -e +#!/usr/bin/env bash + +set -ex BASEDIR=$(dirname "$0") source $BASEDIR/../common/network_test_server_ip.txt +source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc @@ -11,3 +13,8 @@ echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | su echo "Set DISPLAY" echo 'export DISPLAY=":0"' >> ~/.bashrc +if [ "$proxy" != "" ]; then + sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy + sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy +fi + diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh index 8a8e9a43..cbdcbf64 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh @@ -1,5 +1,6 @@ -#!/bin/bash -set -e +#!/usr/bin/env bash + +set -ex sudo zypper -nq install git sudo zypper -nq install gcc7 diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh index abbda212..f0e0f19c 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") . $BASEDIR/../common/sw_versions.txt VERSION=$libclang_version diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh index a30a3fb4..e7cdd4a7 100644..100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -1,6 +1,10 @@ +#!/usr/bin/env bash # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside + +set -ex + sudo pkcon -y refresh sudo pkcon -y install python-devel python-virtualenv diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh index d10bc06d..f1f2d5bd 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh @@ -1,2 +1,5 @@ #!/usr/bin/env bash + +set -ex + $(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh index 15b46aef..b5f370ab 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,7 +37,7 @@ source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" -set -e +set -ex mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" localMount="/mnt/storage/" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh new file mode 100755 index 00000000..5ff78055 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $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$ +## +############################################################################# + +set -ex + +# Having proxy set while running autotests makes them fail +sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy + diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh index 0fbe7628..2c3e45f3 100644..100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh @@ -1,4 +1,6 @@ -#!/bin/sh +#!/usr/bin/env sh + +set -ex # Read .bashrc if exist printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh index 4a07bbbe..dceb3bcc 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -33,6 +33,8 @@ ## ############################################################################# +set -ex + # This script modified system settings for automated use # shellcheck source=../common/try_catch.sh @@ -126,4 +128,3 @@ catch || { ;; esac } - diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh index ba8dbdd3..8461c656 100644..100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh @@ -1,2 +1,5 @@ -#!/bin/sh +#!/usr/bin/env sh + +set -ex + defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh index 61406203..b68d62f8 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh @@ -1,3 +1,6 @@ -#!/bin/sh +#!/usr/bin/env sh + +set -ex + # Enables the usage of temporary keychains for SSL autotests echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh index ef676ab3..6f5faee0 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,6 +37,8 @@ # XZ-Utils are needed for uncompressing xz-compressed files +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh index 743cc9da..39719bb8 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -34,6 +34,9 @@ ############################################################################# # This script installs JDK + +set -ex + echo "Installing Java Development Kit" # shellcheck source=../common/try_catch.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh index 6d57bfaa..f879d756 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -42,6 +42,8 @@ # This will give you a file called "Content.part00.cpio.xz" that # can be renamed to Xcode_8.xz for this script. +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index b460cc02..9801e99c 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -32,6 +32,9 @@ ## $QT_END_LICENSE$ ## ############################################################################# + +set -ex + source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" version="8.3.2" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh index ddb01d64..3cdbd463 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh index 63ec9b69..9fb5d672 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/homebrew.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh index ca21f481..b37bb02d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,6 +37,8 @@ # MySQL is needed for Qt to be able to support MySQL +set -ex + # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh index 07c9a617..9e1df19a 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/pip.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh index cb5c1852..c9e9c842 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,6 +37,8 @@ # PostgreSQL is needed for Qt to be able to support PostgreSQL +set -ex + # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh index cd4e3fd9..b18e4923 100644..100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh @@ -1 +1,4 @@ +#!/usr/bin/env bash +set -ex + source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh index 4fb9ddbc..15511332 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash # Install 7z to be used from command line + +set -ex + brew update brew install p7zip diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh index 9e4f1d3e..8cdb7108 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/virtualenv.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh index d257ffa1..2a8a90c3 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default $BASEDIR/../common/libclang.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh index bc8a95e6..9c754dbf 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,6 +37,8 @@ # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh index 50c6796b..acefd8b7 100644..100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/fbx_macos.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index d109051d..503a4c07 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -35,6 +35,8 @@ # This script install OpenSSL +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" # shellcheck source=../common/InstallFromCompressedFileFromURL.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh index 49e087a8..e1a41835 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh index ba8dbdd3..8461c656 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh @@ -1,2 +1,5 @@ -#!/bin/sh +#!/usr/bin/env sh + +set -ex + defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh index b05dcf1c..a1ab3a92 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh index 44df94e7..e799344a 100644..100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh @@ -1,4 +1,6 @@ -#!/bin/sh +#!/usr/bin/env sh + +set -ex mkdir -p $HOME/Library/LaunchAgents cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh index 0fbe7628..2c3e45f3 100644..100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh @@ -1,4 +1,6 @@ -#!/bin/sh +#!/usr/bin/env sh + +set -ex # Read .bashrc if exist printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh index ddb01d64..3cdbd463 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh index d257ffa1..2a8a90c3 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default $BASEDIR/../common/libclang.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh index cd4e3fd9..b18e4923 100644..100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh @@ -1 +1,4 @@ +#!/usr/bin/env bash +set -ex + source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh index ba8dbdd3..8461c656 100644 --- a/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh @@ -1,2 +1,5 @@ -#!/bin/sh +#!/usr/bin/env sh + +set -ex + defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh index b05dcf1c..a1ab3a92 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh index 0fbe7628..2c3e45f3 100644..100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh @@ -1,4 +1,6 @@ -#!/bin/sh +#!/usr/bin/env sh + +set -ex # Read .bashrc if exist printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh index 5819e9de..0e39a958 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -35,6 +35,8 @@ # This script modified system settings for automated use +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" @@ -126,3 +128,4 @@ catch || { ;; esac } + diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh index 61406203..b68d62f8 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh @@ -1,3 +1,6 @@ -#!/bin/sh +#!/usr/bin/env sh + +set -ex + # Enables the usage of temporary keychains for SSL autotests echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh index 8a3999b9..314a0d24 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,6 +37,8 @@ # XZ-Utils are needed for uncompressing xz-compressed files +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh index 37acc2ee..779a525e 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -42,7 +42,7 @@ # This will give you a file called "Content.part00.cpio.xz" that # can be renamed to Xcode_8.xz for this script. - +set -ex # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh index 9145c12a..a8f7cca1 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -32,6 +32,9 @@ ## $QT_END_LICENSE$ ## ############################################################################# + +set -ex + source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" version="8.2" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh index ddb01d64..3cdbd463 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/cmake.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh index 63ec9b69..9fb5d672 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/homebrew.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh index 1e4de16a..17bb0df3 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,6 +37,8 @@ # MySQL is needed for Qt to be able to support MySQL +set -ex + # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh index a990829e..f71225f5 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,6 +37,8 @@ # PostgreSQL is needed for Qt to be able to support PostgreSQL +set -ex + # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh index cd4e3fd9..b18e4923 100644..100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh @@ -1 +1,4 @@ +#!/usr/bin/env bash +set -ex + source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh b/coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh index 4fb9ddbc..15511332 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash # Install 7z to be used from command line + +set -ex + brew update brew install p7zip diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh index d257ffa1..2a8a90c3 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default $BASEDIR/../common/libclang.sh diff --git a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 index f92acd91..f92acd91 100644 --- a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 index 1de57a66..1de57a66 100644 --- a/coin/provisioning/qtci-windows-10-x86/msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 index 167cfd35..167cfd35 100644 --- a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 index 164fbe43..164fbe43 100644 --- a/coin/provisioning/qtci-windows-10-x86/python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 index 325be36a..325be36a 100644 --- a/coin/provisioning/qtci-windows-10-x86/icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 index 37af7119..37af7119 100644 --- a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 index 842c65dd..842c65dd 100644 --- a/coin/provisioning/qtci-windows-10-x86/jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 index 8dbe0372..8dbe0372 100644 --- a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 index a853ffef..a853ffef 100644 --- a/coin/provisioning/qtci-windows-10-x86/libusb.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 index f92acd91..f92acd91 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 index ae3f327d..ae3f327d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 index c19bf6cd..c19bf6cd 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 index 1de57a66..1de57a66 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 index 167cfd35..167cfd35 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 index b0c21996..b0c21996 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 index f3906f78..f3906f78 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 index 325be36a..325be36a 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 index 37af7119..37af7119 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 index 82cee080..82cee080 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 index 39627626..39627626 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 index 41210dcb..41210dcb 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 index 842c65dd..842c65dd 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 index 8dbe0372..8dbe0372 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 index 3bc58072..3bc58072 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 index 1f26c731..1f26c731 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 new file mode 100644 index 00000000..4d09becf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 @@ -0,0 +1,51 @@ +############################################################################ +## +## 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\..\common\helpers.ps1" + +# This script will install VirtualBox + +$version = "5.2.4" +$sha1 = "71df4474a5e94918728b62d1f6bc036674ef0e96" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VirtualBox-" + $version + "-119785-Win.exe" +$url_official = "http://download.virtualbox.org/virtualbox/" + $version + "/VirtualBox-" + $version + "-119785-Win.exe" +$virtualboxPackage = "C:\Windows\Temp\virtualbox-$version.exe" + +Download $url_official $url_cache $virtualboxPackage +Verify-Checksum $virtualboxPackage $sha1 +Start-Process $virtualboxPackage -ArgumentList "--silent" -Wait + +echo "Cleaning $virtualboxPackage.." +Remove-Item -Recurse -Force "$virtualboxPackage" + +echo "VirtualBox = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 index a853ffef..a853ffef 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 index f6902153..f6902153 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 index c1d8e13e..c1d8e13e 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 index 882bd1de..882bd1de 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/25-python3.ps1 b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 index 164fbe43..164fbe43 100644 --- a/coin/provisioning/qtci-windows-7-x86/25-python3.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/12-icu.ps1 b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1 index 325be36a..325be36a 100644 --- a/coin/provisioning/qtci-windows-7-x86/12-icu.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/25-python.ps1 b/coin/provisioning/qtci-windows-7-x86/25-python.ps1 deleted file mode 100644 index 5f8aa2f8..00000000 --- a/coin/provisioning/qtci-windows-7-x86/25-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 index 41210dcb..41210dcb 100644 --- a/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 index 1f26c731..1f26c731 100644 --- a/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 deleted file mode 100644 index 41210dcb..00000000 --- a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 index 2303699c..2303699c 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 index 44c1c5ff..44c1c5ff 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 index c19bf6cd..c19bf6cd 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 index 164fbe43..164fbe43 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 index 8540c67d..8540c67d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 index f3906f78..f3906f78 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 index 16d2e180..16d2e180 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 index 325be36a..325be36a 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 index 8dbe0372..8dbe0372 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 index 842c65dd..842c65dd 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 index 1f26c731..1f26c731 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 index 2303699c..2303699c 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 index 44c1c5ff..44c1c5ff 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 index c19bf6cd..c19bf6cd 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 index 8540c67d..8540c67d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 index b0c21996..b0c21996 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 index f3906f78..f3906f78 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 index 16d2e180..16d2e180 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 index 325be36a..325be36a 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 index 8dbe0372..8dbe0372 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 index 842c65dd..842c65dd 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 index 1f26c731..1f26c731 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 |