diff options
| author | Simo Fält <simo.falt@qt.io> | 2021-03-12 19:42:36 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2021-03-12 20:02:29 +0200 |
| commit | 41e351d0cc83df8d6c07acf927ed6cb418ae9732 (patch) | |
| tree | 9dab4ff837b130aac737bf6d078d32d953c74ff7 | |
| parent | b160fee9bf1622f85ded5a284ea20ad84dd2da3b (diff) | |
| parent | 6fe56028971aec91f954887e368e42f537e6caf0 (diff) | |
92 files changed, 839 insertions, 125 deletions
diff --git a/.gitmodules b/.gitmodules index f7e38515..fd72b8a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,26 +1,27 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 6.1 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 6.1 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 6.1 status = essential [submodule "qtactiveqt"] depends = qtbase + recommends = qttools path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 6.1 status = addon [submodule "qtmultimedia"] depends = qtbase @@ -31,10 +32,10 @@ status = ignore [submodule "qttools"] depends = qtbase - recommends = qtdeclarative qtactiveqt + recommends = qtdeclarative path = qttools url = ../qttools.git - branch = dev + branch = 6.1 status = essential [submodule "qtxmlpatterns"] depends = qtbase @@ -47,7 +48,7 @@ depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 6.1 status = essential priority = 30 [submodule "qtdoc"] @@ -55,7 +56,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = dev + branch = 6.1 status = essential priority = 40 [submodule "qtrepotools"] @@ -117,20 +118,21 @@ recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 6.1 status = addon [submodule "qt3d"] depends = qtbase - recommends = qtdeclarative qtshadertools + recommends = qtdeclarative qtshadertools qttools path = qt3d url = ../qt3d.git - branch = dev + branch = 6.1 status = addon [submodule "qtimageformats"] depends = qtbase + recommends = qttools path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 6.1 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative @@ -223,7 +225,7 @@ recommends = qtimageformats qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = 6.1 status = essential [submodule "qtpurchasing"] depends = qtbase @@ -234,25 +236,25 @@ status = ignore [submodule "qtcharts"] depends = qtbase - recommends = qtdeclarative qtmultimedia + recommends = qtdeclarative qtmultimedia qttools path = qtcharts url = ../qtcharts.git - branch = dev + branch = 6.1 status = addon [submodule "qtdatavis3d"] depends = qtbase - recommends = qtdeclarative qtmultimedia + recommends = qtdeclarative qtmultimedia qttools path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 6.1 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg - recommends = qtmultimedia qtquickcontrols + recommends = qtmultimedia qtquickcontrols qttools path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev - status = ignore + branch = 6.1 + status = additionalLibrary [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative @@ -262,9 +264,10 @@ status = ignore [submodule "qtscxml"] depends = qtbase qtdeclarative + recommends = qttools path = qtscxml url = ../qtscxml.git - branch = dev + branch = 6.1 status = addon [submodule "qtspeech"] depends = qtbase @@ -275,10 +278,11 @@ status = ignore [submodule "qtnetworkauth"] depends = qtbase + recommends = qttools path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev - status = ignore + branch = 6.1 + status = additionalLibrary [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative @@ -295,31 +299,50 @@ status = ignore [submodule "qtlottie"] depends = qtbase qtdeclarative + recommends = qttools path = qtlottie url = ../qtlottie.git - branch = dev - status = ignore + branch = 6.1 + status = additionalLibrary [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = dev + branch = 6.1 status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative qtshadertools path = qtquick3d url = ../qtquick3d.git - branch = dev + branch = 6.1 status = addon [submodule "qtshadertools"] depends = qtbase path = qtshadertools url = ../qtshadertools.git - branch = dev + branch = 6.1 status = addon [submodule "qt5compat"] depends = qtbase qtdeclarative path = qt5compat url = ../qt5compat.git - branch = dev + branch = 6.1 status = deprecated +[submodule "qtcoap"] + depends = qtbase qttools + path = qtcoap + url = ../qtcoap.git + branch = 6.1 + status = additionalLibrary +[submodule "qtmqtt"] + depends = qtbase qtdeclarative qttools + path = qtmqtt + url = ../qtmqtt.git + branch = 6.1 + status = additionalLibrary +[submodule "qtopcua"] + depends = qtbase qtdeclarative qtquickcontrols2 qttools + path = qtopcua + url = ../qtopcua.git + branch = 6.1 + status = additionalLibrary diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 78e2b84e..d73063c4 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -24,13 +24,13 @@ instructions: - type: Group instructions: - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build . --target qttools/all --parallel -v" + command: "{{.Env.ENV_PREFIX}} cmake --build . --target qtbase/src/plugins/platforms/all qtbase/src/plugins/sqldrivers/all qttools/all --parallel -v" maxTimeInSeconds: 12000 maxTimeBetweenOutput: 1200 userMessageOnFailure: > Failed to build sources. - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build . --target generate_docs -v" + command: "{{.Env.ENV_PREFIX}} cmake --build . --target docs -v" maxTimeInSeconds: 12000 maxTimeBetweenOutput: 1200 userMessageOnFailure: > diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 67f14760..2fad1615 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -14,8 +14,8 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - - Id: 'CentOS-8.1-host' - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Id: 'CentOS-8.3-host' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'Sccache'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY' diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index d80bf12e..59d86700 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -6,7 +6,7 @@ Configurations: Target arch: 'armv7' Compiler: 'GCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'InsignificantTests'] + Features: ['Sccache'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}', @@ -22,7 +22,7 @@ Configurations: Target arch: 'arm64' Compiler: 'GCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'InsignificantTests'] + Features: ['Sccache'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}', @@ -38,7 +38,7 @@ Configurations: Target arch: 'mips64' Compiler: 'GCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'InsignificantTests', 'DisableTests'] + Features: ['Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}', diff --git a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml index 332a55ba..1db88b9d 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml @@ -1,46 +1,91 @@ Version: 2 Configurations: - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Target os: 'Android_ANY' Target arch: 'arm64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'CentOS-8.1-host' + Platform dependency: 'CentOS-8.3-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'CentOS-8.1-host' + Platform dependency: 'CentOS-8.3-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'CentOS-8.1-host' + Platform dependency: 'CentOS-8.3-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'CentOS-8.1-host' + Platform dependency: 'CentOS-8.3-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'Ubuntu-18.04-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'armv7' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'Ubuntu-18.04-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'Ubuntu-18.04-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'Ubuntu-18.04-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] + diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 0d11d641..97d646de 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -13,7 +13,12 @@ Configurations: Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu' - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' + Compiler: 'GCC' + Features: ['Packaging', 'UseLegacyInstructions'] + Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' + - + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' diff --git a/coin/platform_configs/macos-developer-build-tests.yaml b/coin/platform_configs/macos-developer-build-tests.yaml index 458462d5..207f7ec7 100644 --- a/coin/platform_configs/macos-developer-build-tests.yaml +++ b/coin/platform_configs/macos-developer-build-tests.yaml @@ -8,13 +8,13 @@ Configurations: Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - Id: 'macos-10.15-x86_64-developer-build-tests' - Template: 'qtci-macos-10.15-x86_64-100' + Template: 'qtci-macos-10.15-x86_64-102' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - Id: 'macos-11-x86_64-developer-build-tests' - Template: 'qtci-macos-11.0-x86_64-100' + Template: 'qtci-macos-11.0-x86_64-102' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'macos-latest-xcode-x86_64-developer-build' diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index a0256ab8..77068521 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -3,7 +3,7 @@ Configurations: # Build with latest Xcode - Id: 'macos-latest-xcode-x86_64-packaging-build' - Template: 'qtci-macos-11.0-x86_64-100' + Template: 'qtci-macos-11.0-x86_64-102' Compiler: 'Clang' Features: ['Packaging', 'Sccache', 'DoNotRunTests'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..' diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index 3473aac1..c3233842 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -1,28 +1,3 @@ Version: 2 -Module only: True -Configurations: - - - Template: 'qtci-windows-10-x86_64-52' - Compiler: 'MSVC2015' - Target arch: 'x86' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%' - - - Template: 'qtci-windows-10-x86_64-52' - Compiler: 'MSVC2015' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%' - - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' - Compiler: 'GCC' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' - - - Template: 'qtci-macos-10.14-x86_64' - Compiler: 'Clang' - Features: ['Packaging'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' - - - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] +Include: [cmake_platforms.yaml] +Configurations: [] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 681d11fe..8b3df2cd 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -5,13 +5,24 @@ Include: [ ] Configurations: - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'CentOS-8.1-host' + Platform dependency: 'CentOS-8.3-host' Features: ['Packaging', 'Sccache', 'AndroidTestRun'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'Ubuntu-18.04-host' + Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'InsignificantTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] diff --git a/coin/platform_configs/qtdatavis3d.yaml b/coin/platform_configs/qtdatavis3d.yaml new file mode 100644 index 00000000..c3233842 --- /dev/null +++ b/coin/platform_configs/qtdatavis3d.yaml @@ -0,0 +1,3 @@ +Version: 2 +Include: [cmake_platforms.yaml] +Configurations: [] diff --git a/coin/platform_configs/qtdeviceutilities.yaml b/coin/platform_configs/qtdeviceutilities.yaml new file mode 100644 index 00000000..c3233842 --- /dev/null +++ b/coin/platform_configs/qtdeviceutilities.yaml @@ -0,0 +1,3 @@ +Version: 2 +Include: [cmake_platforms.yaml] +Configurations: [] diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index a8c154c6..8edfa4b2 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -13,7 +13,12 @@ Configurations: Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++' - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' + Compiler: 'GCC' + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] + Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan' diff --git a/coin/platform_configs/qtwebengine.yaml b/coin/platform_configs/qtwebengine.yaml index e4a222d8..ccf3af63 100644 --- a/coin/platform_configs/qtwebengine.yaml +++ b/coin/platform_configs/qtwebengine.yaml @@ -22,7 +22,7 @@ Configurations: Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Compiler: 'GCC' Features: ['UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -headersclean -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz -R . QMAKE_LFLAGS_APP+=-s' diff --git a/coin/pre-provisioning/qtci-linux-CENTOS-8.1-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-linux-CentOS-8.3-x86_64/README_MANUAL_INSTALLATIONS index 1ec2f649..4a775302 100644 --- a/coin/pre-provisioning/qtci-linux-CENTOS-8.1-x86_64/README_MANUAL_INSTALLATIONS +++ b/coin/pre-provisioning/qtci-linux-CentOS-8.3-x86_64/README_MANUAL_INSTALLATIONS @@ -1,11 +1,11 @@ -### CENTOS 8.1 ### +### CENTOS 8.3 ### Hard Disk: 500G Network: CI Video Card: Total Video Memory: 64MB Boot options/Firmware: BIOS Language: English (United States) -Time & Date: Europe/Helsinki +Time & Date: Etc/Coordinated Universal Time Software Selection: Server with GUI Network & Host..: Connect @@ -26,20 +26,25 @@ Connect Your Online Accounts: Skip Devices: * Displays: Resolution 1280 x 800 Details: - * Time Zone: GMT + * Time Zone: UTC + * run "sudo timedatectl set-timezone Etc/UTC" * Users: Automatic login on # Add user to sudoers Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt -# Fetch and run coin-setup -Download http://coin/coin/binary/linux_386/coin-setup +Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub +sudo grub2-mkconfig -o /etc/grub2.cfg +sudo grub2-mkconfig -o /boot/grub2/grub.cfg -run 'sudo ./coin-setup' +# Add support for virtio driver +su +echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf +dracut -f -Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub -grub2-mkconfig -o /etc/grub2.cfg -grub2-mkconfig -o /boot/grub2/grub.cfg +# Fetch and run coin-setup +Download http://coin/coin/binary/linux_amd64/coin-setup +run './coin-setup' Reboot diff --git a/coin/pre-provisioning/qtci-macos-10.15-x86_64/README b/coin/pre-provisioning/qtci-macos-10.15-x86_64/README new file mode 100644 index 00000000..82525162 --- /dev/null +++ b/coin/pre-provisioning/qtci-macos-10.15-x86_64/README @@ -0,0 +1,7 @@ +Add accessibility settings: +/Volumes/Macintosh\ HD/usr/bin/sqlite3 "/Volumes/Macintosh HD/Library/Application Support/com.apple.TCC/TCC.db" <<"EOF" +insert into access (service,client,client_type,allowed,prompt_count,indirect_object_identifier,flags,last_modified) values ("kTCCServiceAccessibility","com.froglogic.squish.ide.product",0,1,1,"UNSEEN",0,1612871478) + +insert into access (service,client,client_type,allowed,prompt_count,indirect_object_identifier,flags,last_modified) values ("kTCCServiceAccessibility","/Users/qt/bootstrap-agent",1,1,1,"UNSEEN",0,1612871478); +EOF + diff --git a/coin/pre-provisioning/qtci-macos-11.0-x86_64/README b/coin/pre-provisioning/qtci-macos-11.0-x86_64/README new file mode 100644 index 00000000..6713914d --- /dev/null +++ b/coin/pre-provisioning/qtci-macos-11.0-x86_64/README @@ -0,0 +1,8 @@ +Add accessibility settings: +/Volumes/Macintosh\ HD/usr/bin/sqlite3 "/Volumes/Macintosh HD/Library/Application Support/com.apple.TCC/TCC.db" <<"EOF"{{insert into access (service,client,client_type,auth_value,auth_reason,auth_version,indirect_object_identifier_type,indirect_object_code_identity,last_modified) values }} +('kTCCServiceAccessibility','com.froglogic.squish.ide.product',0,2,4,1,0,0,1612867994); + +{{insert into access (service,client,client_type,auth_value,auth_reason,auth_version,indirect_object_identifier_type,indirect_object_code_identity,last_modified) values }} +('kTCCServiceAccessibility','/Library/Java/JavaVirtualMachines/jdk1.8.0_102.jdk/Contents/Home/jre/bin/java',1,2,4,1,0,0,1612867994); + +EOF diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh index 0d9c038a..08920669 100755 --- a/coin/provisioning/common/linux/gcc.sh +++ b/coin/provisioning/common/linux/gcc.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -57,7 +57,7 @@ function InstallGCC() { suffixVersion=$(echo "$version" | cut -d "." -f1,2) sourceFile="gcc-$version.tar.xz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/gcc/$sourceFile" - officialUrl="ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-$version/$sourceFile" + officialUrl="https://gcc.gnu.org/pub/gcc/releases/gcc-$version/gcc-$version.tar.xz" targetFile="$tmpFolder/$sourceFile" buildFolder="$HOME/gcc_build" diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 1c9f1597..a1ec670f 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -47,18 +47,23 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh" # shellcheck source=./DownloadURL.sh source "${BASH_SOURCE%/*}/DownloadURL.sh" -libclang_version=10.0 +libclang_version=11.0 if uname -a |grep -q Darwin; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-mac.7z" url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z" - sha1="6e019c428511e74c5d46d0ddca79d8e804b67f8a" + sha1="2ea23914089df532385a527861feb010a867000b" +elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat"; then + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" + sha1="eeb9b9bed81308cc4c7a7ac177e15baec7214d5e" else version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" - url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" - sha1="08f352d411e4b47c2a259c3b120d7cb2db01e41d" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" + sha1="57ebaac89bbe51a661f31a13c5e3829e34aa8b80" fi zip="/tmp/libclang.7z" diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 04ce9b93..327c8af5 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -41,19 +41,20 @@ set -ex # This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.6.1" -qtBranch="515x" +version="6.7-20210119-1632" +qtBranch="60x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable" -licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license" +licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license" licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" if uname -a |grep -q Darwin; then - compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" + version="6.6.1" + compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz" sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="3a50052caafa3ca583b7edf754227999d7185ffa" + sha1="8780665c3560456cd86980802cb24513233444fe" fi mountFolder="/tmp/squish" @@ -100,7 +101,8 @@ sudo mv "$installFolder/rta_squish_$version" "$squishFolder" if uname -a |grep -q "Ubuntu"; then if [ ! -e "/usr/lib/tcl8.6" ]; then sudo mkdir /usr/lib/tcl8.6 - sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ + #this needs to be copied only to squish_for_qt6 + sudo cp "$squishFolder/squish_for_qt6/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ fi fi @@ -112,18 +114,34 @@ sudo chown qt:$usersGroup "$HOME/.squish-3-license" echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then - echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile - echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile + echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile + echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile else echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc fi -echo "Verifying Squish" -if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then - echo "Squish for Qt installation tested successfully" +echo "Verifying Squish, available installations:" +ls -la $squishFolder +if uname -a |grep -q Darwin; then + if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt installation tested successfully" + else + echo "Squish for Qt test failed! Package wasn't installed correctly." + exit 1 + fi else - echo "Squish for Qt test failed! Package wasn't installed correctly." - exit 1 + if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt5 installation tested successfully" + else + echo "Squish for Qt5 test failed! Package wasn't installed correctly." + exit 1 + fi + if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt6 installation tested successfully" + else + echo "Squish for Qt6 test failed! Package wasn't installed correctly." + exit 1 + fi fi diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 676a7d25..2aa72ba8 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -5,7 +5,7 @@ param( ) . "$PSScriptRoot\helpers.ps1" -$libclang_version="10.0" +$libclang_version="11.0" Write-Output "libClang = $libclang_version" >> ~/versions.txt # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). @@ -39,20 +39,20 @@ $toolchainSuffix = "" if ( $toolchain -eq "vs2019" ) { if ( $archVer -eq 64 ) { - $sha1 = "6e1b3e6d38803a3bf088e521f4f4feb1ca44bac3" + $sha1 = "ff0a30c881691068c14fbed9239b3583c8c45c6a" } else { - $sha1 = "36fcdc3155eef3636d99ed591f12e73d7a9a2e0c" + $sha1 = "" } $toolchainSuffix = "msvc" } if ( $toolchain -eq "mingw" ) { if ( $archVer -eq 64 ) { - $sha1 = "34daf2324d190de49f8e4005afeb39a7d70c5842" + $sha1 = "40141a788b1ccb615544e18da27cd95b4986217b" } else { - $sha1 = "3d7c809ab12c9293df8ffd9343cee68f184c8612" + $sha1 = "" } $toolchainSuffix = "mingw" } @@ -64,7 +64,7 @@ if ( $setDefault ) { } Set-EnvironmentVariable ("LLVM_INSTALL_DIR_${toolchainSuffix}") ($baseDestination + "-$archVer") -if ( $libclang_version -eq "100" ) { +if ( $libclang_version -eq "110" ) { # This is a hacked static build of libclang which requires special # handling on the qdoc side. Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1" diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index c615f9eb..dbd6da16 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -36,12 +36,12 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.6.1" -$qtBranch = "515x" +$version = "6.7-20210112-1612" +$qtBranch = "60x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" -$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" +$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\515x" # Squish license $licensePackage = ".squish-3-license" @@ -60,7 +60,7 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren if ($OSVersion -eq "Windows 10 Enterprise") { $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" + $sha1 = "628bb65cf515d08df388b0dc4d5b403e4c6657b2" } else { $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-install_telegraf.sh index 729f9003..729f9003 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-install_telegraf.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_network_manager_secret_key.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-remove_network_manager_secret_key.sh index 5ed44f2d..5ed44f2d 100644 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_network_manager_secret_key.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-remove_network_manager_secret_key.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_stable-privacy.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-remove_stable-privacy.sh index 5fdf5804..5fdf5804 100644 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_stable-privacy.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-remove_stable-privacy.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-systemsetup.sh index 6d31a941..0b4a7142 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-systemsetup.sh @@ -52,3 +52,8 @@ sudo timedatectl set-timezone Etc/UTC gsettings set org.gnome.desktop.screensaver lock-enabled false # disable blank screen power saving gsettings set org.gnome.desktop.session idle-delay 0 + +# Set Wayland enable as false. CentOS may start using Wayland instead of x-session randomly if this is not set +echo "Setting Wayland enable as false" +sudo sed -i 's/#WaylandEnable=false/WaylandEnable=false/g' /etc/gdm/custom.conf + diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-enable-repos.sh index b5db7675..b5db7675 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-enable-repos.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh index c3c44ae7..c3c44ae7 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-p7zip.sh index 45565766..45565766 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-p7zip.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-p7zip.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/05-libclang-v100-dyn.sh index fbf34ddd..fbf34ddd 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/05-libclang-v100-dyn.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/05-libclang.sh index 7074cbc1..7074cbc1 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/05-libclang.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_700.sh index 92c741fb..92c741fb 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/07-qnx_700.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_700.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/08-integrity.sh index 154370da..154370da 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/08-integrity.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/08-integrity.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/09-disable_selinux.sh index b7a53cd4..b7a53cd4 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/09-disable_selinux.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/09-disable_selinux.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/20-sccache.sh index b371d947..b371d947 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/20-sccache.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/20-sccache.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/22-mqtt_broker.sh index e677427f..e677427f 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-fbx.sh index d8df4375..d8df4375 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-fbx.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-conan.sh index ec54fa54..ec54fa54 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install-conan.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-conan.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install_icu.sh index ce42e844..ce42e844 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install_icu.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/35-install-breakpad.sh index 74dd1579..74dd1579 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/35-install-breakpad.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/35-install-breakpad.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/40-android_linux.sh index a6c4dfff..a6c4dfff 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-android_linux.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/40-android_linux.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/40-install-cmake.sh index 062b2790..062b2790 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-install-cmake.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/40-install-cmake.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/50-openssl_for_android_linux.sh index 6666ea15..6666ea15 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/50-openssl_for_android_linux.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/60-install_protobuff.sh index a77938b3..a77938b3 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/60-install_protobuff.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/60-install_protobuff.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_QemuGA.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/70-install_QemuGA.sh index 0c5244c7..0c5244c7 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_QemuGA.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/70-install_QemuGA.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_dwz.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/70-install_dwz.sh index 935d9227..935d9227 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_dwz.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/70-install_dwz.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/90-squish.sh index e4281588..e4281588 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/99-version.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/99-version.sh index 03565da2..03565da2 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/99-version.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..5198e230 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh @@ -0,0 +1,73 @@ +#!/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$ +## +############################################################################# + +# This script modifies system settings for automated use + +set -ex + +# shellcheck source=../common/unix/check_and_set_proxy.sh +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" + +NTS_IP=10.212.2.216 + +echo "Set timezone to UTC." +sudo timedatectl set-timezone Etc/UTC +echo "Timeout for blanking the screen (0 = never)" +gsettings set org.gnome.desktop.session idle-delay 0 +echo "Prevents screen lock when screesaver goes active." +gsettings set org.gnome.desktop.screensaver lock-enabled false +echo "Set grub timeout to 0" +sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub +sudo update-grub + +# https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1624320 +echo "Setting up workaround for Ubuntu systemd resolve bug" +sudo rm -f /etc/resolv.conf +sudo ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf + +# remove hostname to get unique based on IP address +sudo rm /etc/hostname + +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 + +echo 'LC_ALL=en_US.UTF8' | sudo tee /etc/default/locale + +if [ "$http_proxy" != "" ]; then + echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf +fi + +# This script diverts qtlogging.ini file so we don't get debugging related auto-test failures. +sudo dpkg-divert --divert /etc/xdg/QtProject/qtlogging.ini.foo --rename /etc/xdg/QtProject/qtlogging.ini diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh new file mode 100755 index 00000000..12170828 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -0,0 +1,204 @@ +#!/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$ +## +############################################################################# + +# Install required packages with APT + +# shellcheck source=../common/linux/apt_wait_loop.sh +source "${BASH_SOURCE%/*}/../common/linux/apt_wait_loop.sh" + +echo "Disabling auto update" +sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic +for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do + sudo systemctl stop $service + sudo systemctl disable $service +done + +function set_internal_repo { + + # Stop fetching the dep-11 metadata, since our mirrors do not handle them well + sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} + + sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-backports main restricted universe + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-security main restricted universe multiverse +EOC +} + +(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories." + +# Git is not needed by builds themselves, but is nice to have +# immediately as one starts debugging +installPackages+=(git) +# 7zip is a needed decompressing tool +installPackages+=(p7zip-full) +# To be able to mount yocto-cache during builds +installPackages+=(nfs-common) +# libssl-dev provides headers for OpenSSL +installPackages+=(libssl-dev) +# Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git +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 +installPackages+=(libdbus-1-dev) +# Needed libraries for WebEngine +installPackages+=(libudev-dev) +installPackages+=(libegl1-mesa-dev) +installPackages+=(libfontconfig1-dev) +installPackages+=(libxss-dev) +installPackages+=(nodejs) +# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev. + +# Common event loop handling +installPackages+=(libglib2.0-dev) +# MySQL support +installPackages+=(libmysqlclient-dev) +# PostgreSQL support +installPackages+=(libpq-dev) +# SQLite support +installPackages+=(libsqlite3-dev) +# ODBC support +installPackages+=(unixodbc-dev) +# Support for FreeType font engine +installPackages+=(libfreetype6-dev) +# Enable the usage of system jpeg libraries +installPackages+=(libjpeg-dev) +# Enable support for printer driver +installPackages+=(libcups2-dev) +# Enable support for printer test +installPackages+=(cups-pdf) +# Install libraries needed for QtMultimedia to be able to support all plugins +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) +installPackages+=(g++-multilib) +# python3 development package +installPackages+=(python3-dev) +installPackages+=(python3-pip) +installPackages+=(virtualenv) +installPackages+=(python3-wheel) +# python2 development package +installPackages+=(python-dev) +# Automates interactive applications (Needed by RTA to automate configure testing) +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+=(libnss3) +installPackages+=(libopenal-dev) +installPackages+=(libbluetooth-dev) +#VirtualBox for RTA +installPackages+=(virtualbox) +installPackages+=(dkms) +# Needed for qtspeech +installPackages+=(libspeechd-dev) +#Pypdf for PDF reading in RTA tests +installPackages+=(python-pypdf2) +# Needed for b2qt +installPackages+=(git-lfs) +installPackages+=(chrpath) +installPackages+=(gawk) +installPackages+=(texinfo) +# Needed for Poppler test in QtWebEngine +installPackages+=(libpoppler-cpp-dev) +# Needed for QtCore +installPackages+=(libdouble-conversion-dev) +installPackages+=(libpcre2-dev) +# Needed for qtgampepad +installPackages+=(libsdl2-2.0) +installPackages+=(libsdl2-dev) +# Needed for qtwebkit +installPackages+=(ruby) +installPackages+=(libxslt1-dev) +installPackages+=(libxml2-dev) +installPackages+=(libhyphen-dev) + +echo "Running update for apt" +waitLoop +sudo apt-get update +echo "Installing packages" +waitLoop +sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" + +# Install all needed packages in a special wheel cache directory +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" + +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" + +OpenSSLVersion="$(openssl version |cut -b 9-14)" +echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt + diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh new file mode 100755 index 00000000..f38c9bab --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/disable-notifications.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-notifications.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh new file mode 100755 index 00000000..89806892 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/disable-ntp_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh new file mode 100755 index 00000000..7f5140fd --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# Install Git Large File Storage + +set -ex + +curl -L https://packagecloud.io/github/git-lfs/gpgkey | sudo apt-key add - +sudo apt-add-repository 'deb https://packagecloud.io/github/git-lfs/ubuntu/ xenial main' +sudo apt update +sudo apt install git-lfs diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh new file mode 100755 index 00000000..09477763 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/remove-apport.sh +source "${BASH_SOURCE%/*}/../common/linux/remove-apport.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh new file mode 100755 index 00000000..55c6ce79 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/remove-update_notifier.sh +source "${BASH_SOURCE%/*}/../common/linux/remove-update_notifier.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh new file mode 100755 index 00000000..744228d7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/linux/gcc.sh +source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" + +InstallGCC 8.3.0 50 ccccfe4fe9206d111a173c19a21f8700d1133ae8 c27f4499dd263fe4fb01bcc5565917f3698583b2 diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang-v100-dyn.sh new file mode 100755 index 00000000..dcd5b2d8 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang-v100-dyn.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh new file mode 100755 index 00000000..0d18dbcf --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/20-sccache.sh new file mode 100755 index 00000000..b371d947 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/20-sccache.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/sccache.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..7c58c478 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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 + +# shellcheck source=../common/unix/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh new file mode 100755 index 00000000..d8df4375 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh new file mode 100644 index 00000000..74dd1579 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh new file mode 100755 index 00000000..0527fe85 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh @@ -0,0 +1,39 @@ +#!/bin/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 + +# shellcheck source=../common/linux/android_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh new file mode 100755 index 00000000..db8a3ff5 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/cmake_linux.sh" + diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh new file mode 100755 index 00000000..81ea3b17 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh @@ -0,0 +1,39 @@ +#!/bin/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 + +# shellcheck source=../common/linux/openssl_for_android_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh new file mode 100755 index 00000000..82c2c659 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/docker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh new file mode 100755 index 00000000..e4281588 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh new file mode 100755 index 00000000..fcc7d31c --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +# shellcheck source=../common/linux/squish-coco.sh +source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh new file mode 100644 index 00000000..c8f3ac03 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/ubuntu-version.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install_icu.sh new file mode 100755 index 00000000..8c4980ee --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install_icu.sh @@ -0,0 +1,79 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 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$ +## +############################################################################# + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +# This script will install ICU + +icuVersion="60.2" +icuLocationLib="/opt/icu/lib64" +icuLocationInclude="/opt/icu/include" +sha1="2b972d8897783c08dfe1e52af49216ed92656736" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu18.04-x64_60_2.7z" +baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu18.04-x64_60_2.7z" + +sha1Dev="416c89d3ded143ea1d4fcc688dce02b01aaa9ee2" +develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu18.04-x64-devel_60_2.7z" +develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu18.04-x64-devel_60_2.7z" + +echo "Installing custom ICU $icuVersion $sha1 packages on CentOS to $icuLocationLib" + +targetFile=$(mktemp) +sudo mkdir -p "$icuLocationLib" +sudo mkdir -p "$icuLocationInclude" +DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" +sudo 7z x -y -o$icuLocationLib "$targetFile" +sudo rm "$targetFile" + +echo "Installing custom ICU devel packages on CentOS" + +tempDir=$(mktemp -d) + +targetFile=$(mktemp) +DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" +7z x -y -o"$tempDir" "$targetFile" + +sudo cp -a "$tempDir"/lib/* "$icuLocationLib" +sudo cp -a "$tempDir"/* /opt/icu/ + +sudo rm "$targetFile" +sudo rm -fr "$tempDir" + +sudo /sbin/ldconfig + +echo "ICU = $icuVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh index aed78aee..1195f95a 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -104,3 +104,5 @@ sudo rm -f "$targetFile" sudo sed -i'.orig' -e 's:^#/net:/net:' -e 's:hidefromfinder,nosuid:hidefromfinder,nosuid,locallocks,nocallback:' /etc/auto_master sudo automount -cv +# Disable multicast advertisements +sudo defaults write /Library/Preferences/com.apple.mDNSResponder.plist NoMulticastAdvertisements -bool true diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh index aed78aee..1195f95a 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -104,3 +104,5 @@ sudo rm -f "$targetFile" sudo sed -i'.orig' -e 's:^#/net:/net:' -e 's:hidefromfinder,nosuid:hidefromfinder,nosuid,locallocks,nocallback:' /etc/auto_master sudo automount -cv +# Disable multicast advertisements +sudo defaults write /Library/Preferences/com.apple.mDNSResponder.plist NoMulticastAdvertisements -bool true diff --git a/coin/provisioning/qtci-windows-10-x86/90-squish.ps1 b/coin/provisioning/qtci-windows-10-x86/90-squish.ps1 deleted file mode 100644 index ff758845..00000000 --- a/coin/provisioning/qtci-windows-10-x86/90-squish.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\squishInstall.ps1" diff --git a/init-repository b/init-repository index 2e0ddcde..0fbc98b6 100755 --- a/init-repository +++ b/init-repository @@ -294,7 +294,8 @@ use constant { STS_ESSENTIAL => 2, STS_ADDON => 3, STS_DEPRECATED => 4, - STS_OBSOLETE => 5 + STS_OBSOLETE => 5, + STS_ADDITIONAL => 6 }; sub git_clone_all_submodules @@ -332,6 +333,8 @@ sub git_clone_all_submodules $subinits{$1} = STS_DEPRECATED; } elsif ($3 eq "obsolete") { $subinits{$1} = STS_OBSOLETE; + } elsif ($3 eq "additionalLibrary") { + $subinits{$1} = STS_ADDITIONAL; } elsif ($3 eq "ignore") { delete $subinits{$1}; } else { @@ -351,6 +354,8 @@ sub git_clone_all_submodules @what = grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases; } elsif ($mod eq "addon") { @what = grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases; + } elsif ($mod eq "additionalLibrary") { + @what = grep { ($subinits{$_} || 0) eq STS_ADDITIONAL } keys %subbases; } elsif ($mod eq "preview") { @what = grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases; } elsif ($mod eq "deprecated") { @@ -640,12 +645,13 @@ sub run chomp(my $url = `git config remote.origin.url`); die("Have no origin remote.\n") if (!$url); $url =~ s,\.git$,,; - $url =~ s/qt5$//; + $url =~ s/((?:tqtc-)?qt5)$//; + my $qtrepo = $1 || 'qt5'; $self->{'base-url'} = $url; - $self->git_clone_all_submodules('qt5', $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}}); + $self->git_clone_all_submodules($qtrepo, $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}}); - $self->git_add_remotes('qt5'); + $self->git_add_remotes($qtrepo); $self->git_install_hooks; diff --git a/qt5compat b/qt5compat -Subproject 1d5d02c3cad66d36cfde352044666c2d8805577 +Subproject 9b831781aa570b740ba799e7c2b5f88e1268ce1 diff --git a/qtbase b/qtbase -Subproject 167bcafcb6b1988047bec8b4d67c994fc8c85c1 +Subproject 42f364c4945b7fe504817c5dc24f3ab8a4456db diff --git a/qtcoap b/qtcoap new file mode 160000 +Subproject 22aa407eca1f55144474add10afc3d99288b5fd diff --git a/qtdeclarative b/qtdeclarative -Subproject 948c56ca051d9a2d0f806b8bce3a3170751f575 +Subproject 9e9f889a631083ad3f78e7d975f4c8d3d6be39f diff --git a/qtdoc b/qtdoc -Subproject f463b26f9329cc0fa673fdfdcb8f52986b66f09 +Subproject 9262c1116b3786f8de8d7a2034e79360a0184ff diff --git a/qtmqtt b/qtmqtt new file mode 160000 +Subproject 1e7bf20965c832f213c6bb14ebfd447cb0039c7 diff --git a/qtopcua b/qtopcua new file mode 160000 +Subproject 32c693e7fd3a7e4fb43ce19b33a15edfafd6572 diff --git a/qtqa b/qtqa -Subproject 0cb86ebe6e412685e9323d311fd301cfcbe734c +Subproject f9d0c48afce7365692d6464dc6490be12bfcf53 diff --git a/qtquick3d b/qtquick3d -Subproject 44cde9bb144667fd57df4fadd0743a5263bff27 +Subproject d18e63fe06927550856279edf43cc00c6f08fec diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject fd92634e94bf91c73696eccd8c468fc5f7a9c8e +Subproject cd9602403587d0a44607a1fdd39439bc848a645 diff --git a/qtquicktimeline b/qtquicktimeline -Subproject e0f3307bda17f739af2d5712f488f65a4f30af9 +Subproject a0e2a3c6ead0923057821fa9113897370c6d4f2 diff --git a/qtrepotools b/qtrepotools -Subproject 7efc56e59dfd7cc300f92e3c3e7744202fd7b02 +Subproject 1af97221c58fff342094b14a2c803aa169cb6de diff --git a/qtshadertools b/qtshadertools -Subproject 2d6cb8528ae104df7fffe22c20b92299a4119a8 +Subproject cfcf293ae59811044dd8960ca02cf5c1763abce diff --git a/qtsvg b/qtsvg -Subproject 0b7ba19d5df00a756c99fb4dc2aecd2262c82ea +Subproject 88797a3b223aa0e22a88fc87721348199cb9993 diff --git a/qttools b/qttools -Subproject d0607c4ca2388df8e81392396884d9a108e0443 +Subproject f177fb1479f4f725e3833758326d80d96be3d17 diff --git a/qttranslations b/qttranslations -Subproject b830cea5594ad80c3f6528ba4fccbc855378b3a +Subproject 803996b791d1860f5185726c5bd65c3a20d2821 diff --git a/qtwayland b/qtwayland -Subproject 4d0e2b65a0696e4c045939216a023108cb439e1 +Subproject ddee808b883ddfc899a418e7b49099721883318 |