Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #3674 from AenBleidd/add_vs2010_to_ci 

[AppVeyor] Add VS2010 and VS2019 to CI
This commit is contained in:
Kevin Reed 2020-05-11 09:31:22 -05:00 committed by GitHub
parent 8a75eb80c2 42310c7902
commit 4da0115aa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 83 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
3rdParty/vcpkg_ports/rappture/CMakeLists.txt → 3rdParty/vcpkg_ports/ports/rappture/CMakeLists.txt vendored
View File

0
3rdParty/vcpkg_ports/rappture/CONTROL → 3rdParty/vcpkg_ports/ports/rappture/CONTROL vendored
View File

0
3rdParty/vcpkg_ports/rappture/config.h → 3rdParty/vcpkg_ports/ports/rappture/config.h vendored
View File

0
3rdParty/vcpkg_ports/rappture/fixBuild.patch → 3rdParty/vcpkg_ports/ports/rappture/fixBuild.patch vendored
View File

0
3rdParty/vcpkg_ports/rappture/portfile.cmake → 3rdParty/vcpkg_ports/ports/rappture/portfile.cmake vendored
View File

0
3rdParty/vcpkg_ports/rappture/unistd.h → 3rdParty/vcpkg_ports/ports/rappture/unistd.h vendored
View File

6
3rdParty/vcpkg_ports/triplets/ci/x64-windows-static.cmake vendored Normal file
View File

@ -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)

5
3rdParty/vcpkg_ports/triplets/default/x64-windows-static.cmake vendored Normal file
View File

@ -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)

39
appveyor.yml
View File

@ -1,8 +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
@ -60,28 +75,39 @@ configuration:
environment:
matrix:
- 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
- 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"
cache:
- C:\projects\boinc_depends_win_vs2013 -> appveyor.yml, win_build\load_dependencies.bat
- 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 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:
- call deploy\prepare_deployment.bat
- call deploy\deploy_to_bintray.bat
- if %TOOLCHAIN_VERSION%==12.0 call deploy\prepare_deployment.bat
- if %TOOLCHAIN_VERSION%==12.0 call deploy\deploy_to_bintray.bat
artifacts:
- path: deploy\win-apps\*.7z
@ -92,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'))

34
boinc_vs2010.sln.ci.patch Normal file
View File

@ -0,0 +1,34 @@
diff --git a/win_build/boinc_vs2010.sln b/win_build/boinc_vs2010.sln
index 58cca98d8a..b3e4bc7b57 100644
--- a/win_build/boinc_vs2010.sln
+++ b/win_build/boinc_vs2010.sln
@@ -500,9 +500,7 @@ Global
{F243B93C-73CB-44E7-9BDC-847BB95C27CA}.EmuRelease|x64.ActiveCfg = Release|x64
{F243B93C-73CB-44E7-9BDC-847BB95C27CA}.EmuRelease|x64.Build.0 = Release|x64
{F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Release|Win32.ActiveCfg = Release|Win32
- {F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Release|Win32.Build.0 = Release|Win32
{F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Release|x64.ActiveCfg = Release|x64
- {F243B93C-73CB-44E7-9BDC-847BB95C27CA}.Release|x64.Build.0 = Release|x64
{D9AF7F68-B881-45B1-A41C-B10E61D764EF}.Debug|Win32.ActiveCfg = Debug|Win32
{D9AF7F68-B881-45B1-A41C-B10E61D764EF}.Debug|x64.ActiveCfg = Debug|x64
{D9AF7F68-B881-45B1-A41C-B10E61D764EF}.EmuDebug|Win32.ActiveCfg = Release|Win32
@@ -606,9 +604,7 @@ Global
{25662612-421F-42F5-B5E1-D69ECBF3F5BB}.EmuRelease|x64.ActiveCfg = Release|x64
{25662612-421F-42F5-B5E1-D69ECBF3F5BB}.EmuRelease|x64.Build.0 = Release|x64
{25662612-421F-42F5-B5E1-D69ECBF3F5BB}.Release|Win32.ActiveCfg = Release|Win32
- {25662612-421F-42F5-B5E1-D69ECBF3F5BB}.Release|Win32.Build.0 = Release|Win32
{25662612-421F-42F5-B5E1-D69ECBF3F5BB}.Release|x64.ActiveCfg = Release|x64
- {25662612-421F-42F5-B5E1-D69ECBF3F5BB}.Release|x64.Build.0 = Release|x64
{49723CA5-DA05-43C0-93AB-6FD30D046919}.Debug|Win32.ActiveCfg = Debug|Win32
{49723CA5-DA05-43C0-93AB-6FD30D046919}.Debug|Win32.Build.0 = Debug|Win32
{49723CA5-DA05-43C0-93AB-6FD30D046919}.Debug|x64.ActiveCfg = Debug|x64
@@ -622,9 +618,7 @@ Global
{49723CA5-DA05-43C0-93AB-6FD30D046919}.EmuRelease|x64.ActiveCfg = Release|x64
{49723CA5-DA05-43C0-93AB-6FD30D046919}.EmuRelease|x64.Build.0 = Release|x64
{49723CA5-DA05-43C0-93AB-6FD30D046919}.Release|Win32.ActiveCfg = Release|Win32
- {49723CA5-DA05-43C0-93AB-6FD30D046919}.Release|Win32.Build.0 = Release|Win32
{49723CA5-DA05-43C0-93AB-6FD30D046919}.Release|x64.ActiveCfg = Release|x64
- {49723CA5-DA05-43C0-93AB-6FD30D046919}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

17
win_build/vcpkg_3rdparty_dependencies_2019.vcxproj
View File

@ -15,6 +15,7 @@
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{D3E5B5B5-4FB1-4877-9B2C-6708B3D568F7}</ProjectGuid>
<RootNamespace>vcpkg3rdpartydependencies</RootNamespace>
<VcpkgTripletConfig Condition="'$(VcpkgTripletConfig)' == ''">default</VcpkgTripletConfig>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@ -103,17 +104,7 @@
<Exec Command="bootstrap-vcpkg.bat" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
</Target>
<Target Name="Build3rdPartyLibraries" BeforeTargets="ClCompile" DependsOnTargets="InstallVcpkg" AfterTargets="InstallVcpkg">
<ItemGroup>
<VcpkgItem Include="openssl-windows:x64-windows-static" />
<VcpkgItem Include="curl[core,openssl]:x64-windows-static" />
<VcpkgItem Include="freetype[core,bzip2,png]:x64-windows-static" />
<VcpkgItem Include="ftgl:x64-windows-static" />
<VcpkgItem Include="wxwidgets:x64-windows-static" />
<VcpkgItem Include="sqlite3:x64-windows-static" />
<VcpkgItem Include="opencl:x64-windows-static" />
<VcpkgItem Include="rappture:x64-windows-static" />
</ItemGroup>
<Exec Command="vcpkg.exe install %(VcpkgItem.Identity) --overlay-ports=../../vcpkg_ports" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
<Exec Command="vcpkg.exe upgrade --no-dry-run --overlay-ports=../../vcpkg_ports" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
<Exec Command="vcpkg.exe install openssl curl[core,openssl] freetype[core,bzip2,png] ftgl wxwidgets sqlite3 opencl rappture --overlay-ports=../../vcpkg_ports/ports --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet x64-windows-static" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
<Exec Command="vcpkg.exe upgrade --no-dry-run --overlay-ports=../../vcpkg_ports/ports --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet x64-windows-static" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
</Target>
</Project>
</Project>