From b5eda4ccea2c17714ca923b76cb8535335aaa995 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Mon, 13 May 2019 15:25:05 -0500 Subject: [PATCH 01/13] Create .appveyor.yml --- .appveyor.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 000000000..c719d12c2 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,39 @@ +image: Visual Studio 2017 + + +environment: + matrix: +# 32-bit + - VCVARS: vcvarsamd64_x86 + VCPKG_PLATFORM: x86-windows + VCPKG_BOOST_PLATFORM: x86-windows-static + LIBFUNC: http://access.osvr.com/binary/download/deps/libfunctionality/jobs/libfunc-win/BIT=32,VS=15,host=windows/42/libfunctionality-binary.7z +# 64-bit + - VCVARS: vcvars64 + VCPKG_PLATFORM: x64-windows + VCPKG_BOOST_PLATFORM: x64-windows-static + LIBFUNC: http://access.osvr.com/binary/download/deps/libfunctionality/jobs/libfunc-win/BIT=64,VS=15,host=windows/42/libfunctionality-binary.7z + +cache: + - c:\Tools\vcpkg\installed + +install: + - choco install -y ninja + # Add the libfunctionality port + - ps: >- + cd \tools\vcpkg\ports && + mkdir libfunctionality && + cd libfunctionality && + wget https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/CONTROL && + wget https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/portfile.cmake + - vcpkg install jsoncpp:%VCPKG_PLATFORM%-static opencv:%VCPKG_PLATFORM% libfunctionality:%VCPKG_PLATFORM% + - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date_time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive_ptr:%VCPKG_BOOST_PLATFORM% boost-lexical_cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type_traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% boost-version:%VCPKG_BOOST_PLATFORM% + + +build_script: +- cmd: >- + call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\%VCVARS%.bat" && + cmake -GNinja -Bbuild -H. -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe && + cd build && + ninja && + cd .. From 5fc3039d202195edcda2e570ed652c1bbf93bf68 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Mon, 13 May 2019 15:26:36 -0500 Subject: [PATCH 02/13] Update .appveyor.yml --- .appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c719d12c2..c9407bc22 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,10 +21,10 @@ install: - choco install -y ninja # Add the libfunctionality port - ps: >- - cd \tools\vcpkg\ports && - mkdir libfunctionality && - cd libfunctionality && - wget https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/CONTROL && + cd \tools\vcpkg\ports + mkdir libfunctionality + cd libfunctionality + wget https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/CONTROL wget https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/portfile.cmake - vcpkg install jsoncpp:%VCPKG_PLATFORM%-static opencv:%VCPKG_PLATFORM% libfunctionality:%VCPKG_PLATFORM% - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date_time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive_ptr:%VCPKG_BOOST_PLATFORM% boost-lexical_cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type_traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% boost-version:%VCPKG_BOOST_PLATFORM% From ed8e94252d6839a0fcc219c3309d7d8dfa0b6220 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Mon, 13 May 2019 15:28:14 -0500 Subject: [PATCH 03/13] Update .appveyor.yml --- .appveyor.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c9407bc22..88485ea5f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,12 +7,13 @@ environment: - VCVARS: vcvarsamd64_x86 VCPKG_PLATFORM: x86-windows VCPKG_BOOST_PLATFORM: x86-windows-static - LIBFUNC: http://access.osvr.com/binary/download/deps/libfunctionality/jobs/libfunc-win/BIT=32,VS=15,host=windows/42/libfunctionality-binary.7z + # LIBFUNC: http://access.osvr.com/binary/download/deps/libfunctionality/jobs/libfunc-win/BIT=32,VS=15,host=windows/42/libfunctionality-binary.7z + # 64-bit - VCVARS: vcvars64 VCPKG_PLATFORM: x64-windows VCPKG_BOOST_PLATFORM: x64-windows-static - LIBFUNC: http://access.osvr.com/binary/download/deps/libfunctionality/jobs/libfunc-win/BIT=64,VS=15,host=windows/42/libfunctionality-binary.7z + # LIBFUNC: http://access.osvr.com/binary/download/deps/libfunctionality/jobs/libfunc-win/BIT=64,VS=15,host=windows/42/libfunctionality-binary.7z cache: - c:\Tools\vcpkg\installed @@ -21,11 +22,11 @@ install: - choco install -y ninja # Add the libfunctionality port - ps: >- - cd \tools\vcpkg\ports - mkdir libfunctionality - cd libfunctionality - wget https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/CONTROL - wget https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/portfile.cmake + cd \tools\vcpkg\ports; + mkdir libfunctionality; + cd libfunctionality; + wget https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/CONTROL; + wget https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/portfile.cmake; - vcpkg install jsoncpp:%VCPKG_PLATFORM%-static opencv:%VCPKG_PLATFORM% libfunctionality:%VCPKG_PLATFORM% - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date_time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive_ptr:%VCPKG_BOOST_PLATFORM% boost-lexical_cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type_traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% boost-version:%VCPKG_BOOST_PLATFORM% From 50a1eed6baefdf1df2092a73481380c3c76769f6 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Mon, 13 May 2019 15:34:06 -0500 Subject: [PATCH 04/13] Update .appveyor.yml --- .appveyor.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 88485ea5f..472df3012 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,12 +21,9 @@ cache: install: - choco install -y ninja # Add the libfunctionality port - - ps: >- - cd \tools\vcpkg\ports; - mkdir libfunctionality; - cd libfunctionality; - wget https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/CONTROL; - wget https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/portfile.cmake; + - ps: mkdir \tools\vcpkg\ports\libfunctionality + - ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/CONTROL -OutFile \tools\vcpkg\ports\libfunctionality\CONTROL + - ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/portfile.cmake -OutFile \tools\vcpkg\ports\libfunctionality\portfile.cmake - vcpkg install jsoncpp:%VCPKG_PLATFORM%-static opencv:%VCPKG_PLATFORM% libfunctionality:%VCPKG_PLATFORM% - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date_time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive_ptr:%VCPKG_BOOST_PLATFORM% boost-lexical_cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type_traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% boost-version:%VCPKG_BOOST_PLATFORM% From 27804e4a13ac7a34d50309138352556e64798932 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Mon, 13 May 2019 15:34:48 -0500 Subject: [PATCH 05/13] Update .appveyor.yml --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 472df3012..25b5da766 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -19,6 +19,7 @@ cache: - c:\Tools\vcpkg\installed install: + - git submodule update --init --recursive - choco install -y ninja # Add the libfunctionality port - ps: mkdir \tools\vcpkg\ports\libfunctionality From 6a43268044b00893bea255ac826a7a2813fc4ad4 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Mon, 13 May 2019 15:41:22 -0500 Subject: [PATCH 06/13] Update .appveyor.yml --- .appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 25b5da766..f19c02d31 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,6 +17,8 @@ environment: cache: - c:\Tools\vcpkg\installed + - c:\Tools\vcpkg\packages + - c:\Tools\vcpkg\downloads install: - git submodule update --init --recursive @@ -26,7 +28,7 @@ install: - ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/CONTROL -OutFile \tools\vcpkg\ports\libfunctionality\CONTROL - ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/portfile.cmake -OutFile \tools\vcpkg\ports\libfunctionality\portfile.cmake - vcpkg install jsoncpp:%VCPKG_PLATFORM%-static opencv:%VCPKG_PLATFORM% libfunctionality:%VCPKG_PLATFORM% - - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date_time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive_ptr:%VCPKG_BOOST_PLATFORM% boost-lexical_cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type_traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% boost-version:%VCPKG_BOOST_PLATFORM% + - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date-time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive:%VCPKG_BOOST_PLATFORM% boost-lexical-cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-noncopyable:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type-traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% build_script: From 1827ed7b88281784adf88a588fdfa9323271ab88 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Mon, 13 May 2019 15:53:59 -0500 Subject: [PATCH 07/13] Update .appveyor.yml --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index f19c02d31..9667ca579 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -28,7 +28,7 @@ install: - ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/CONTROL -OutFile \tools\vcpkg\ports\libfunctionality\CONTROL - ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/portfile.cmake -OutFile \tools\vcpkg\ports\libfunctionality\portfile.cmake - vcpkg install jsoncpp:%VCPKG_PLATFORM%-static opencv:%VCPKG_PLATFORM% libfunctionality:%VCPKG_PLATFORM% - - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date-time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive:%VCPKG_BOOST_PLATFORM% boost-lexical-cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-noncopyable:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type-traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% + - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date-time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive:%VCPKG_BOOST_PLATFORM% boost-lexical-cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type-traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% build_script: From 05cdbdb474e7d6401940eb7ceb30660f5b655ede Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Mon, 13 May 2019 17:26:13 -0500 Subject: [PATCH 08/13] fix cache and boost prog options --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9667ca579..5f907e1b8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,6 +2,7 @@ image: Visual Studio 2017 environment: + APPVEYOR_SAVE_CACHE_ON_ERROR: true matrix: # 32-bit - VCVARS: vcvarsamd64_x86 @@ -28,7 +29,7 @@ install: - ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/CONTROL -OutFile \tools\vcpkg\ports\libfunctionality\CONTROL - ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/portfile.cmake -OutFile \tools\vcpkg\ports\libfunctionality\portfile.cmake - vcpkg install jsoncpp:%VCPKG_PLATFORM%-static opencv:%VCPKG_PLATFORM% libfunctionality:%VCPKG_PLATFORM% - - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date-time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive:%VCPKG_BOOST_PLATFORM% boost-lexical-cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type-traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% + - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date-time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive:%VCPKG_BOOST_PLATFORM% boost-lexical-cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type-traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% boost-program-options:%VCPKG_BOOST_PLATFORM% build_script: From 3f581954b706ba91b8f9274b66a3c606c175b1e6 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Tue, 14 May 2019 11:14:35 -0500 Subject: [PATCH 09/13] Update .appveyor.yml pause for rdp --- .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 5f907e1b8..b980707a0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,6 +30,8 @@ install: - ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/portfile.cmake -OutFile \tools\vcpkg\ports\libfunctionality\portfile.cmake - vcpkg install jsoncpp:%VCPKG_PLATFORM%-static opencv:%VCPKG_PLATFORM% libfunctionality:%VCPKG_PLATFORM% - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date-time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive:%VCPKG_BOOST_PLATFORM% boost-lexical-cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type-traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% boost-program-options:%VCPKG_BOOST_PLATFORM% + - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + build_script: From 6a2463387165065beac90b1913aa99236c20f9b4 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Tue, 14 May 2019 12:15:20 -0500 Subject: [PATCH 10/13] Update .appveyor.yml Don't re-install boost, fix search paths. --- .appveyor.yml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index b980707a0..b5cc7a99a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,19 +3,18 @@ image: Visual Studio 2017 environment: APPVEYOR_SAVE_CACHE_ON_ERROR: true + BOOST_VER: 1_69_0 matrix: # 32-bit - VCVARS: vcvarsamd64_x86 VCPKG_PLATFORM: x86-windows - VCPKG_BOOST_PLATFORM: x86-windows-static - # LIBFUNC: http://access.osvr.com/binary/download/deps/libfunctionality/jobs/libfunc-win/BIT=32,VS=15,host=windows/42/libfunctionality-binary.7z + # VCPKG_BOOST_PLATFORM: x86-windows-static # 64-bit - VCVARS: vcvars64 VCPKG_PLATFORM: x64-windows - VCPKG_BOOST_PLATFORM: x64-windows-static - # LIBFUNC: http://access.osvr.com/binary/download/deps/libfunctionality/jobs/libfunc-win/BIT=64,VS=15,host=windows/42/libfunctionality-binary.7z - + #VCPKG_BOOST_PLATFORM: x64-windows-static + cache: - c:\Tools\vcpkg\installed - c:\Tools\vcpkg\packages @@ -28,16 +27,22 @@ install: - ps: mkdir \tools\vcpkg\ports\libfunctionality - ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/CONTROL -OutFile \tools\vcpkg\ports\libfunctionality\CONTROL - ps: iwr https://raw.githubusercontent.com/rpavlik/vcpkg/openxr/ports/libfunctionality/portfile.cmake -OutFile \tools\vcpkg\ports\libfunctionality\portfile.cmake - - vcpkg install jsoncpp:%VCPKG_PLATFORM%-static opencv:%VCPKG_PLATFORM% libfunctionality:%VCPKG_PLATFORM% - - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date-time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive:%VCPKG_BOOST_PLATFORM% boost-lexical-cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type-traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% boost-program-options:%VCPKG_BOOST_PLATFORM% - - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + - vcpkg install jsoncpp:%VCPKG_PLATFORM% opencv:%VCPKG_PLATFORM% libfunctionality:%VCPKG_PLATFORM% sdl2:%VCPKG_PLATFORM% + # Grab a qedit header with an MIT license appended from an MS repo + - ps: iwr https://raw.githubusercontent.com/microsoft/MixedRealityCompanionKit/master/SpectatorView/Compositor/CompositorDLL/qedit.h -OutFile \projects\qedit.h + # - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date-time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive:%VCPKG_BOOST_PLATFORM% boost-lexical-cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type-traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% boost-program-options:%VCPKG_BOOST_PLATFORM% + # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) build_script: - cmd: >- call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\%VCVARS%.bat" && - cmake -GNinja -Bbuild -H. -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe && - cd build && - ninja && - cd .. + cmake -GNinja -Bbuild -H. + -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake + -DBUILD_TESTING=OFF + -DCMAKE_BUILD_TYPE=Release + -DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe + -DCMAKE_PREFIX_PATH=C:/Libraries/boost_%BOOST_VER%;C:/Tools/vcpkg/installed/%VCPKG_PLATFORM%;C:/projects && + -DVCPKG_TARGET_TRIPLET=%VCPKG_PLATFORM% + ninja -C build From 907b95838022e87901c6b21da97173a8b142b0d1 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Tue, 14 May 2019 16:24:22 -0500 Subject: [PATCH 11/13] Update .appveyor.yml Try line continuations --- .appveyor.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index b5cc7a99a..67ddc61bd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -38,11 +38,11 @@ install: build_script: - cmd: >- call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\%VCVARS%.bat" && - cmake -GNinja -Bbuild -H. - -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake - -DBUILD_TESTING=OFF - -DCMAKE_BUILD_TYPE=Release - -DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe - -DCMAKE_PREFIX_PATH=C:/Libraries/boost_%BOOST_VER%;C:/Tools/vcpkg/installed/%VCPKG_PLATFORM%;C:/projects && - -DVCPKG_TARGET_TRIPLET=%VCPKG_PLATFORM% + cmake -GNinja -Bbuild -H. \ + -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DBUILD_TESTING=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe \ + -DCMAKE_PREFIX_PATH=C:/Libraries/boost_%BOOST_VER%;C:/Tools/vcpkg/installed/%VCPKG_PLATFORM%;C:/projects \ + -DVCPKG_TARGET_TRIPLET=%VCPKG_PLATFORM% && ninja -C build From 66a594155e183b824fb70bd2535b5a0c014ce048 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Tue, 14 May 2019 16:42:41 -0500 Subject: [PATCH 12/13] Update .appveyor.yml Guess we need one long line. --- .appveyor.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 67ddc61bd..03f0bcaa2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -38,11 +38,5 @@ install: build_script: - cmd: >- call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\%VCVARS%.bat" && - cmake -GNinja -Bbuild -H. \ - -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake \ - -DBUILD_TESTING=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe \ - -DCMAKE_PREFIX_PATH=C:/Libraries/boost_%BOOST_VER%;C:/Tools/vcpkg/installed/%VCPKG_PLATFORM%;C:/projects \ - -DVCPKG_TARGET_TRIPLET=%VCPKG_PLATFORM% && + cmake -GNinja -Bbuild -H. -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe -DCMAKE_PREFIX_PATH=C:/Libraries/boost_%BOOST_VER%;C:/Tools/vcpkg/installed/%VCPKG_PLATFORM%;C:/projects -DVCPKG_TARGET_TRIPLET=%VCPKG_PLATFORM% && ninja -C build From c51857f750fb62514ae54e81476070210b67528d Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Mon, 20 May 2019 11:27:46 -0500 Subject: [PATCH 13/13] Update .appveyor.yml rdp for 64-bit --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 03f0bcaa2..56f7771f6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -31,7 +31,7 @@ install: # Grab a qedit header with an MIT license appended from an MS repo - ps: iwr https://raw.githubusercontent.com/microsoft/MixedRealityCompanionKit/master/SpectatorView/Compositor/CompositorDLL/qedit.h -OutFile \projects\qedit.h # - vcpkg install boost-algorithm:%VCPKG_BOOST_PLATFORM% boost-any:%VCPKG_BOOST_PLATFORM% boost-assert:%VCPKG_BOOST_PLATFORM% boost-chrono:%VCPKG_BOOST_PLATFORM% boost-date-time:%VCPKG_BOOST_PLATFORM% boost-filesystem:%VCPKG_BOOST_PLATFORM% boost-interprocess:%VCPKG_BOOST_PLATFORM% boost-intrusive:%VCPKG_BOOST_PLATFORM% boost-lexical-cast:%VCPKG_BOOST_PLATFORM% boost-locale:%VCPKG_BOOST_PLATFORM% boost-mpl:%VCPKG_BOOST_PLATFORM% boost-optional:%VCPKG_BOOST_PLATFORM% boost-range:%VCPKG_BOOST_PLATFORM% boost-thread:%VCPKG_BOOST_PLATFORM% boost-type-traits:%VCPKG_BOOST_PLATFORM% boost-units:%VCPKG_BOOST_PLATFORM% boost-utility:%VCPKG_BOOST_PLATFORM% boost-variant:%VCPKG_BOOST_PLATFORM% boost-program-options:%VCPKG_BOOST_PLATFORM% - # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + - ps: if ($env:VCPKG_PLATFORM -eq "x64-windows") {$blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))}