From 42310c79021301b689fd91da4cec4f2073c2f962 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Sun, 3 May 2020 00:56:38 +0200 Subject: [PATCH] [AppVeyor] Add VS2019 to CI Signed-off-by: Vitalii Koshura --- .../{ => ports}/rappture/CMakeLists.txt | 0 .../vcpkg_ports/{ => ports}/rappture/CONTROL | 0 .../vcpkg_ports/{ => ports}/rappture/config.h | 0 .../{ => ports}/rappture/fixBuild.patch | 0 .../{ => ports}/rappture/portfile.cmake | 0 .../vcpkg_ports/{ => ports}/rappture/unistd.h | 0 .../triplets/ci/x64-windows-static.cmake | 6 ++++ .../triplets/default/x64-windows-static.cmake | 5 ++++ appveyor.yml | 29 +++++++++++++++---- .../vcpkg_3rdparty_dependencies_2019.vcxproj | 17 +++-------- 10 files changed, 39 insertions(+), 18 deletions(-) rename 3rdParty/vcpkg_ports/{ => ports}/rappture/CMakeLists.txt (100%) rename 3rdParty/vcpkg_ports/{ => ports}/rappture/CONTROL (100%) rename 3rdParty/vcpkg_ports/{ => ports}/rappture/config.h (100%) rename 3rdParty/vcpkg_ports/{ => ports}/rappture/fixBuild.patch (100%) rename 3rdParty/vcpkg_ports/{ => ports}/rappture/portfile.cmake (100%) rename 3rdParty/vcpkg_ports/{ => ports}/rappture/unistd.h (100%) create mode 100644 3rdParty/vcpkg_ports/triplets/ci/x64-windows-static.cmake create mode 100644 3rdParty/vcpkg_ports/triplets/default/x64-windows-static.cmake diff --git a/3rdParty/vcpkg_ports/rappture/CMakeLists.txt b/3rdParty/vcpkg_ports/ports/rappture/CMakeLists.txt similarity index 100% rename from 3rdParty/vcpkg_ports/rappture/CMakeLists.txt rename to 3rdParty/vcpkg_ports/ports/rappture/CMakeLists.txt diff --git a/3rdParty/vcpkg_ports/rappture/CONTROL b/3rdParty/vcpkg_ports/ports/rappture/CONTROL similarity index 100% rename from 3rdParty/vcpkg_ports/rappture/CONTROL rename to 3rdParty/vcpkg_ports/ports/rappture/CONTROL diff --git a/3rdParty/vcpkg_ports/rappture/config.h b/3rdParty/vcpkg_ports/ports/rappture/config.h similarity index 100% rename from 3rdParty/vcpkg_ports/rappture/config.h rename to 3rdParty/vcpkg_ports/ports/rappture/config.h diff --git a/3rdParty/vcpkg_ports/rappture/fixBuild.patch b/3rdParty/vcpkg_ports/ports/rappture/fixBuild.patch similarity index 100% rename from 3rdParty/vcpkg_ports/rappture/fixBuild.patch rename to 3rdParty/vcpkg_ports/ports/rappture/fixBuild.patch diff --git a/3rdParty/vcpkg_ports/rappture/portfile.cmake b/3rdParty/vcpkg_ports/ports/rappture/portfile.cmake similarity index 100% rename from 3rdParty/vcpkg_ports/rappture/portfile.cmake rename to 3rdParty/vcpkg_ports/ports/rappture/portfile.cmake diff --git a/3rdParty/vcpkg_ports/rappture/unistd.h b/3rdParty/vcpkg_ports/ports/rappture/unistd.h similarity index 100% rename from 3rdParty/vcpkg_ports/rappture/unistd.h rename to 3rdParty/vcpkg_ports/ports/rappture/unistd.h diff --git a/3rdParty/vcpkg_ports/triplets/ci/x64-windows-static.cmake b/3rdParty/vcpkg_ports/triplets/ci/x64-windows-static.cmake new file mode 100644 index 0000000000..82170dd034 --- /dev/null +++ b/3rdParty/vcpkg_ports/triplets/ci/x64-windows-static.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CXX_FLAGS /Qspectre) +set(VCPKG_C_FLAGS /Qspectre) +set(VCPKG_BUILD_TYPE release) diff --git a/3rdParty/vcpkg_ports/triplets/default/x64-windows-static.cmake b/3rdParty/vcpkg_ports/triplets/default/x64-windows-static.cmake new file mode 100644 index 0000000000..08aa2e9441 --- /dev/null +++ b/3rdParty/vcpkg_ports/triplets/default/x64-windows-static.cmake @@ -0,0 +1,5 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) +set(VCPKG_CXX_FLAGS /Qspectre) +set(VCPKG_C_FLAGS /Qspectre) diff --git a/appveyor.yml b/appveyor.yml index 80373fbbee..1bc24481a0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,23 @@ # NOTE: settings in this file have precedence over settings on the website -image: Visual Studio 2013 +image: + - Visual Studio 2013 + - Visual Studio 2019 matrix: fast_finish: true exclude: - platform: x64 TOOLCHAIN_VERSION: 10.0 + - platform: Win32 + TOOLCHAIN_VERSION: 10.0 + image: Visual Studio 2019 + - TOOLCHAIN_VERSION: 12.0 + image: Visual Studio 2019 + - platform: Win32 + TOOLCHAIN_VERSION: 16.0 + - platform: x64 + TOOLCHAIN_VERSION: 16.0 + image: Visual Studio 2013 platform: - Win32 @@ -66,11 +78,13 @@ environment: - TOOLCHAIN_VERSION: 10.0 solution_name: win_build\boinc_vs2010.sln depends_zip_path: https://boinc.berkeley.edu/dl/boinc_depends/boinc_depends_win_vs2010.zip - depends_path: C:\projects\boinc_depends_win_vs2010 + depends_path: C:\projects\boinc_depends_win_vs2010 - TOOLCHAIN_VERSION: 12.0 solution_name: win_build\boinc_vs2013.sln depends_zip_path: https://boinc.berkeley.edu/dl/boinc_depends/boinc_depends_win_vs2013.zip depends_path: C:\projects\boinc_depends_win_vs2013 + - TOOLCHAIN_VERSION: 16.0 + solution_name: win_build\boinc_vs2019.sln BINTRAY_API_KEY: secure: kZI9k0Kh2bFSCbXfkz+J16fGNAee1ToRMl10D8QPQsKpC2PqhF/uVMpd6gRC+OSI APPVEYOR_CACHE_ENTRY_ZIP_ARGS: "-t7z -m0=lzma2 -mx=9 -ms=on" @@ -80,14 +94,16 @@ cache: - C:\projects\boinc_depends_win_vs2010 -> appveyor.yml, win_build\load_dependencies.bat before_build: - - call win_build\load_dependencies.bat %depends_zip_path% %depends_path% %platform% %configuration% + - if %TOOLCHAIN_VERSION%==10.0 call win_build\load_dependencies.bat %depends_zip_path% %depends_path% %platform% %configuration% + - if %TOOLCHAIN_VERSION%==12.0 call win_build\load_dependencies.bat %depends_zip_path% %depends_path% %platform% %configuration% - if %TOOLCHAIN_VERSION%==10.0 call "%VS100COMNTOOLS%\vsvars32.bat" - - if %TOOLCHAIN_VERSION%==10.0 git apply boinc_vs2010.sln.ci.patch + - if %TOOLCHAIN_VERSION%==10.0 call git apply boinc_vs2010.sln.ci.patch - if %TOOLCHAIN_VERSION%==12.0 call "%VS120COMNTOOLS%\vsvars32.bat" - if %TOOLCHAIN_VERSION%==12.0 call rmdir /S /Q %localappdata%\Microsoft\VisualStudio\%TOOLCHAIN_VERSION%\ComponentModelCache + - if %TOOLCHAIN_VERSION%==16.0 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\vsdevcmd.bat" build_script: - - msbuild %solution_name% /p:Configuration=%configuration%;Platform=%platform% + - msbuild %solution_name% /p:Configuration=%configuration%;Platform=%platform%;VcpkgTripletConfig=ci -m after_build: - if %TOOLCHAIN_VERSION%==12.0 call deploy\prepare_deployment.bat @@ -102,3 +118,6 @@ artifacts: name: win-manager test: off + +# on_finish: +# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) diff --git a/win_build/vcpkg_3rdparty_dependencies_2019.vcxproj b/win_build/vcpkg_3rdparty_dependencies_2019.vcxproj index fc89a04857..f8ff5eca9c 100644 --- a/win_build/vcpkg_3rdparty_dependencies_2019.vcxproj +++ b/win_build/vcpkg_3rdparty_dependencies_2019.vcxproj @@ -15,6 +15,7 @@ 16.0 {D3E5B5B5-4FB1-4877-9B2C-6708B3D568F7} vcpkg3rdpartydependencies + default @@ -103,17 +104,7 @@ - - - - - - - - - - - - + + - \ No newline at end of file +