diff options
author | Allen Winter <allen.winter@kdab.com> | 2018-08-21 09:27:48 -0400 |
---|---|---|
committer | Allen Winter <allen.winter@kdab.com> | 2018-08-21 09:27:48 -0400 |
commit | 5bf34198f83cb2f00f34044c33c80cdf6a1e1985 (patch) | |
tree | 9617d7f6314368f8ce6f2d0011e4bb7aca4c8082 | |
parent | ec287b33b88c0fcdd264496440c29f5535c65759 (diff) | |
download | libical-git-5bf34198f83cb2f00f34044c33c80cdf6a1e1985.tar.gz |
Revert "appveyor - trying to support more compilers and platforms"
This reverts commit 5a2fdd92346305d3b6992ee379f258323557d5c1.
-rw-r--r-- | appveyor.yml | 103 | ||||
-rw-r--r-- | scripts/set_compiler_env.bat | 41 |
2 files changed, 61 insertions, 83 deletions
diff --git a/appveyor.yml b/appveyor.yml index 39bc3b65..77e10c2b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,9 @@ #---------------------------------# -# general COMPILER # +# general configuration # #---------------------------------# # version format -version: '{build}-{branch}' +version: 1.0.{build}-{branch} # branches to build branches: @@ -13,78 +13,65 @@ branches: # Do not build on tags (GitHub and BitBucket) skip_tags: false +#---------------------------------# +# environment configuration # +#---------------------------------# + +# Build worker image +image: + - Visual Studio 2013 + +# scripts that are called at very beginning, before repo cloning init: - git config --global core.autocrlf input -clone_folder: c:\dev\libical - - #- CMAKE_GENERATOR: "Ninja" - #PLATFORM: X86 - #COMPILER: msvc2013 - #- CMAKE_GENERATOR: "Ninja" - #PLATFORM: X64 - #COMPILER: msvc2013 - #- CMAKE_GENERATOR: "Ninja" - #PLATFORM: X86 - #COMPILER: msvc2015 - #- CMAKE_GENERATOR: "Ninja" - #PLATFORM: X64 - #COMPILER: msvc2015 - #- CMAKE_GENERATOR: "Visual Studio 12" - #PLATFORM: X86 - #COMPILER: msvc2013 - #- CMAKE_GENERATOR: "Visual Studio 12 Win64" - #PLATFORM: X64 - #COMPILER: msvc2013 - #- CMAKE_GENERATOR: "Visual Studio 14" - #PLATFORM: X86 - #COMPILER: msvc2015 - #- CMAKE_GENERATOR: "Visual Studio 14 Win64" - #PLATFORM: X64 - #COMPILER: msvc2015 - #- CMAKE_GENERATOR: "NMake Makefiles JOM" - #PLATFORM: X86 - #COMPILER: msvc2013 - #- CMAKE_GENERATOR: "NMake Makefiles JOM" - #PLATFORM: X64 - #COMPILER: msvc2013 - #- CMAKE_GENERATOR: "NMake Makefiles JOM" - #PLATFORM: X86 - #COMPILER: msvc2015 - #- CMAKE_GENERATOR: "NMake Makefiles JOM" - #PLATFORM: X64 - #COMPILER: msvc2015 - -environment: - matrix: - - CMAKE_GENERATOR: "NMake Makefiles" - PLATFORM: X86 - COMPILER: msvc2008 - - CMAKE_GENERATOR: "MinGW Makefiles" - PLATFORM: X64 - COMPILER: MinGW - -matrix: - fast_finish: true +#---------------------------------# +# build configuration # +#---------------------------------# + +# build platform, i.e. x86, x64, Any CPU. This setting is optional. +platform: +# - x86 uses 32bit time_t + - x64 + +# build Configuration, i.e. Debug, Release, etc. +configuration: +# - 2015 + - 2013 + - 2012 +# - MinGW +#todo: 2010, 2008 build_script: - call scripts\set_compiler_env.bat - - cd c:\dev\libical - mkdir build - cd build - - cmake .. -G "%CMAKE_GENERATOR%" -DGOBJECT_INTROSPECTION=False -DICAL_GLIB=False -DICAL_BUILD_DOCS=False - - cmake --build . --config Debug - - cmake --build . --config Release + - if "%configuration%" EQU "MinGW" ( cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DICAL_GLIB=False .. ) else ( cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DICAL_GLIB=False .. ) + - nmake # to disable automatic builds #build: off +#---------------------------------# +# tests configuration # +#---------------------------------# + test_script: - - cmd: ctest --output-on-failure -C "Debug" - - cmd: ctest --output-on-failure -C "Release" + - nmake test + +# to disable automatic tests +#test: off + + +#---------------------------------# +# deployment configuration # +#---------------------------------# deploy: off +#---------------------------------# +# notifications # +#---------------------------------# notifications: # Email - provider: Email diff --git a/scripts/set_compiler_env.bat b/scripts/set_compiler_env.bat index b401050a..5340bc20 100644 --- a/scripts/set_compiler_env.bat +++ b/scripts/set_compiler_env.bat @@ -3,48 +3,39 @@ :: Now we declare a scope Setlocal EnableDelayedExpansion EnableExtensions -if not defined COMPILER set COMPILER=msvc2015 +if not defined Configuration set Configuration=2015 -if "%COMPILER%"=="MinGW" ( goto :mingw ) +if "%Configuration%"=="MinGW" ( goto :mingw ) -set VCARCH=x86 +set arch=x86 -if "%PLATFORM%"=="X64" ( set VCARCH=x86_amd64 ) +if "%platform%" EQU "x64" ( set arch=x86_amd64 ) -if "%COMPILER%"=="msvc2015" ( - set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" +if "%Configuration%"=="2015" ( + set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ) -if "%COMPILER%"=="msvc2013" ( - set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" +if "%Configuration%"=="2013" ( + set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" ) -if "%COMPILER%"=="msvc2012" ( - set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" +if "%Configuration%"=="2012" ( + set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" ) -if "%COMPILER%"=="msvc2010" ( - set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" +if "%Configuration%"=="2010" ( + set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" ) -if "%COMPILER%"=="msvc2008" ( - set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" +if "%Configuration%"=="2008" ( + set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" ) :: Visual Studio detected -endlocal & call %SET_VS_ENV% %VCARCH% +endlocal & call %SET_VS_ENV% %arch% goto :eof :: MinGW detected :mingw :: workaround for CMake not wanting sh.exe in PATH for MinGW -endlocal & set PATH=%PATH:C:\Program Files\Git\usr\bin;=% & set "PATH=c:\MinGW\bin;%PATH%" - -:eof -if "%CMAKE_GENERATOR%"=="Ninja" ( - cinst -y ninja - set PATH=C:\tools\ninja;%PATH% -) -if "%CMAKE_GENERATOR%"=="NMake Makefiles JOM" ( - cinst -y jom -) +endlocal & set PATH=%PATH:C:\Program Files\Git\usr\bin;=% & set PATH=c:\MinGW\bin;%PATH% |