Skip to content

Commit

Permalink
appveyor: move to Visual Studio 2019
Browse files Browse the repository at this point in the history
try to replicate #520

Signed-off-by: Robin Getz <[email protected]>
  • Loading branch information
rgetz committed May 29, 2020
1 parent 232cedd commit 00aa762
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ clone_depth: 1
skip_commits:
message: /(iiod|IIOD):.*/

# We build everything in one build, so we can put it in one installer/zip
image:
- Visual Studio 2019

environment:
# Tell msys2 to add mingw64 to the path
MSYSTEM: MINGW64
Expand Down Expand Up @@ -79,7 +83,15 @@ build_script:
- mkdir build-mingw-win64\tests\ build-mingw-win64\tests\"%configuration%"& copy build-mingw-win64\Release\tests\*.exe build-mingw-win64\tests\"%configuration%"\

- set PATH=%OLD_PATH%
- set GENERATOR=Visual Studio 12
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" (
set GENERATOR=Visual Studio 14 2015
set RD32PATH="c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvcr120.dll"
set RD64PATH="c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcr120.dll"
) else if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" (
set GENERATOR=Visual Studio 16 2019
set RD32PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\16\x86\Microsoft.VC141.CRT\msvcp160.dll"
set RD64PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\16\x86\Microsoft.VC141.CRT\msvcp160.dll"
)
- cd c:\projects\libiio
- set folder-path=c:\projects\libiio\build-win32

Expand Down Expand Up @@ -168,8 +180,8 @@ build_script:
- C:\msys64\usr\bin\bash -lc "cd c:/libs/32 ; cp libserialport-*.dll /c/%ARCHIVE_NAME%/MinGW32"
- C:\msys64\usr\bin\bash -lc "cd c:/libs/64 ; cp libserialport-*.dll /c/%ARCHIVE_NAME%/MinGW64"

- copy "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvcr120.dll" c:\%ARCHIVE_NAME%\MS32
- copy "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT\msvcr120.dll" c:\%ARCHIVE_NAME%\MS64
- copy %RD32PATH% c:\%ARCHIVE_NAME%\MS32
- copy %RD64PATH% c:\%ARCHIVE_NAME%\MS64

- copy c:\projects\libiio\CI\travis\zip.txt c:\%ARCHIVE_NAME%\README.txt
- 7z a "c:\libiio.zip" c:\%ARCHIVE_NAME%
Expand Down

0 comments on commit 00aa762

Please sign in to comment.