From d65d71731f8b50ee8912134e81418178a0a158a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 18 Oct 2018 09:47:08 +0300 Subject: CI platform config: Make 32 bit msvc2017 config as default Swapping 32 bit windows packaging configs so that MSVC 2017 is built as default config and MSVC 2015 only for qt5. As the config is not part of the default.txt we have to add it as module specific config. Change-Id: I3c423c2c80d0093fdeca340d6faa8e162c03b5cd Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qt3d-runtime.txt | 2 +- coin/platform_configs/qt5.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 8c90b80c..8878836c 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,7 +2,7 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 6abc5ed2..fdc51d6b 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -1,7 +1,7 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 37065eff..5a189f25 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,7 +1,7 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -- cgit v1.2.3 From 01faa84629cfbbbe4c5bbb457d31bad50dc7883c Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Mon, 29 Oct 2018 15:22:02 +0200 Subject: Update qt3d-runtime.txt targets Add missing macOS and Windows Android arm64 targets. Remove iOS target that is now included in default.txt. Change-Id: Ifc20336b94477b2f8be456ef7f7f8bfaf8bf1190 Reviewed-by: Akseli Salovaara Reviewed-by: Jani Heikkinen --- coin/platform_configs/qt3d-runtime.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 6abc5ed2..37065eff 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -9,11 +9,12 @@ qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -- cgit v1.2.3 From f335f71d02c9ea099dd0af63ac84ca6e26f1074f Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Thu, 8 Nov 2018 11:27:57 +0200 Subject: Add new targets for packaging Jenkins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If2a769ef74ef01f663cc7673477346009d593e38 Reviewed-by: Eike Ziller Reviewed-by: Iikka Eklund Reviewed-by: Tim Jenssen Reviewed-by: Simo Fält --- coin/platform_configs/qtsdk.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 coin/platform_configs/qtsdk.txt (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qtsdk.txt b/coin/platform_configs/qtsdk.txt new file mode 100644 index 00000000..3011926d --- /dev/null +++ b/coin/platform_configs/qtsdk.txt @@ -0,0 +1,4 @@ +Template Target OS Target arch Compiler Features +--------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic +qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo -- cgit v1.2.3 From 7bee789af37dcd4c5fd043d30fc3320d2bbfd770 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 5 Dec 2018 14:33:34 +0100 Subject: Add configuration to run qtconnectivity tests on winrt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib9b61b19033d4ceb7ce15ecc8c1a0227b53bb669 Reviewed-by: Tony Sarajärvi Reviewed-by: Alex Blasche --- coin/platform_configs/qtconnectivity.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 coin/platform_configs/qtconnectivity.txt (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt new file mode 100644 index 00000000..4ac73c86 --- /dev/null +++ b/coin/platform_configs/qtconnectivity.txt @@ -0,0 +1,3 @@ +Template Target OS Target arch Compiler Features +--------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo -- cgit v1.2.3