diff options
| author | Allen Winter <allen.winter@kdab.com> | 2021-11-07 15:35:05 -0500 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2021-11-07 15:35:05 -0500 |
| commit | 2605580b7f3aa6d24157bb4e3fdb4bc1d15e03d7 (patch) | |
| tree | 3658352c0c9fd18f145eed5f90d925f11815015e /scripts | |
| parent | 386a21c6d047adcc1b50a101e850f6b16541efcc (diff) | |
| parent | e535a73fbabc46abf3d87e3245335ab66d00f432 (diff) | |
| download | libical-git-2605580b7f3aa6d24157bb4e3fdb4bc1d15e03d7.tar.gz | |
Merge branch '3.0'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/buildtests.sh | 2 | ||||
| -rw-r--r-- | scripts/set_compiler_env.bat | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/scripts/buildtests.sh b/scripts/buildtests.sh index bacfae78..7e8d2439 100755 --- a/scripts/buildtests.sh +++ b/scripts/buildtests.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash #Exit if any undefined variable is used. set -u diff --git a/scripts/set_compiler_env.bat b/scripts/set_compiler_env.bat index 6bbe2a89..47d7c50f 100644 --- a/scripts/set_compiler_env.bat +++ b/scripts/set_compiler_env.bat @@ -3,35 +3,35 @@ :: Now we declare a scope Setlocal EnableDelayedExpansion EnableExtensions -if not defined Configuration set Configuration=2015 +if not defined APPVEYOR_BUILD_WORKER_IMAGE set APPVEYOR_BUILD_WORKER_IMAGE="Visual Studio 2019" -if "%Configuration%"=="MinGW" ( goto :mingw ) +if "%USE_MINGW%"=="MinGW" ( goto :mingw ) set arch=x86 if "%platform%" EQU "x64" ( set arch=x86_amd64 ) -if "%Configuration%"=="2019" ( +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" ) -if "%Configuration%"=="2015" ( +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ) -if "%Configuration%"=="2013" ( +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" ) -if "%Configuration%"=="2012" ( +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2012" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" ) -if "%Configuration%"=="2010" ( +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2010" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" ) -if "%Configuration%"=="2008" ( +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2008" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" ) |