From b67405f48c69b354a60589590a4415e937309bc8 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Sat, 13 Aug 2016 10:36:29 +0200 Subject: [PATCH 01/18] Appveyor test Signed-off-by: Szczepan Zalega --- appveyor-build.py | 33 +++++++++++++++++++++++++++++++++ appveyor.yml | 26 ++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 appveyor-build.py create mode 100644 appveyor.yml diff --git a/appveyor-build.py b/appveyor-build.py new file mode 100644 index 00000000..3b747f3c --- /dev/null +++ b/appveyor-build.py @@ -0,0 +1,33 @@ +#!/usr/bin/env python +# Build the project on AppVeyor. + +import os +from subprocess import check_call + +build = os.environ['BUILD'] +config = os.environ['CONFIGURATION'] +platform = os.environ.get('PLATFORM') +path = os.environ['PATH'] +cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config] +if build == 'mingw': + cmake_command.append('-GMinGW Makefiles') + build_command = ['mingw32-make', '-j4'] + test_command = ['mingw32-make', 'test'] + # Remove the path to Git bin directory from $PATH because it breaks + # MinGW config. + path = path.replace(r'C:\Program Files (x86)\Git\bin', '') + os.environ['PATH'] = r'C:\MinGW\bin;' + path +else: + # Add MSBuild 14.0 to PATH as described in + # http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc. + os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\14.0\Bin;' + path + generator = 'Visual Studio 14 2015' + if platform == 'x64': + generator += ' Win64' + cmake_command.append('-G' + generator) + build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:4'] + test_command = ['ctest', '-C', config] + +check_call(cmake_command) +check_call(build_command) +check_call(test_command) diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..a651c525 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,26 @@ +configuration: + - Debug + - Release + +environment: + CTEST_OUTPUT_ON_FAILURE: 1 + matrix: + - BUILD: msvc + - BUILD: msvc + PLATFORM: x64 + - BUILD: mingw + +before_build: + # Workaround for CMake not wanting sh.exe on PATH for MinGW. + - set PATH=%PATH:C:\Program Files\Git\usr\bin;=% + +build_script: + - python support/appveyor-build.py + +on_failure: + - appveyor PushArtifact Testing/Temporary/LastTest.log + - appveyor AddTest test + +# Uncomment this to debug AppVeyor failures. +#on_finish: +# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) From 73b2a016cf30d10461aac47c66fd567b6e2b85f1 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Sat, 13 Aug 2016 10:38:58 +0200 Subject: [PATCH 02/18] Move build script to separate directory Signed-off-by: Szczepan Zalega --- appveyor-build.py => support/appveyor-build.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename appveyor-build.py => support/appveyor-build.py (100%) diff --git a/appveyor-build.py b/support/appveyor-build.py similarity index 100% rename from appveyor-build.py rename to support/appveyor-build.py From 9553e94996757ce9261906dede34a3029eb56190 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 17 Oct 2017 18:27:04 +0200 Subject: [PATCH 03/18] Forcing build Signed-off-by: Szczepan Zalega --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index a651c525..2903574c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,3 +24,4 @@ on_failure: # Uncomment this to debug AppVeyor failures. #on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +# update \ No newline at end of file From 0607c30041967f7ea372c6ad7cd5e24fc69de019 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 17 Oct 2017 19:38:38 +0200 Subject: [PATCH 04/18] Add qmake compilation Signed-off-by: Szczepan Zalega --- appveyor.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 2903574c..4d3117b1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,12 +9,20 @@ environment: - BUILD: msvc PLATFORM: x64 - BUILD: mingw + - install: + - set QTDIR=C:\Qt\5.5\mingw492_32 + - set PATH=%PATH%;%QTDIR%\bin;C:\MinGW\bin + build_script: + - git submodule update --init --recursive + - qmake . + - mingw32-make before_build: # Workaround for CMake not wanting sh.exe on PATH for MinGW. - set PATH=%PATH:C:\Program Files\Git\usr\bin;=% build_script: + - git submodule update --init --recursive - python support/appveyor-build.py on_failure: From 311e1c06a77674589e7ca81fae489aa524dfbad3 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 17 Oct 2017 19:58:46 +0200 Subject: [PATCH 05/18] string issue Signed-off-by: Szczepan Zalega --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4d3117b1..9cdd1464 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,8 +10,8 @@ environment: PLATFORM: x64 - BUILD: mingw - install: - - set QTDIR=C:\Qt\5.5\mingw492_32 - - set PATH=%PATH%;%QTDIR%\bin;C:\MinGW\bin + - 'set QTDIR=C:\Qt\5.5\mingw492_32' + - 'set PATH=%PATH%;%QTDIR%\bin;C:\MinGW\bin' build_script: - git submodule update --init --recursive - qmake . From 15c5b841331fc0d38b95800ff7fd16435708fb3f Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 17 Oct 2017 20:03:15 +0200 Subject: [PATCH 06/18] string issue Signed-off-by: Szczepan Zalega --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9cdd1464..880c4753 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,8 +10,8 @@ environment: PLATFORM: x64 - BUILD: mingw - install: - - 'set QTDIR=C:\Qt\5.5\mingw492_32' - - 'set PATH=%PATH%;%QTDIR%\bin;C:\MinGW\bin' + - set QTDIR=C:\Qt\5.9.1\mingw53_32 + - set PATH="%PATH%;%QTDIR%\bin;C:\MinGW\bin" build_script: - git submodule update --init --recursive - qmake . @@ -20,6 +20,7 @@ environment: before_build: # Workaround for CMake not wanting sh.exe on PATH for MinGW. - set PATH=%PATH:C:\Program Files\Git\usr\bin;=% + - git submodule update --init --recursive build_script: - git submodule update --init --recursive From ea81f8ae6a5b3fc940827ab9e3224519e21b2b8c Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 17 Oct 2017 20:06:48 +0200 Subject: [PATCH 07/18] string issue Signed-off-by: Szczepan Zalega --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 880c4753..b813a061 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,9 +9,8 @@ environment: - BUILD: msvc PLATFORM: x64 - BUILD: mingw - - install: - - set QTDIR=C:\Qt\5.9.1\mingw53_32 - - set PATH="%PATH%;%QTDIR%\bin;C:\MinGW\bin" + QTDIR: C:\Qt\5.9.1\mingw53_32 + PATH : %PATH%;%QTDIR%\bin;C:\MinGW\bin build_script: - git submodule update --init --recursive - qmake . From 2649edc65cc71e3d4f627d960c7da529aeefb92a Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 17 Oct 2017 20:15:42 +0200 Subject: [PATCH 08/18] string issue 2 Signed-off-by: Szczepan Zalega --- appveyor.yml | 14 +++++--------- support/appveyor-build.py | 6 +++++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b813a061..f168abeb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,22 +9,18 @@ environment: - BUILD: msvc PLATFORM: x64 - BUILD: mingw + - BUILD: qmake QTDIR: C:\Qt\5.9.1\mingw53_32 - PATH : %PATH%;%QTDIR%\bin;C:\MinGW\bin - build_script: - - git submodule update --init --recursive - - qmake . - - mingw32-make + PATH : '%PATH%;%QTDIR%\bin;C:\MinGW\bin' + +build_script: + - python support/appveyor-build.py before_build: # Workaround for CMake not wanting sh.exe on PATH for MinGW. - set PATH=%PATH:C:\Program Files\Git\usr\bin;=% - git submodule update --init --recursive -build_script: - - git submodule update --init --recursive - - python support/appveyor-build.py - on_failure: - appveyor PushArtifact Testing/Temporary/LastTest.log - appveyor AddTest test diff --git a/support/appveyor-build.py b/support/appveyor-build.py index 3b747f3c..b1286d10 100644 --- a/support/appveyor-build.py +++ b/support/appveyor-build.py @@ -17,6 +17,10 @@ # MinGW config. path = path.replace(r'C:\Program Files (x86)\Git\bin', '') os.environ['PATH'] = r'C:\MinGW\bin;' + path +elif build == 'qmake': + cmake_command = ['qmake', '.'] + build_command = ['mingw32-make', '-j2'] + test_command = ['true'] else: # Add MSBuild 14.0 to PATH as described in # http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc. @@ -26,7 +30,7 @@ generator += ' Win64' cmake_command.append('-G' + generator) build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:4'] - test_command = ['ctest', '-C', config] + test_command = ['ctest', '-C', contest_commandfig] check_call(cmake_command) check_call(build_command) From e44e5f07b4366a281232c3a490182b5e1f31c5f5 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 17 Oct 2017 21:05:04 +0200 Subject: [PATCH 09/18] update Signed-off-by: Szczepan Zalega --- support/appveyor-build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/appveyor-build.py b/support/appveyor-build.py index b1286d10..0c06e43c 100644 --- a/support/appveyor-build.py +++ b/support/appveyor-build.py @@ -30,7 +30,7 @@ generator += ' Win64' cmake_command.append('-G' + generator) build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:4'] - test_command = ['ctest', '-C', contest_commandfig] + test_command = ['ctest', '-C', config] check_call(cmake_command) check_call(build_command) From 1d14fe6c7725bbd7a9e54c7ca74730d05b654308 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 17 Oct 2017 21:16:03 +0200 Subject: [PATCH 10/18] cmake paths Signed-off-by: Szczepan Zalega --- support/appveyor-build.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/support/appveyor-build.py b/support/appveyor-build.py index 0c06e43c..21ed7b64 100644 --- a/support/appveyor-build.py +++ b/support/appveyor-build.py @@ -9,9 +9,11 @@ platform = os.environ.get('PLATFORM') path = os.environ['PATH'] cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config] + if build == 'mingw': cmake_command.append('-GMinGW Makefiles') - build_command = ['mingw32-make', '-j4'] + cmake_command.append('-DCMAKE_PREFIX_PATH="C:\\Qt\\5.9.1\\mingw53_32\\"') + build_command = ['mingw32-make', '-j2'] test_command = ['mingw32-make', 'test'] # Remove the path to Git bin directory from $PATH because it breaks # MinGW config. @@ -29,7 +31,8 @@ if platform == 'x64': generator += ' Win64' cmake_command.append('-G' + generator) - build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:4'] + cmake_command.append('-DCMAKE_PREFIX_PATH="C:\\Qt\\5.9.1\\msvc2015\\"') + build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:2'] test_command = ['ctest', '-C', config] check_call(cmake_command) From 92390f585cbd25bb9c9d72b0ebf1d0d0889e6f19 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Wed, 18 Oct 2017 09:02:52 +0200 Subject: [PATCH 11/18] mingw flags update Signed-off-by: Szczepan Zalega --- nitrokey-app-qt5.pro | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nitrokey-app-qt5.pro b/nitrokey-app-qt5.pro index 4733de70..b468a686 100644 --- a/nitrokey-app-qt5.pro +++ b/nitrokey-app-qt5.pro @@ -3,6 +3,11 @@ CONFIG += qt c++14 debug QT += core gui widgets +win32-g++ { + QMAKE_CXXFLAGS_CXX14 = -std=c++14 + QMAKE_CXXFLAGS_GNUCXX14 = -std=c++14 +} + target.path = /usr/local/bin desktop.path = /usr/share/applications desktop.files += nitrokey-app.desktop From 6b602ebdad0ae648009b88e968a797d18013df56 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Wed, 18 Oct 2017 09:26:31 +0200 Subject: [PATCH 12/18] cmake paths and mingw64 Signed-off-by: Szczepan Zalega --- appveyor.yml | 5 +++-- support/appveyor-build.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f168abeb..116101f6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,8 @@ environment: - BUILD: mingw - BUILD: qmake QTDIR: C:\Qt\5.9.1\mingw53_32 - PATH : '%PATH%;%QTDIR%\bin;C:\MinGW\bin' + # PATH : '%PATH%;%QTDIR%\bin;C:\MinGW\bin' + PATH : '%PATH%;%QTDIR%\bin;C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\bin' build_script: - python support/appveyor-build.py @@ -28,4 +29,4 @@ on_failure: # Uncomment this to debug AppVeyor failures. #on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) -# update \ No newline at end of file +# update diff --git a/support/appveyor-build.py b/support/appveyor-build.py index 21ed7b64..eb3c847f 100644 --- a/support/appveyor-build.py +++ b/support/appveyor-build.py @@ -12,7 +12,7 @@ if build == 'mingw': cmake_command.append('-GMinGW Makefiles') - cmake_command.append('-DCMAKE_PREFIX_PATH="C:\\Qt\\5.9.1\\mingw53_32\\"') + cmake_command.append('-DCMAKE_PREFIX_PATH="C:\\Qt\\5.9.1\\mingw53_32\\lib\\cmake\\"') build_command = ['mingw32-make', '-j2'] test_command = ['mingw32-make', 'test'] # Remove the path to Git bin directory from $PATH because it breaks @@ -31,7 +31,7 @@ if platform == 'x64': generator += ' Win64' cmake_command.append('-G' + generator) - cmake_command.append('-DCMAKE_PREFIX_PATH="C:\\Qt\\5.9.1\\msvc2015\\"') + cmake_command.append('-DCMAKE_PREFIX_PATH="C:\\Qt\\5.9.1\\msvc2015\\lib\\cmake\\"') build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:2'] test_command = ['ctest', '-C', config] From e2be9895536c14083be5627bd46048ba88697ed4 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Wed, 18 Oct 2017 09:42:53 +0200 Subject: [PATCH 13/18] cmake paths and mingw64 2 Signed-off-by: Szczepan Zalega --- CMakeLists.txt | 4 ++++ support/appveyor-build.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2720dcb2..9a2b97d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,10 @@ IF(UNIX) ENDIF() ENDIF() +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} + ${CMAKE_USER_MOD_PATH} + $ENV{CMAKE_USER_MOD_PATH} +) #add CMake build info ADD_DEFINITIONS(-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}") diff --git a/support/appveyor-build.py b/support/appveyor-build.py index eb3c847f..e080ac35 100644 --- a/support/appveyor-build.py +++ b/support/appveyor-build.py @@ -12,7 +12,7 @@ if build == 'mingw': cmake_command.append('-GMinGW Makefiles') - cmake_command.append('-DCMAKE_PREFIX_PATH="C:\\Qt\\5.9.1\\mingw53_32\\lib\\cmake\\"') + cmake_command.append('-DCMAKE_USER_MOD_PATH="C:\\Qt\\5.9.1\\mingw53_32\\lib\\cmake\\"') build_command = ['mingw32-make', '-j2'] test_command = ['mingw32-make', 'test'] # Remove the path to Git bin directory from $PATH because it breaks @@ -31,7 +31,7 @@ if platform == 'x64': generator += ' Win64' cmake_command.append('-G' + generator) - cmake_command.append('-DCMAKE_PREFIX_PATH="C:\\Qt\\5.9.1\\msvc2015\\lib\\cmake\\"') + cmake_command.append('-DCMAKE_USER_MOD_PATH="C:\\Qt\\5.9.1\\msvc2015\\lib\\cmake\\"') build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:2'] test_command = ['ctest', '-C', config] From f09874bb764c4f575c9bfa79152eb0fb0c1686ba Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Wed, 18 Oct 2017 09:50:56 +0200 Subject: [PATCH 14/18] remove quotes Signed-off-by: Szczepan Zalega --- support/appveyor-build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/appveyor-build.py b/support/appveyor-build.py index e080ac35..edfcb6e2 100644 --- a/support/appveyor-build.py +++ b/support/appveyor-build.py @@ -12,7 +12,7 @@ if build == 'mingw': cmake_command.append('-GMinGW Makefiles') - cmake_command.append('-DCMAKE_USER_MOD_PATH="C:\\Qt\\5.9.1\\mingw53_32\\lib\\cmake\\"') + cmake_command.append('-DCMAKE_USER_MOD_PATH=C:\\Qt\\5.9.1\\mingw53_32\\lib\\cmake\\') build_command = ['mingw32-make', '-j2'] test_command = ['mingw32-make', 'test'] # Remove the path to Git bin directory from $PATH because it breaks @@ -31,7 +31,7 @@ if platform == 'x64': generator += ' Win64' cmake_command.append('-G' + generator) - cmake_command.append('-DCMAKE_USER_MOD_PATH="C:\\Qt\\5.9.1\\msvc2015\\lib\\cmake\\"') + cmake_command.append('-DCMAKE_USER_MOD_PATH=C:\\Qt\\5.9.1\\msvc2015\\lib\\cmake\\') build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:2'] test_command = ['ctest', '-C', config] From c75524c6fe65b289c0e4524c22781a0c0402825a Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Wed, 18 Oct 2017 09:55:51 +0200 Subject: [PATCH 15/18] remove multiple lines Signed-off-by: Szczepan Zalega --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a2b97d7..308f266c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,10 +25,7 @@ IF(UNIX) ENDIF() ENDIF() -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} - ${CMAKE_USER_MOD_PATH} - $ENV{CMAKE_USER_MOD_PATH} -) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_USER_MOD_PATH} $ENV{CMAKE_USER_MOD_PATH}) #add CMake build info ADD_DEFINITIONS(-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}") From 078de7a31e4953d54c3020f93d6072034dc95af1 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Wed, 18 Oct 2017 10:04:49 +0200 Subject: [PATCH 16/18] remove ending slash, show paths Signed-off-by: Szczepan Zalega --- CMakeLists.txt | 1 + support/appveyor-build.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 308f266c..5165030a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ IF(UNIX) ENDIF() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_USER_MOD_PATH} $ENV{CMAKE_USER_MOD_PATH}) +MESSAGE("${CMAKE_MODULE_PATH}") #add CMake build info ADD_DEFINITIONS(-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}") diff --git a/support/appveyor-build.py b/support/appveyor-build.py index edfcb6e2..563bc7d4 100644 --- a/support/appveyor-build.py +++ b/support/appveyor-build.py @@ -12,7 +12,7 @@ if build == 'mingw': cmake_command.append('-GMinGW Makefiles') - cmake_command.append('-DCMAKE_USER_MOD_PATH=C:\\Qt\\5.9.1\\mingw53_32\\lib\\cmake\\') + cmake_command.append('-DCMAKE_USER_MOD_PATH=C:\\Qt\\5.9.1\\mingw53_32\\lib\\cmake') build_command = ['mingw32-make', '-j2'] test_command = ['mingw32-make', 'test'] # Remove the path to Git bin directory from $PATH because it breaks @@ -31,7 +31,7 @@ if platform == 'x64': generator += ' Win64' cmake_command.append('-G' + generator) - cmake_command.append('-DCMAKE_USER_MOD_PATH=C:\\Qt\\5.9.1\\msvc2015\\lib\\cmake\\') + cmake_command.append('-DCMAKE_USER_MOD_PATH=C:\\Qt\\5.9.1\\msvc2015\\lib\\cmake') build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:2'] test_command = ['ctest', '-C', config] From 318deb114f3f790af33b85874d2b614ecc2c8512 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Wed, 18 Oct 2017 10:07:36 +0200 Subject: [PATCH 17/18] make double escape Signed-off-by: Szczepan Zalega --- support/appveyor-build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/appveyor-build.py b/support/appveyor-build.py index 563bc7d4..91e5cb91 100644 --- a/support/appveyor-build.py +++ b/support/appveyor-build.py @@ -12,7 +12,7 @@ if build == 'mingw': cmake_command.append('-GMinGW Makefiles') - cmake_command.append('-DCMAKE_USER_MOD_PATH=C:\\Qt\\5.9.1\\mingw53_32\\lib\\cmake') + cmake_command.append(r'-DCMAKE_USER_MOD_PATH=C:\\Qt\\5.9.1\\mingw53_32\\lib\\cmake') build_command = ['mingw32-make', '-j2'] test_command = ['mingw32-make', 'test'] # Remove the path to Git bin directory from $PATH because it breaks @@ -31,7 +31,7 @@ if platform == 'x64': generator += ' Win64' cmake_command.append('-G' + generator) - cmake_command.append('-DCMAKE_USER_MOD_PATH=C:\\Qt\\5.9.1\\msvc2015\\lib\\cmake') + cmake_command.append(r'-DCMAKE_USER_MOD_PATH=C:\\Qt\\5.9.1\\msvc2015\\lib\\cmake') build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:2'] test_command = ['ctest', '-C', config] From 21bf29bd8dc0c929af63b3bbf559b1f8384fbf6f Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Wed, 18 Oct 2017 10:22:39 +0200 Subject: [PATCH 18/18] update Signed-off-by: Szczepan Zalega --- support/appveyor-build.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/support/appveyor-build.py b/support/appveyor-build.py index 91e5cb91..a4d93b5e 100644 --- a/support/appveyor-build.py +++ b/support/appveyor-build.py @@ -12,13 +12,13 @@ if build == 'mingw': cmake_command.append('-GMinGW Makefiles') - cmake_command.append(r'-DCMAKE_USER_MOD_PATH=C:\\Qt\\5.9.1\\mingw53_32\\lib\\cmake') + cmake_command.append(r'-DCMAKE_USER_MOD_PATH=C:/Qt/5.9.1/mingw53_32/lib/cmake') build_command = ['mingw32-make', '-j2'] test_command = ['mingw32-make', 'test'] # Remove the path to Git bin directory from $PATH because it breaks # MinGW config. - path = path.replace(r'C:\Program Files (x86)\Git\bin', '') - os.environ['PATH'] = r'C:\MinGW\bin;' + path + path = path.replace(r'C:/Program Files (x86)/Git/bin', '') + #os.environ['PATH'] = r'C:/MinGW/bin;' + path elif build == 'qmake': cmake_command = ['qmake', '.'] build_command = ['mingw32-make', '-j2'] @@ -26,12 +26,12 @@ else: # Add MSBuild 14.0 to PATH as described in # http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc. - os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\14.0\Bin;' + path + os.environ['PATH'] = r'C:/Program Files (x86)/MSBuild/14.0/Bin;' + path generator = 'Visual Studio 14 2015' if platform == 'x64': generator += ' Win64' cmake_command.append('-G' + generator) - cmake_command.append(r'-DCMAKE_USER_MOD_PATH=C:\\Qt\\5.9.1\\msvc2015\\lib\\cmake') + cmake_command.append(r'-DCMAKE_USER_MOD_PATH=C:/Qt/5.9.1/msvc2015/lib/cmake') build_command = ['cmake', '--build', '.', '--config', config, '--', '/m:2'] test_command = ['ctest', '-C', config]