Cleaned up appveyor setup, added VS 2017 to the build matrix and attempted to add running of tests.
parent
cc562b2b1c
commit
8f54892439
49
appveyor.yml
49
appveyor.yml
|
@ -4,39 +4,50 @@
|
|||
# clone directory
|
||||
clone_folder: c:\projects\assimp
|
||||
|
||||
shallow_clone: true
|
||||
|
||||
# branches to build
|
||||
branches:
|
||||
# whitelist
|
||||
only:
|
||||
- master
|
||||
|
||||
image:
|
||||
- Visual Studio 2013
|
||||
- Visual Studio 2015
|
||||
- Visual Studio 2017
|
||||
|
||||
platform:
|
||||
- x86
|
||||
- x64
|
||||
- x86
|
||||
- x64
|
||||
|
||||
configuration:
|
||||
- 14 2015
|
||||
- 12 2013
|
||||
#- MinGW
|
||||
#- 10 2010 # only works for x86
|
||||
configuration: Release
|
||||
|
||||
init:
|
||||
- if "%platform%" EQU "x64" ( for %%a in (2008 2010 MinGW) do ( if "%Configuration%"=="%%a" (echo "Skipping unsupported configuration" && exit /b 1 ) ) )
|
||||
build:
|
||||
parallel: true
|
||||
project: Assimp.sln
|
||||
|
||||
install:
|
||||
# Make compiler command line tools available
|
||||
- call c:\projects\assimp\scripts\appveyor\compiler_setup.bat
|
||||
|
||||
build_script:
|
||||
- cd c:\projects\assimp
|
||||
- if "%platform%" equ "x64" (cmake CMakeLists.txt -DASSIMP_WERROR=ON -G "Visual Studio %Configuration% Win64")
|
||||
- if "%platform%" equ "x86" (cmake CMakeLists.txt -DASSIMP_WERROR=ON -G "Visual Studio %Configuration%")
|
||||
- if "%platform%" equ "x64" (msbuild /m /p:Configuration=Release /p:Platform="x64" Assimp.sln)
|
||||
- if "%platform%" equ "x86" (msbuild /m /p:Configuration=Release /p:Platform="Win32" Assimp.sln)
|
||||
- @echo off
|
||||
- set CMAKE_DEFINES -DASSIMP_WERROR=ON
|
||||
- if "%platform%"=="x86" set CMAKE_GENERATOR_NAME=%APPVEYOR_BUILD_WORKER_IMAGE%
|
||||
- if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=%APPVEYOR_BUILD_WORKER_IMAGE% Win64
|
||||
- cmake %CMAKE_DEFINES% -G "%CMAKE_GENERATOR_NAME%"
|
||||
|
||||
cache:
|
||||
- code\assimp.dir\%CONFIGURATION%
|
||||
|
||||
after_build:
|
||||
- 7z a assimp.7z c:\projects\assimp\bin\release\* c:\projects\assimp\lib\release\*
|
||||
- 7z a assimp.7z %APPVEYOR_BUILD_FOLDER%\bin\%CONFIGURATION%\* %APPVEYOR_BUILD_FOLDER%\lib\%CONFIGURATION%\*
|
||||
|
||||
before_test:
|
||||
- xcopy /s "%APPVEYOR_BUILD_FOLDER%\bin\%CONFIGURATION%\" "%APPVEYOR_BUILD_FOLDER%\test\%CONFIGURATION%\"
|
||||
|
||||
test:
|
||||
assemblies:
|
||||
only:
|
||||
- test\%CONFIGURATION%\unit.exe
|
||||
|
||||
artifacts:
|
||||
- path: assimp.7z
|
||||
name: assimp_lib
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
rem @echo off
|
||||
|
||||
:: Now we declare a scope
|
||||
Setlocal EnableDelayedExpansion EnableExtensions
|
||||
|
||||
if not defined Configuration set Configuration=14 2015
|
||||
|
||||
if "%Configuration%"=="MinGW" ( goto :mingw )
|
||||
|
||||
set arch=x86
|
||||
|
||||
if "%platform%" EQU "x64" ( set arch=x86_amd64 )
|
||||
|
||||
if "%Configuration%"=="14 2015" (
|
||||
set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
|
||||
)
|
||||
|
||||
if "%Configuration%"=="12 2013" (
|
||||
set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
|
||||
)
|
||||
|
||||
if "%Configuration%"=="11 2012" (
|
||||
set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"
|
||||
)
|
||||
|
||||
if "%Configuration%"=="10 2010" (
|
||||
set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
|
||||
)
|
||||
|
||||
:: Visual Studio detected
|
||||
endlocal & call %SET_VS_ENV% %arch%
|
||||
goto :eof
|
||||
|
||||
:: MinGW detected
|
||||
:mingw
|
||||
endlocal & set PATH=c:\mingw\bin;%PATH%
|
Loading…
Reference in New Issue