diff options
| author | Allen Winter <allen.winter@kdab.com> | 2021-04-03 11:10:42 -0400 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2021-04-03 11:10:42 -0400 |
| commit | fcf757829f5d0b67d754700ad878e6129510a6f5 (patch) | |
| tree | 561d92d17b59833546d4e1bfe906e4aa93910c0d /scripts | |
| parent | 3d3b34366bc86242207b9b7e8036f498b8732717 (diff) | |
| parent | c077c7d7836036627329bb82340aabd5dc977e55 (diff) | |
| download | libical-git-fcf757829f5d0b67d754700ad878e6129510a6f5.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 | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/buildtests.sh b/scripts/buildtests.sh index d5371241..42c49652 100755 --- a/scripts/buildtests.sh +++ b/scripts/buildtests.sh @@ -102,7 +102,7 @@ CHECK_WARNINGS() { # print warnings found in the compile-stage output # $1 = file with the compile-stage output COMPILE_WARNINGS() { - whitelist='\(i-cal-object\.c\|no[[:space:]]link[[:space:]]for:\|Value[[:space:]]descriptions\|unused[[:space:]]declarations\|G_ADD_PRIVATE\|g_type_class_add_private.*is[[:space:]]deprecated\|g-ir-scanner:\|/gobject/gtype\.h\|clang.*argument[[:space:]]unused[[:space:]]during[[:space:]]compilation\|U_PLATFORM_HAS_WINUWP_API\|const[[:space:]]DBT\|-Llib\)' + whitelist='\(i-cal-object\.c\|libical-glib-scan\.c\|no[[:space:]]link[[:space:]]for:\|Value[[:space:]]descriptions\|unused[[:space:]]declarations\|G_ADD_PRIVATE\|g_type_class_add_private.*is[[:space:]]deprecated\|g-ir-scanner:\|/gobject/gtype\.h\|clang.*argument[[:space:]]unused[[:space:]]during[[:space:]]compilation\|U_PLATFORM_HAS_WINUWP_API\|const[[:space:]]DBT\|-Llib\)' CHECK_WARNINGS $1 "warning:" "$whitelist" } diff --git a/scripts/set_compiler_env.bat b/scripts/set_compiler_env.bat index 5340bc20..6bbe2a89 100644 --- a/scripts/set_compiler_env.bat +++ b/scripts/set_compiler_env.bat @@ -11,6 +11,10 @@ set arch=x86 if "%platform%" EQU "x64" ( set arch=x86_amd64 ) +if "%Configuration%"=="2019" ( + set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" +) + if "%Configuration%"=="2015" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ) |