Split Common folder based on operating system families

This change will split common folder to four different folders:
Linux, Unix, Windows and MacOS. Each of these folders includes scripts
which are common for their operating system familes

Task-number: QTQAINFRA-1451
Change-Id: I0668885da43222663a54521ce85653da697425be
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
Heikki Halmet
2017-09-21 12:50:58 +03:00
committed by Tony Sarajärvi
parent 8c657080f6
commit b2efef4875
186 changed files with 172 additions and 173 deletions

View File

@@ -30,7 +30,7 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
# This script will install Visual Studio 2017 Build Tools
# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017

View File

@@ -30,7 +30,7 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
# Install Visual Studio $version with $update_version
# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs

View File

@@ -31,7 +31,7 @@
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
# This script will install Visual Studio 2017

View File

@@ -30,7 +30,7 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
# This script will install Visual Studio 2017 Build Tools
# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017

View File

@@ -30,7 +30,7 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
# Install Visual Studio $version with $update_version
# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs

View File

@@ -31,7 +31,7 @@
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
# This script will install Visual Studio 2017

View File

@@ -37,8 +37,8 @@
# CMake is needed for autotests that verify that Qt can be built with CMake
# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
version="3.6.2"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"

View File

@@ -37,10 +37,10 @@
# uncompresses it and installs it by default
# to /Applications/. This can be overridden by a target parameter.
# shellcheck source=try_catch.sh
source "${BASH_SOURCE%/*}/try_catch.sh"
# shellcheck source=DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
# shellcheck source=../unix/try_catch.sh
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
ExceptionDownload=99
ExceptionCreateTmpFile=100

View File

@@ -33,8 +33,8 @@
##
#############################################################################
# shellcheck source=try_catch.sh
source "${BASH_SOURCE%/*}/try_catch.sh"
# shellcheck source=../unix/try_catch.sh
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
ExceptionCreateTmpFile=100
ExceptionDownloadPrimaryUrl=101

View File

@@ -32,8 +32,8 @@
## $QT_END_LICENSE$
##
#############################################################################
source "${BASH_SOURCE%/*}/DownloadURL.sh"
source "${BASH_SOURCE%/*}/try_catch.sh"
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
set -ex
# Command line tools is need by Homebrew

View File

@@ -44,8 +44,8 @@
# shellcheck source=../common/try_catch.sh
source "${BASH_SOURCE%/*}/try_catch.sh"
# shellcheck source=../unix/try_catch.sh
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
function InstallXCode()
{

View File

@@ -31,7 +31,7 @@
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\helpers.ps1"
# This script will install Dependency Walker 2.2.6000

View File

@@ -30,7 +30,7 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\helpers.ps1"
# Install Git version 2.13.0

View File

@@ -31,7 +31,7 @@
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\helpers.ps1"
# This script will install Java RE
# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only.

View File

@@ -31,7 +31,7 @@
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\helpers.ps1"
# This script will install Notepad++

View File

@@ -31,7 +31,7 @@
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\helpers.ps1"
# This script will install Ruby

View File

@@ -31,7 +31,7 @@
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\helpers.ps1"
# This script installs 7-Zip

View File

@@ -31,7 +31,7 @@
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\helpers.ps1"
# This script installs Strawberry Perl

View File

@@ -30,7 +30,7 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\helpers.ps1"
$version = "11_2_2"
$package = "C:\Windows\temp\opengl32sw.7z"

View File

@@ -30,7 +30,7 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\helpers.ps1"
# Install Cumulative Servicing Release Visual Studio 2015 update 3
# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx

View File

@@ -31,7 +31,7 @@
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\helpers.ps1"
# This script installs OpenSSL $version.
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine

View File

@@ -31,7 +31,7 @@
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
. "$PSScriptRoot\helpers.ps1"
# This script will set the network test server IP in to hosts file

View File

@@ -1 +1 @@
$(dirname $0)/../common/cmake_linux.sh
$(dirname $0)/../common/linux/cmake_linux.sh

View File

@@ -41,4 +41,4 @@ echo "***** All installed RPM packages *****" >> ~/versions.txt
rpm -q -a | sort >> ~/versions.txt
echo "*********************************************" >> ~/versions.txt
$(dirname $0)/../common/version.sh
$(dirname $0)/../common/linux/version.sh

View File

@@ -1 +1 @@
$(dirname $0)/../common/cmake_linux.sh
$(dirname $0)/../common/linux/cmake_linux.sh

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/system_updates.sh
$BASEDIR/../common/macos/system_updates.sh

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
source "$BASEDIR/../common/01-macos-removethemall.sh"
source "$BASEDIR/../common/macos/01-macos-removethemall.sh"

View File

@@ -1 +1 @@
source "${BASH_SOURCE%/*}/../common/python3.sh"
source "${BASH_SOURCE%/*}/../common/macos/python3.sh"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/system_updates.sh
$BASEDIR/../common/macos/system_updates.sh

View File

@@ -35,8 +35,8 @@
# This script modified system settings for automated use
# shellcheck source=../common/try_catch.sh
source "${BASH_SOURCE%/*}/../common/try_catch.sh"
# shellcheck source=../common/unix/try_catch.sh
source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
VNCPassword=qt
NTS_IP=10.212.2.216

View File

@@ -37,8 +37,8 @@
# XZ-Utils are needed for uncompressing xz-compressed files
# shellcheck source=../common/try_catch.sh
source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"
# shellcheck source=../common/macos/InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/XZ.pkg"
AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg"

View File

@@ -36,8 +36,8 @@
# This script installs JDK
echo "Installing Java Development Kit"
# shellcheck source=../common/try_catch.sh
source "${BASH_SOURCE%/*}/../common/try_catch.sh"
# shellcheck source=../common/unix/try_catch.sh
source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
ExceptionDownloadPrimaryUrl=100
ExceptionDownloadAltUrl=101

View File

@@ -44,10 +44,10 @@
# shellcheck source=../common/try_catch.sh
source "${BASH_SOURCE%/*}/../common/try_catch.sh"
# shellcheck source=../common/unix/try_catch.sh
source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
# shellcheck source=../common/install_xcode.sh
source "${BASH_SOURCE%/*}/../common/install_xcode.sh"
# shellcheck source=../common/macos/install_xcode.sh
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.2.xz 8.2

View File

@@ -32,7 +32,7 @@
## $QT_END_LICENSE$
##
#############################################################################
source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh"
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
version="8.2"
packageName="Command_Line_Tools_macOS_10.11_for_Xcode_$version.dmg"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/cmake.sh
$BASEDIR/../common/macos/cmake.sh

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/homebrew.sh
$BASEDIR/../common/macos/homebrew.sh

View File

@@ -37,8 +37,8 @@
# MySQL is needed for Qt to be able to support MySQL
# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz"
AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz"

View File

@@ -37,8 +37,8 @@
# PostgreSQL is needed for Qt to be able to support PostgreSQL
# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip"
AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip"

View File

@@ -1 +1 @@
source "${BASH_SOURCE%/*}/../common/python3.sh"
source "${BASH_SOURCE%/*}/../common/macos/python3.sh"

View File

@@ -3,4 +3,4 @@
BASEDIR=$(dirname "$0")
# There is only one mac package and common script uses it as a default
$BASEDIR/../common/libclang.sh
$BASEDIR/../common/unix/libclang.sh

View File

@@ -35,10 +35,10 @@
# This script install OpenSSL
# shellcheck source=../common/try_catch.sh
source "${BASH_SOURCE%/*}/../common/try_catch.sh"
# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../common/unix/try_catch.sh
source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh"
opensslVersion="1.0.2k"
opensslFile="openssl-$opensslVersion.tar.gz"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/system_updates.sh
$BASEDIR/../common/macos/system_updates.sh

View File

@@ -1 +1 @@
source "${BASH_SOURCE%/*}/../common/python3.sh"
source "${BASH_SOURCE%/*}/../common/macos/python3.sh"

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/system_updates.sh
$BASEDIR/../common/macos/system_updates.sh

View File

@@ -1 +1 @@
source "${BASH_SOURCE%/*}/../common/python3.sh"
source "${BASH_SOURCE%/*}/../common/macos/python3.sh"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\disable-windefender.ps1"
. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\wsearch-off.ps1"
. "$PSScriptRoot\..\common\windows\wsearch-off.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\windows_removethemall.ps1"
. "$PSScriptRoot\..\common\windows\windows_removethemall.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\disable-ntp.ps1"
. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\python.ps1" 32
. "$PSScriptRoot\..\common\windows\python.ps1" 32

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\cmake.ps1"
. "$PSScriptRoot\..\common\windows\cmake.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\icu.ps1"
. "$PSScriptRoot\..\common\windows\icu.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\jom.ps1"
. "$PSScriptRoot\..\common\windows\jom.ps1"

View File

@@ -30,5 +30,4 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\python3.ps1" 32
. "$PSScriptRoot\..\common\windows\python3.ps1" 32

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\disable-sleep.ps1"
. "$PSScriptRoot\..\common\windows\disable-sleep.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\disable-windefender.ps1"
. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\wsearch-off.ps1"
. "$PSScriptRoot\..\common\windows\wsearch-off.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\openssl.ps1"
. "$PSScriptRoot\..\common\windows\openssl.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\windows_removethemall.ps1"
. "$PSScriptRoot\..\common\windows\windows_removethemall.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\disable-ntp.ps1"
. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\install-notepad++.ps1"
. "$PSScriptRoot\..\common\windows\install-notepad++.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\install-sevenzip.ps1"
. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\install-qnx660.ps1"
. "$PSScriptRoot\..\common\windows\install-qnx660.ps1"

View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1"

Some files were not shown because too many files have changed in this diff Show More