From 1f0ecef421ad92f2fe865a35d50cecedcdc2c648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 16 Apr 2018 13:30:55 +0200 Subject: [PATCH 01/12] First VS2017 try --- .gitlab-ci.yml | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ CI/Windows.bat | 14 +++++++ 2 files changed, 119 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d24c8c1f..0a83240f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,6 +44,111 @@ cppcheck: paths: - cppcheck.log + +#VS2015-64-bit-shared-apps: +# variables: +# BUILD_PLATFORM: "VS2015" +# ARCHITECTURE: "x64" +# SHARED: "TRUE" +# APPS: "ON" +# script: "CI\\Windows.bat" +# tags: +# - VS2015 +# artifacts: +# paths: +# - build-release/*.exe + +VS2017-64-bit-shared-no-apps: + variables: + BUILD_PLATFORM: "VS2017" + ARCHITECTURE: "x64" + SHARED: "TRUE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2017 + artifacts: + paths: + - build-release/*.exe + +#VS2015-32-bit-shared-apps: +# variables: +# BUILD_PLATFORM: "VS2015" +# ARCHITECTURE: "x32" +# SHARED: "TRUE" +# APPS: "ON" +# script: "CI\\Windows.bat" +# tags: +# - VS2015 +# artifacts: +# paths: +# - build-release/*.exe + +VS2017-32-bit-shared-no-apps: + variables: + BUILD_PLATFORM: "VS2017" + ARCHITECTURE: "x32" + SHARED: "TRUE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2017 + artifacts: + paths: + - build-release/*.exe + +#VS2015-64-bit-static-apps: +# variables: +# BUILD_PLATFORM: "VS2015" +# ARCHITECTURE: "x64" +# SHARED: "FALSE" +# APPS: "ON" +# script: "CI\\Windows.bat" +# tags: +# - VS2015 +# artifacts: +# paths: +# - build-release/*.exe + +VS2017-64-bit-static-no-apps: + variables: + BUILD_PLATFORM: "VS2017" + ARCHITECTURE: "x64" + SHARED: "FALSE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2017 + artifacts: + paths: + - build-release/*.exe + +#VS2015-32-bit-static-apps: +# variables: +# BUILD_PLATFORM: "VS2015" +# ARCHITECTURE: "x32" +# SHARED: "FALSE" +# APPS: "ON" +# script: "CI\\Windows.bat" +# tags: +# - VS2015 +# artifacts: +# paths: +# - build-release/*.exe + +VS2017-32-bit-static-no-apps: + variables: + BUILD_PLATFORM: "VS2017" + ARCHITECTURE: "x32" + SHARED: "FALSE" + APPS: "OFF" + script: "CI\\Windows.bat" + tags: + - VS2017 + artifacts: + paths: + - build-release/*.exe + VS2015-64-bit-shared-apps: variables: BUILD_PLATFORM: "VS2015" diff --git a/CI/Windows.bat b/CI/Windows.bat index b5402dd2..e7e9a187 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -69,6 +69,20 @@ IF "%BUILD_PLATFORM%" == "VS2015" ( ) +IF "%BUILD_PLATFORM%" == "VS2017" ( + set LIBPATH=E:\libs\VS2017 + set GTESTVERSION=gtest-1.7.0 + set GENERATOR=Visual Studio 15%ARCH_VS% + set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 15.0\Common7\IDE\devenv.com" + + set QT_VERSION= + IF "%ARCHITECTURE%" == "x64" ( + set QT_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64 + set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64 + ) + +) + IF "%APPS%" == "ON" ( set STRING_APPS= From 1480e6dcaea29d9ea63947dc31bb640ed9d8e3b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 16 Apr 2018 13:54:19 +0200 Subject: [PATCH 02/12] Typo? --- .gitlab-ci.yml | 100 +++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a83240f..91676213 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,18 +45,58 @@ cppcheck: - cppcheck.log -#VS2015-64-bit-shared-apps: -# variables: -# BUILD_PLATFORM: "VS2015" -# ARCHITECTURE: "x64" -# SHARED: "TRUE" -# APPS: "ON" -# script: "CI\\Windows.bat" -# tags: -# - VS2015 -# artifacts: -# paths: -# - build-release/*.exe +.VS2015-64-bit-shared-apps: + variables: + BUILD_PLATFORM: "VS2015" + ARCHITECTURE: "x64" + SHARED: "TRUE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2015 + artifacts: + paths: + - build-release/*.exe + +.VS2015-32-bit-shared-apps: + variables: + BUILD_PLATFORM: "VS2015" + ARCHITECTURE: "x32" + SHARED: "TRUE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2015 + artifacts: + paths: + - build-release/*.exe + +.VS2015-64-bit-static-apps: + variables: + BUILD_PLATFORM: "VS2015" + ARCHITECTURE: "x64" + SHARED: "FALSE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2015 + artifacts: + paths: + - build-release/*.exe + +.VS2015-32-bit-static-apps: + variables: + BUILD_PLATFORM: "VS2015" + ARCHITECTURE: "x32" + SHARED: "FALSE" + APPS: "ON" + script: "CI\\Windows.bat" + tags: + - VS2015 + artifacts: + paths: + - build-release/*.exe + VS2017-64-bit-shared-no-apps: variables: @@ -71,18 +111,6 @@ VS2017-64-bit-shared-no-apps: paths: - build-release/*.exe -#VS2015-32-bit-shared-apps: -# variables: -# BUILD_PLATFORM: "VS2015" -# ARCHITECTURE: "x32" -# SHARED: "TRUE" -# APPS: "ON" -# script: "CI\\Windows.bat" -# tags: -# - VS2015 -# artifacts: -# paths: -# - build-release/*.exe VS2017-32-bit-shared-no-apps: variables: @@ -97,18 +125,6 @@ VS2017-32-bit-shared-no-apps: paths: - build-release/*.exe -#VS2015-64-bit-static-apps: -# variables: -# BUILD_PLATFORM: "VS2015" -# ARCHITECTURE: "x64" -# SHARED: "FALSE" -# APPS: "ON" -# script: "CI\\Windows.bat" -# tags: -# - VS2015 -# artifacts: -# paths: -# - build-release/*.exe VS2017-64-bit-static-no-apps: variables: @@ -123,18 +139,6 @@ VS2017-64-bit-static-no-apps: paths: - build-release/*.exe -#VS2015-32-bit-static-apps: -# variables: -# BUILD_PLATFORM: "VS2015" -# ARCHITECTURE: "x32" -# SHARED: "FALSE" -# APPS: "ON" -# script: "CI\\Windows.bat" -# tags: -# - VS2015 -# artifacts: -# paths: -# - build-release/*.exe VS2017-32-bit-static-no-apps: variables: From 5c3eacbdada2e474d7e7da36163977050fcf3f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 16 Apr 2018 13:56:54 +0200 Subject: [PATCH 03/12] Next --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91676213..4aa8cd01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ macos-c++11: - Apple artifacts: paths: - - build-release-cpp11/*.dmg + - build-release-cpp11/*.dmg - build-release-cpp11/*.tar.gz macos-c++98: @@ -69,8 +69,8 @@ cppcheck: - VS2015 artifacts: paths: - - build-release/*.exe - + - build-release/*.exe + .VS2015-64-bit-static-apps: variables: BUILD_PLATFORM: "VS2015" @@ -82,7 +82,7 @@ cppcheck: - VS2015 artifacts: paths: - - build-release/*.exe + - build-release/*.exe .VS2015-32-bit-static-apps: variables: From 62f6799a35a85021a8cd3ded712a8c9aa53e3c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 16 Apr 2018 13:58:56 +0200 Subject: [PATCH 04/12] Tab removed --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4aa8cd01..98da1d13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ macos-c++11: - Apple artifacts: paths: - - build-release-cpp11/*.dmg + - build-release-cpp11/*.dmg - build-release-cpp11/*.tar.gz macos-c++98: From c7295b312b7a0112bba63e0b44eb4768a33b507c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 16 Apr 2018 13:59:45 +0200 Subject: [PATCH 05/12] And another tab --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98da1d13..19066b4a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,7 @@ cppcheck: - VS2015 artifacts: paths: - - build-release/*.exe + - build-release/*.exe .VS2015-64-bit-static-apps: variables: @@ -82,7 +82,7 @@ cppcheck: - VS2015 artifacts: paths: - - build-release/*.exe + - build-release/*.exe .VS2015-32-bit-static-apps: variables: From 75f1c75c31706a5f309c09390736bea9c898cb0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 16 Apr 2018 14:00:59 +0200 Subject: [PATCH 06/12] Last Tab? --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19066b4a..54f4532f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -166,6 +166,7 @@ VS2015-64-bit-shared-apps: paths: - build-release/*.exe + VS2015-64-bit-shared-no-apps: variables: BUILD_PLATFORM: "VS2015" From e34c472e3994fe96c41b3dd1f0f1d5dd48f9fc16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 16 Apr 2018 14:01:45 +0200 Subject: [PATCH 07/12] Missed one --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54f4532f..1e31a4d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,6 +153,7 @@ VS2017-32-bit-static-no-apps: paths: - build-release/*.exe + VS2015-64-bit-shared-apps: variables: BUILD_PLATFORM: "VS2015" From 6ee66e8c84d8360c4177bec5b44b7bf2ed9c65b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 16 Apr 2018 14:04:13 +0200 Subject: [PATCH 08/12] Update .gitlab-ci.yml From 714eda4d7ae8cd780f120a89ed6b54bd49265930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 16 Apr 2018 14:04:48 +0200 Subject: [PATCH 09/12] Update .gitlab-ci.yml --- .gitlab-ci.yml | Bin 6925 -> 2860 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e31a4d6536bdd904bac71015fb1c50b879d3ba0..a0c4b912c89c6a5cad245d28a551749675dafd5f 100644 GIT binary patch literal 2860 zcmZoXF7x|s>Bdu!mR;!hdtzx<^~OySG6nkku17~T9eOnHP0ZAl4~pM!y>?u?Yqpc} zccp2X?~a`S333AkuPxZHWBG0gnZon?u6N6<)5_)Ozta`5e7Ce><8h|nZ!5O0(9zR; zcl2b`Ja)U^aXLjiR&G(UFVak!_a>(mD9Etycbsk(H#gAInaedc0u70V8Im?SoJXMcp#L-`Bu=v@G+qBG9RifKKJgoce6_HuYOYw>7hFm^U zuaoY&t(diaZq}@vy{jH&?u^?Y%AsR?n$ghDx5)jTzE}F z1enizJk9}!j96EB#-U@kwq0AWF=X52xTtkE=4YPHS-LuLBg}2p-#1o*q{?sZSi4DV zb>+2{%TC`~r#5@)YsP@4!!{d)MV|PC>TbC{L6D8#sPO<=!ciNyE!jy?qi%l))R+fGMqQL~30$_m;uNZEJxA8Yq8F zLu7w=G4l6K97t;Jw><5f)>ZdPam4!*?D0-kmcg6Aa9D&rE(Sv(@VX6B2&m)AG6)~Z z?EqyNLkC?&P_af{9Bo~lR7hkT!7L)V{H&c#Aa5d49i*VfpEq&W2(hq|4Oc!YKr00B z<)gc}OPl+!3JzyJ!eJ5iI4Z-Pk7^0zqdO$zqjKB@bveO;8iz&L^AVw-!&8}-qg6ey z!V_!BfX_z+^AW;F#N;DFafBxyAuNK_ad`6)zMvzRj}WPjh>znms)*0J%{OG>yOeaQ)Oi>t!t=nJU1c-=3u*8@; zQ(hEF;yw4=a}N*)V~FqW>h+ERK!ig#ARSQajqb4vJ$Jj?o6#CL7=s=gRHK6kaw0Yu z00_oxgkfM0ZJqPW#KTG#qJI=G)BKxgnrEXaT_%erTL|QFZ4mY&Auf8AC8sbk-5~I6 zx)=(H`yFADW-LHtoqlEMTkc$M1w-4jQDj3L1ois;dvmpM;xNP`2ntQ-w_zOOd;D0C zu%q}ggegGT_?lA~=+N`p z{vl2u0JEp=bkJwNB}Z*OT@2DmlgTW*KqozaVHb`B_4@kaZdd-V$Xp_F3OV_II-x?n z&^+6FJ40?Y)FZbV3B21z&N(NDxcJ(f54+>p?UAk$x{&nSfSzd2h$YiL(fih~Mt?h1 zuNuh@hm|$omeV{(pVz!H^uh`#Yk1nwrv<=skXOI590;3!sS30u!Qk+D2_zjr8GK<0 z+y?x2v z{H&8_flAN*mQv@dUJBL)#&-(5YALA2E>Q`Wf#*7qaD5?iVFys_`YM4dV_gcnHr9__ zKP!BR?l0tCm+N0f{$;MO7`!(26W6yO*St#Jg>_$Qe7akG9{Ke}UkY9q?|HZH`xpkh vrRPR#wz1%Ey*Ktr4+u6WB6dj6j^4bpt*n*L_G*~PXWLhY{VVz^Avyj4t<~oi From 171dd799cd7c11543195df0fbfe1ff25cd58ecaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 16 Apr 2018 14:08:53 +0200 Subject: [PATCH 10/12] Trying to fix yml --- .gitlab-ci.yml | Bin 2860 -> 6916 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0c4b912c89c6a5cad245d28a551749675dafd5f..4615a062979fc6530778f1b8cef0b5a332783058 100644 GIT binary patch literal 6916 zcmd^EU6YzH6n!qgBI9Fs!dB6>>znms)*0J%{OG>yOeaQ)Oi>t!t=nJU1c-=3u*8@; zQ(hEF!aeuga}O8?V~FqW>h+ERK!ig#ARSQajqb4vJ$Jj?o6#CL7=s=gRHK6kaw0Yu z00_oxgkfM0ZJqPW#KTG#qBn|{Y5q+#&9l*zE|W!*Ed=toHVFHX5Es45l2e$NZV-4j zT?~c9{f;n6GZrASPQSABEqAWBf}!o%D6%0Af_nY_y}8;raTwwe1cj#a+b|CCJ$@`m z*in2L!W5uve9g1*u@O8ziU_Z5{G%W^eu-wVn8tItJ1pS&j$s()*IDC3y#*hdaOn~l ztx;&NAPRyw-9J(2qNQi2x&O2njr-pwKKpSgsC@Pl>Y%I@YJ2u81g?yA zDeMv*P>%KD!dLkqBxeD-$-m71s!LwA0m!k>+dkL4O5TNaUkY6}?|J0c7kw#s-KsAz zKkMXOpwhd)rPTSVmx6VH@tp#%S_*2hOH{&T;JFSYTwjP>*a6hKzDnTASeL@CjrC*K z&kA3n`wO|(<@%SAf0^qm2Ct3%#Pu!6HLsF)VcnM+pYB$lM}B?Lmx9;Dd*1E)K8C?= q>ABIGZ7ld(?~Q%Z1A+~Th#k_iqkrDnR@TaAdo|4Dv+b+H{?#9k73Pot literal 2860 zcmZoXF7x|s>Bdu!mR;!hdtzx<^~OySG6nkku17~T9eOnHP0ZAl4~pM!y>?u?Yqpc} zccp2X?~a`S333AkuPxZHWBG0gnZon?u6N6<)5_)Ozta`5e7Ce><8h|nZ!5O0(9zR; zcl2b`Ja)U^aXLjiR&G(UFVak!_a>(mD9Etycbsk(H#gAInaedc0u70V8Im?SoJXMcp#L-`Bu=v@G+qBG9RifKKJgoce6_HuYOYw>7hFm^U zuaoY&t(diaZq}@vy{jH&?u^?Y%AsR?n$ghDx5)jTzE}F z1enizJk9}!j96EB#-U@kwq0AWF=X52xTtkE=4YPHS-LuLBg}2p-#1o*q{?sZSi4DV zb>+2{%TC`~r#5@)YsP@4!!{d)MV|PC>TbC{L6D8#sPO<=!ciNyE!jy?qi%l))R+fGMqQL~30$_m;uNZEJxA8Yq8F zLu7w=G4l6K97t;Jw><5f)>ZdPam4!*?D0-kmcg6Aa9D&rE(Sv(@VX6B2&m)AG6)~Z z?EqyNLkC?&P_af{9Bo~lR7hkT!7L)V{H&c#Aa5d49i*VfpEq&W2(hq|4Oc!YKr00B z<)gc}OPl+!3JzyJ!eJ5iI4Z-Pk7^0zqdO$zqjKB@bveO;8iz&L^AVw-!&8}-qg6ey z!V_!BfX_z+^AW;F#N;DFafBxyAuNK_ad`6)zMvzRj}WPjh Date: Mon, 16 Apr 2018 14:11:12 +0200 Subject: [PATCH 11/12] Trying to fix yml --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4615a062..df974a87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,8 +152,7 @@ VS2017-32-bit-static-no-apps: artifacts: paths: - build-release/*.exe - - + VS2015-64-bit-shared-apps: variables: BUILD_PLATFORM: "VS2015" From 83336373f19dc010c0f84e5b148959a34b2fd5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 17 Apr 2018 08:15:37 +0200 Subject: [PATCH 12/12] Fixed VS2017 compiler path --- CI/Windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/Windows.bat b/CI/Windows.bat index e7e9a187..7e9d9d12 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -73,7 +73,7 @@ IF "%BUILD_PLATFORM%" == "VS2017" ( set LIBPATH=E:\libs\VS2017 set GTESTVERSION=gtest-1.7.0 set GENERATOR=Visual Studio 15%ARCH_VS% - set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 15.0\Common7\IDE\devenv.com" + set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\devenv.com" set QT_VERSION= IF "%ARCHITECTURE%" == "x64" (