From 42b502f7bcf39da693739b313495980a1440a08a Mon Sep 17 00:00:00 2001 From: Aapo Keskimolo Date: Tue, 29 Aug 2017 13:11:59 +0300 Subject: Add UploadConfigureExe feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We used to solve the requirement for uploading configure.exe from product version, but we can add this as a feature and remove the dependency to product version. Change-Id: If671e7193771453cd5cd41e881875c44ff0992fb Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 14 +++++++------- coin/platform_configs/qt5.txt | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index ea6e259b..191e59d4 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,16 +2,16 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release BuildExamples qtci-windows-8.1-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix -qtci-windows-8.1-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8.1-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic -qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86_64-8 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-10-x86_64-8 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe qtci-linux-Ubuntu-14.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation -qtci-windows-8.1-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-8.1-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-8.1-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests UploadConfigureExe +qtci-windows-8.1-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests UploadConfigureExe qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Packaging Release NoUseGoldLinker qtci-osx-10.11-x86_64 Clang Packaging DebugAndRelease Release diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index a24ffd9a..b9565ebe 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,15 +1,15 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- -qtci-windows-8.1-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-8 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-8 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-8.1-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests UploadConfigureExe +qtci-windows-10-x86_64-8 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe +qtci-windows-10-x86_64-8 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 UploadConfigureExe +qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 UploadConfigureExe qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker # target arch is used here only for documentation the value is ignored -qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -- cgit v1.2.3