Commit 2a28ce86 authored by Heikki Halmet's avatar Heikki Halmet Committed by Frederik Gladhorn
Browse files

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: Ic93b2183052335dee875d1452b21e38d268b6474
Reviewed-by: default avatarJędrzej Nowacki <jedrzej.nowacki@qt.io>
parent 52da24b7
dev 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.9 5.9.8 6.0 6.0.0 6.1 6.1.0 6.1.1 6.1.2 6.1.3 6.2 6.2.0 6.2.1 6.2.2 ifw-5.12.10 ifw-5.12.11 pyside6.0 pyside6.1 wip/cmake wip/emulator/master wip/flashing-wizard/master wip/installer-framework/3.1 wip/navigation wip/ogl-runtime/2.4 wip/ogl-runtime/2.5 wip/ogl-runtime/2.6 wip/ogl-runtime/2.7 wip/ogl-runtime/master wip/pyside-setup/5.11.0 wip/pyside-setup/5.14 wip/qdb/master wip/qt3d-runtime/2.0 wip/qt3d-runtime/2.0.1 wip/qt3d-runtime/2.1 wip/qt3d-runtime/2.2 wip/qt3d-runtime/2.3 wip/qt3d-runtime/2.4 wip/qt3d-runtime/master wip/qt3dstudio/2.0 wip/qt3dstudio/2.0.1 wip/qt3dstudio/2.1 wip/qt3dstudio/2.2 wip/qt3dstudio/2.3 wip/qt3dstudio/2.4 wip/qt3dstudio/2.5 wip/qt3dstudio/2.6 wip/qt3dstudio/2.7 wip/qt3dstudio/master wip/qt3dstudio/runtime2 wip/qt6 wip/qtsaferenderer/1.0 wip/qtsaferenderer/1.1 wip/qtsaferenderer/1.2 wip/qtsaferenderer/master wip/qtwebkit/5.212 wip/tqtc-qt-config-gui/master wip/vxworks/5.9.5 wip/webassembly v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5
No related merge requests found
Showing with 17 additions and 17 deletions
......@@ -37,9 +37,9 @@
# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
source "${BASH_SOURCE%/*}/../common/try_catch.sh"
source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
targetFolder="/opt/android"
sdkTargetFolder="$targetFolder/sdk"
......
......@@ -38,7 +38,7 @@
# CMake is needed for autotests that verify that Qt can be built with CMake
# shellcheck source=InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
version="3.6.2"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
......
......@@ -34,7 +34,7 @@
#############################################################################
# This script installs FBX SDK
source "${BASH_SOURCE%/*}/DownloadURL.sh"
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
#s script installs FBX SDK
set -e
......
......@@ -35,7 +35,7 @@
# This script installs INTEGRITY
source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
version="11.4.4"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz"
......
......@@ -36,8 +36,8 @@
# This script install OpenSSL from sources.
# Requires GCC and Perl to be in PATH.
source "${BASH_SOURCE%/*}/try_catch.sh"
source "${BASH_SOURCE%/*}/DownloadURL.sh"
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
version="1.0.2g"
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
......
......@@ -38,9 +38,9 @@
# to /Applications/. This can be overridden by a target parameter.
# shellcheck source=try_catch.sh
source "${BASH_SOURCE%/*}/try_catch.sh"
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
# shellcheck source=DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
ExceptionDownload=99
ExceptionCreateTmpFile=100
......
......@@ -34,7 +34,7 @@
#############################################################################
# shellcheck source=try_catch.sh
source "${BASH_SOURCE%/*}/try_catch.sh"
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
ExceptionCreateTmpFile=100
ExceptionDownloadPrimaryUrl=101
......
......@@ -34,8 +34,8 @@
# This script installs FBX SDK
# shellcheck source=./try_catch.sh
source "${BASH_SOURCE%/*}/try_catch.sh"
# shellcheck source=./../unix/try_catch.sh
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
targetFolder="/opt/fbx"
......
......@@ -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
......
......@@ -44,8 +44,8 @@
# shellcheck source=../common/try_catch.sh
source "${BASH_SOURCE%/*}/try_catch.sh"
# shellcheck source=../common/unix/try_catch.sh
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
function InstallXCode()
{
......
File moved
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment